ADAM / AIAHTML5

Commit 282c48b8a69a261a2577dc2e4a6ca227da9f8956

Authored by Nikita Kulshreshtha
1 parent c25257ab

Bug is fixed

Inline Side-by-side
Showing 1 changed file with 31 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @282c48b
... ... @@ -5621,7 +5621,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5621 5621  
5622 5622 $scope.SetwindowStoreData(windowviewid,'currentLayerNumber',parseInt($('#txtLayerNumberDA_' + windowviewid).val()));
5623 5623  
5624   - // $('.rectangle').remove();
  5624 + $('.rectangle').remove();
5625 5625  
5626 5626 var currentMousePosition = $scope.getMousePos(e.pageX,e.pageY,windowviewid);
5627 5627  
... ... @@ -5679,6 +5679,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5679 5679 $scope.transparencyDrawnRegions = [];
5680 5680 $scope.canThirdBRDrawn = false;
5681 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 +
5682 5710 $.each(BodyRegionDictionary, function (index, value) {
5683 5711  
5684 5712  
... ... @@ -5855,7 +5883,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5855 5883 //
5856 5884  
5857 5885 // $('#transparencyScale').modal('show');
5858   - $('#transparencyScale_' + windowviewid).css('position', 'fixed')
  5886 + $('#transparencyScale_' + windowviewid).css('position', 'fixed');
  5887 + $('#transparencyScale_' + windowviewid).draggable({ containment: 'window', scroll: false });
5859 5888 $('#transparencyScale_' + windowviewid).css('top', $scope.TBDrawStartY - 10)
5860 5889 $('#transparencyScale_' + windowviewid).css('left', $scope.TBDrawStartX + 130)
5861 5890 $('#transparencyScale_' + windowviewid).css('visibility', 'visible')
... ...