ADAM / AIAHTML5

Commit 49b4f0998a884ae36a38bce99116387061bbffd0

Authored by Sandeep Kumar
1 parent e2e2cd6d

Create automeic TB for SaveCB

Inline Side-by-side
Showing 1 changed file with 39 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @49b4f09
... ... @@ -787,6 +787,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
787 787 if ($scope.daOpenInOtherModules.isTransparent) {
788 788 $scope.SetwindowStoreData(windowviewid, 'layerNumber', $scope.daOpenInOtherModules.layerNumberBeforeTBDraw);
789 789 }
  790 + if ($scope.daOpenInOtherModules.layerNumberTransparency == 1 && $scope.GetwindowStoreData(windowviewid, 'layerNumber') != 0) {
  791 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', $scope.daOpenInOtherModules.layerNumber);
  792 + }
790 793  
791 794 $scope.SetwindowStoreData(windowviewid,'parentSlugName',($location.url()).replace('/', ''));
792 795  
... ... @@ -5963,9 +5966,31 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5963 5966 })
5964 5967 }
5965 5968  
5966   -
5967   - //
5968   -
  5969 + // var transparencySliderHTML =
  5970 + // '<div class="ui-widget-content" id="transparencyScale_' + windowviewid + '" style="width: 350px; height: 150px;visibility:hidden;display:block;float:left">' +
  5971 + // '<div>' +
  5972 + // '<div>' +
  5973 + // '<div class="modal-header annotation-modal-header">' +
  5974 + // '<button id="btnTBoxClose" type="button" onclick="onTboxClose()" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>' +
  5975 + // '<h4>Transparency</h4>' +
  5976 + // '</div>' +
  5977 + // '<div>' +
  5978 + // '<div class="row">' +
  5979 + // ' <div class="col-sm-12">' +
  5980 + // '<div class="padded25">' +
  5981 +
  5982 + // '<div class="slider" id="tbSlider_' + windowviewid + '"></div>' +
  5983 + // '</div>' +
  5984 + // '</div>' +
  5985 + // '</div>' +
  5986 + // '</div>' +
  5987 + // '</div>' +
  5988 + // '</div>' +
  5989 + //'</div>';
  5990 + // $('#canvasDivDA_' + windowviewid).append(transparencySliderHTML);
  5991 +
  5992 +
  5993 +
5969 5994 // $('#transparencyScale').modal('show');
5970 5995 $('#transparencyScale_' + windowviewid).css('position', 'fixed');
5971 5996 $('#transparencyScale_' + windowviewid).draggable({ containment: 'window', scroll: false });
... ... @@ -6304,11 +6329,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6304 6329  
6305 6330 }
6306 6331 })
6307   - }
  6332 + }
6308 6333  
6309 6334 $('#transparencyScale_' + windowviewid).css('position', 'fixed')
6310 6335 $('#transparencyScale_' + windowviewid).css('top', $scope.TransparencyBoxEndY - $scope.startY);//$scope.startY $scope.TBDrawStartY
6311 6336 $('#transparencyScale_' + windowviewid).css('left', $scope.TransparencyEndX - $scope.startX)
  6337 + //$('#transparencyScale_' + windowviewid).css('top', $scope.startY);//$scope.startY $scope.TBDrawStartY
  6338 + //$('#transparencyScale_' + windowviewid).css('left', $scope.startX)
6312 6339 $('#transparencyScale_' + windowviewid).css('visibility', 'visible')
6313 6340 $('#transparencyScale_' + windowviewid).css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top.
6314 6341 $('#transparencyScale_' + windowviewid).draggable({ containment: '#canvasDivDA_' + windowviewid, drag: function (evt) { } });
... ... @@ -6456,6 +6483,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6456 6483 tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
6457 6484 $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
6458 6485 $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', false);
  6486 + tranparencyLayer = tranparencyLayer + 1;
6459 6487 }
6460 6488 else if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && $scope.GetwindowStoreData(windowviewid, "isTransparent") == true) {
6461 6489 tranparencyLayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberTransparency');
... ... @@ -6472,12 +6500,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6472 6500 }
6473 6501 }
6474 6502 $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
6475   -
  6503 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', tranparencyLayer);
6476 6504 }
6477 6505  
6478 6506 $('#txtLayerNumberDA_' + windowviewid).val( $scope.GetwindowStoreData(windowviewid,'layerNumber'));
6479 6507 $scope.SetwindowStoreData(windowviewid, 'isTransparent', true);
6480   - $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', tranparencyLayer);
  6508 + //$scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', tranparencyLayer);
6481 6509  
6482 6510 var tranparencyImgSrc;
6483 6511 var tranparencyMaskImgSrc;
... ... @@ -11203,6 +11231,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11203 11231  
11204 11232 }
11205 11233 $scope.LayerChange(windowviewid);
  11234 +
  11235 + if ($scope.GetwindowStoreData(windowviewid, 'isTransparent')) {
  11236 + var layerNumber = $scope.GetwindowStoreData(windowviewid, 'layerNumber')
  11237 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', layerNumber);
  11238 + }
11206 11239 }
11207 11240 }
11208 11241 }
... ...