ADAM / AIAHTML5

Merged
Merge Request #991 · created by Nikita Kulshreshtha

Bug#12451

From Bug#12451 into AIA_Develop

Merged by Birendra Kumar

2 participants
Inline Side-by-side
Showing 1 changed file
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  Edit  View file @282c48b
... ... @@ -5565,19 +5565,35 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5565 5565 $scope.horizontlScrollPosition = canvasDiv.scrollLeft;
5566 5566  
5567 5567 var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
5568   - var move_x = currentMousePosition.x + $scope.horizontlScrollPosition,
5569   - move_y = currentMousePosition.y + $scope.verticalScrollPosition,
5570   -
5571   - width = move_x - $scope.TransparencyBoxStartX,
5572   - height = move_y - $scope.TransparencyBoxStartY,
5573   - new_x, new_y;
  5568 + var move_x = currentMousePosition.x + $scope.horizontlScrollPosition;
  5569 + var move_y = currentMousePosition.y + $scope.verticalScrollPosition;
  5570 + var width = 0;
  5571 + var height = 0;
  5572 + if(move_x < $scope.TransparencyBoxStartX){
  5573 + width = $scope.TransparencyBoxStartX - move_x;
  5574 + }
  5575 + else{
  5576 + width = move_x - $scope.TransparencyBoxStartX;
  5577 + }
  5578 + if (move_y < $scope.TransparencyBoxStartY) {
  5579 + height = $scope.TransparencyBoxStartY - move_y;
  5580 + }
  5581 + else{
  5582 + height = move_y - $scope.TransparencyBoxStartY;
  5583 + }
5574 5584  
5575   - new_x = (move_x < $scope.TransparencyBoxStartX) ? ($scope.TransparencyBoxStartX - width) : $scope.TransparencyBoxStartX;
5576   - new_y = (move_y < $scope.TransparencyBoxStartY) ? ($scope.TransparencyBoxStartY - height) : $scope.TransparencyBoxStartY;
  5585 + var new_x, new_y;
5577 5586  
  5587 + new_x = (move_x < $scope.TransparencyBoxStartX) ? move_x : $scope.TransparencyBoxStartX;
  5588 + new_y = (move_y < $scope.TransparencyBoxStartY) ?move_y : $scope.TransparencyBoxStartY;
  5589 +
5578 5590 $('.rectangle').css({
  5591 + 'position': 'absolute',
  5592 + 'left': new_x,
  5593 + 'top':new_y,
5579 5594 'width': width,
5580 5595 'height': height,
  5596 +
5581 5597 //'background': 'transparent'
5582 5598  
5583 5599 });
... ... @@ -5663,6 +5679,34 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5663 5679 $scope.transparencyDrawnRegions = [];
5664 5680 $scope.canThirdBRDrawn = false;
5665 5681  
  5682 + var width = 0;
  5683 + var height = 0;
  5684 + if (TransparencyEndX < $scope.TransparencyBoxStartX) {
  5685 + width = $scope.TransparencyBoxStartX - TransparencyEndX;
  5686 + }
  5687 + else {
  5688 + width = TransparencyEndX - $scope.TransparencyBoxStartX;
  5689 + }
  5690 + if (TransparencyBoxEndY < $scope.TransparencyBoxStartY) {
  5691 + height = $scope.TransparencyBoxStartY - TransparencyBoxEndY;
  5692 + }
  5693 + else {
  5694 + height = TransparencyBoxEndY - $scope.TransparencyBoxStartY;
  5695 + }
  5696 +
  5697 +
  5698 + var new_startx = (TransparencyEndX < $scope.TransparencyBoxStartX) ? TransparencyEndX : $scope.TransparencyBoxStartX;
  5699 + var new_starty = (TransparencyBoxEndY < $scope.TransparencyBoxStartY) ? TransparencyBoxEndY : $scope.TransparencyBoxStartY;
  5700 + var new_endx = (TransparencyEndX < $scope.TransparencyBoxStartX) ? $scope.TransparencyBoxStartX : TransparencyEndX;
  5701 + var new_endy= (TransparencyBoxEndY < $scope.TransparencyBoxStartY) ? $scope.TransparencyBoxStartY:TransparencyBoxEndY ;
  5702 +
  5703 + $scope.TransparencyBoxStartX = new_startx;
  5704 + TransparencyEndX = new_endx;
  5705 + $scope.TransparencyBoxStartY = new_starty;
  5706 + TransparencyBoxEndY = new_endy;
  5707 +
  5708 +
  5709 +
5666 5710 $.each(BodyRegionDictionary, function (index, value) {
5667 5711  
5668 5712  
... ... @@ -5674,6 +5718,26 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5674 5718 var transparencyBoxRight = tBoxDimesions.transparencyBoxRight;
5675 5719 var bodyRegionRight = tBoxDimesions.bodyRegionRight;
5676 5720 var bodyRegionBottom = tBoxDimesions.bodyRegionBottom;
  5721 + var width = 0;
  5722 + var height = 0;
  5723 + if (TransparencyEndX < $scope.TransparencyBoxStartX) {
  5724 + width = $scope.TransparencyBoxStartX - TransparencyEndX;
  5725 + }
  5726 + else {
  5727 + width = TransparencyEndX - $scope.TransparencyBoxStartX;
  5728 + }
  5729 + if (TransparencyBoxEndY < $scope.TransparencyBoxStartY) {
  5730 + height = $scope.TransparencyBoxStartY - TransparencyBoxEndY;
  5731 + }
  5732 + else {
  5733 + height = TransparencyBoxEndY - $scope.TransparencyBoxStartY;
  5734 + }
  5735 +
  5736 + var new_x, new_y;
  5737 +
  5738 + new_x = (TransparencyEndX < $scope.TransparencyBoxStartX) ? TransparencyEndX : $scope.TransparencyBoxStartX;
  5739 + new_y = (TransparencyBoxEndY < $scope.TransparencyBoxStartY) ? TransparencyBoxEndY : $scope.TransparencyBoxStartY;
  5740 +
5677 5741  
5678 5742 var transparencyCanvas = document.createElement('canvas');
5679 5743 var tBox = document.getElementById('transparencyCanvas_'+ windowviewid);
... ... @@ -5681,11 +5745,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5681 5745  
5682 5746 transparencyCanvas.id = 'transparencyCanvas_'+ windowviewid;
5683 5747 $scope.transparencyCanvasId = transparencyCanvas.id;
5684   - transparencyCanvas.height = TransparencyBoxEndY - $scope.startY;
5685   - transparencyCanvas.width = TransparencyEndX - $scope.startX;
  5748 + transparencyCanvas.height = height;
  5749 + transparencyCanvas.width = width;
5686 5750 transparencyCanvas.style.position = "absolute";
5687   - transparencyCanvas.style.left = $scope.startX + 'px' // x + "px";
5688   - transparencyCanvas.style.top = $scope.startY + "px"//y + "px";
  5751 + //transparencyCanvas.style.left = $scope.startX + 'px' // x + "px";
  5752 + //transparencyCanvas.style.top = $scope.startY + "px"//y + "px";
  5753 + transparencyCanvas.style.left = new_x + 'px' // x + "px";
  5754 + transparencyCanvas.style.top = new_y + "px"
5689 5755 transparencyCanvas.style.border = "black 1px solid";
5690 5756 transparencyCanvas.style.backgroundColor = "transparent";
5691 5757 transparencyCanvas.style.zIndex = 200;
... ... @@ -5817,7 +5883,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5817 5883 //
5818 5884  
5819 5885 // $('#transparencyScale').modal('show');
5820   - $('#transparencyScale_' + windowviewid).css('position', 'fixed')
  5886 + $('#transparencyScale_' + windowviewid).css('position', 'fixed');
  5887 + $('#transparencyScale_' + windowviewid).draggable({ containment: 'window', scroll: false });
5821 5888 $('#transparencyScale_' + windowviewid).css('top', $scope.TBDrawStartY - 10)
5822 5889 $('#transparencyScale_' + windowviewid).css('left', $scope.TBDrawStartX + 130)
5823 5890 $('#transparencyScale_' + windowviewid).css('visibility', 'visible')
... ...