ADAM / AIAHTML5

Commit 66b973470ff73340d4ce4292ef26044ce4c8221f

Authored by Sandeep Kumar
1 parent 33514e8a

Added TransparencyBox attrubutes for SaveCB

Inline Side-by-side
Showing 3 changed files with 167 additions and 55 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @66b9734
... ... @@ -2339,11 +2339,11 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2339 2339 selectedStructureID: 0,//N
2340 2340 contentDescriptorId: 0,
2341 2341 callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
2342   - //hideAllPins: $rootScope.DaWindowData[i].isHidePinBtnClicked,
  2342 +
2343 2343 //selectedCallouts: $rootScope.DaWindowData[i].CBselectedpinCordinate,
2344 2344 layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
2345 2345 isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
2346   - isTransparent: $rootScope.DaWindowData[i].isTransparencyActivated,
  2346 +
2347 2347 isTopToolBarVisible: false, //$rootScope.DaWindowData[i].isTopToolBarVisible,
2348 2348 clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
2349 2349 minimised: $rootScope.DaWindowData[i].minimised,
... ... @@ -2352,19 +2352,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2352 2352 // vertical: $rootScope.DaWindowData[i].verticalScroll,
2353 2353 // horizontal: $rootScope.DaWindowData[i].horizontalScroll
2354 2354 //},
2355   - //selectedPins: $rootScope.DaWindowData[i].clickedPins,
  2355 +
2356 2356 maximised: $rootScope.DaWindowData[i].maximised,
2357 2357 size: {
2358 2358 width: $rootScope.DaWindowData[i].width,
2359 2359 height: $rootScope.DaWindowData[i].height
2360 2360 },
2361   - id: $rootScope.DaWindowData[i].voId,
2362   - //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked,
2363   - // hideCallOuts: false,//N
2364   - //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N
2365   - //scaleIndex: 0,//N
2366   - //bodySystemId: $rootScope.DaWindowData[i].SelectedSystemID,
2367   - //position: { x: 840, y: 263 },
  2361 + id: $rootScope.DaWindowData[i].voId,
  2362 +
2368 2363 imageId: $rootScope.DaWindowData[i].imageId,
2369 2364 position: {
2370 2365 top: $rootScope.DaWindowData[i].top,
... ... @@ -2377,20 +2372,24 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2377 2372 //sliderVal: $rootScope.DaWindowData[i].sliderVal,
2378 2373 zoom: $rootScope.DaWindowData[i].zoomInOut,
2379 2374 skinId: $rootScope.DaWindowData[i].curentEthnicity,
2380   - isResizeLock: false , //.isResizeLock,//N
  2375 + isResizeLock: false , //N
2381 2376 mode: $rootScope.DaWindowData[i].mode,
2382   - windowListId: 0,//windowData.windowListId,//25
  2377 + windowListId: 0,//N
2383 2378 canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
2384 2379 canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,
2385 2380 isCallOutVisible: false,
2386   - annotationData: "", // .annotationData,//24
2387   - transparencyBounds: 0,//windowData.transparencyBounds,
2388   - isLeftToolBarVisible: false, //windowData.isLeftToolBarVisible,//N
2389   - isModuleLoaded: false, //.isModuleLoaded,//N
2390   - transparencyValue: 0,//N
2391   - layerNumberTransparency: false, //layerNumberTransparency,//N
  2381 + annotationData: "", // .annotationData,
  2382 + isLeftToolBarVisible: false, //N
  2383 + isModuleLoaded: false, //N
2392 2384 searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
2393   - prevId: $rootScope.DaWindowData[i].prevId //ActualTermnumber for chnages body image
  2385 + prevId: $rootScope.DaWindowData[i].prevId, //ActualTermnumber for chnages body image
  2386 +
  2387 + isTransparent: $rootScope.DaWindowData[i].isTransparencyActivated,
  2388 + transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
  2389 + transparencyValue: $rootScope.DaWindowData[i].transNumber,
  2390 + layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
  2391 + transparencyX: $rootScope.DaWindowData[i].transparencyX,
  2392 + transparencyY: $rootScope.DaWindowData[i].transparencyY
2394 2393  
2395 2394 });
2396 2395 }
... ... @@ -2416,6 +2415,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2416 2415 if ($scope.selectedKey.windows.window != undefined) {
2417 2416 $scope.selectedKey.windows.window.push(arrToStrWinObj);
2418 2417 }
  2418 + else if ($scope.selectedKey.windows == "") {
  2419 + $scope.selectedKey.windows = [];
  2420 + $scope.selectedKey.windows.push({ 'window': [] });
  2421 + $scope.selectedKey.windows.window = [];
  2422 + $scope.selectedKey.windows.window.push(arrToStrWinObj);
  2423 + }
  2424 +
2419 2425  
2420 2426 }
2421 2427 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @66b9734
... ... @@ -148,7 +148,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
148 148 'maximised': false,
149 149 'id': 0,
150 150 'moduleName': '',
151   - 'mode': ''
  151 + 'mode': '',
  152 + 'transparencyBounds': [],
  153 + 'layerNumberTransparency': 0,
  154 + 'transparencyValue': 0,
  155 + 'transparencyX': 0,
  156 + 'transparencyY': 0
152 157  
153 158 });
154 159  
... ... @@ -250,7 +255,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
250 255 'maximised': false,
251 256 'id': 0,
252 257 'moduleName': '',
253   - 'mode': ''
  258 + 'mode': '',
  259 + 'transparencyBounds': [],
  260 + 'layerNumberTransparency': 0,
  261 + 'transparencyValue': 0,
  262 + 'transparencyX': 0,
  263 + 'transparencyY': 0
254 264 });
255 265  
256 266 }
... ... @@ -758,6 +768,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
758 768 $scope.SetwindowStoreData(windowviewid, 'minimised', isMinimize);
759 769 $scope.SetwindowStoreData(windowviewid, 'moduleName', "DISSECTIBLE_ANATOMY");
760 770 $scope.SetwindowStoreData(windowviewid, 'mode', $scope.daOpenInOtherModules.mode);
  771 + $scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', $scope.daOpenInOtherModules.isTransparent);
  772 + if ($scope.daOpenInOtherModules.transparencyBounds != undefined) {
  773 + $scope.SetwindowStoreData(windowviewid, 'transparencyBounds', $scope.daOpenInOtherModules.transparencyBounds);
  774 + }
  775 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', $scope.daOpenInOtherModules.layerNumberTransparency);
  776 + //$scope.SetwindowStoreData(windowviewid, 'transparencyValue', $scope.daOpenInOtherModules.transparencyValue);
  777 + $scope.SetwindowStoreData(windowviewid, 'transparencyX', $scope.daOpenInOtherModules.transparencyX);
  778 + $scope.SetwindowStoreData(windowviewid, 'transparencyY', $scope.daOpenInOtherModules.transparencyY);
  779 + $scope.SetwindowStoreData(windowviewid, 'transNumber', $scope.daOpenInOtherModules.transparencyValue)
  780 + if ($scope.daOpenInOtherModules.transparencyValue == 0.5) {
  781 + $scope.SetwindowStoreData(windowviewid, 'transNumber', 50);
  782 + }
  783 +
761 784  
762 785 $scope.SetwindowStoreData(windowviewid,'parentSlugName',($location.url()).replace('/', ''));
763 786  
... ... @@ -1080,7 +1103,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1080 1103 $(".containment-wrapper-"+windowviewid).css("min-width", "auto");
1081 1104 }
1082 1105 $("#transparencyScale_" + windowviewid).draggable({containment:'window'});
1083   - $("#draggable_"+windowviewid).draggable({ containment: ".containment-wrapper-"+windowviewid, scroll: false });
  1106 + $("#draggable_" + windowviewid).draggable({ containment: ".containment-wrapper-" + windowviewid, scroll: false });
1084 1107  
1085 1108 }
1086 1109  
... ... @@ -1137,11 +1160,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1137 1160 }
1138 1161  
1139 1162 $scope.TbSelSlider = function (windowviewid) {
1140   -
  1163 + var sliderValue = 50;
  1164 + var tbValue = $scope.GetwindowStoreData(windowviewid, 'transNumber');
  1165 + if (tbValue != undefined) {
  1166 + sliderValue = tbValue;
  1167 + }
1141 1168 $("#tbSlider_" + windowviewid).slider({
1142 1169 min: 0,
1143 1170 max: 100,
1144   - value: 50,
  1171 + value: sliderValue,
1145 1172 range: "min",
1146 1173 orientation: "horizontal",
1147 1174 // change: function (event, ui) {
... ... @@ -5540,6 +5567,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5540 5567 $selection.appendTo($container);
5541 5568 }
5542 5569  
  5570 + //$rootScope.commonTBStartX = actulalX;
  5571 + //$rootScope.CommonTBSartY = actualY;
  5572 + //$rootScope.SliderStartX = $scope.TBDrawStartX;
  5573 + //$rootScope.SliderStartY = $scope.TBDrawStartY;
  5574 +
5543 5575 document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("mousedown", mouseDownListener);
5544 5576  
5545 5577 document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchstart", mouseDownListener);
... ... @@ -5618,7 +5650,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5618 5650 e.preventDefault();
5619 5651  
5620 5652 $scope.SetwindowStoreData(windowviewid, 'isTBDrawnOnBodyRegion', false);
5621   -
  5653 + $scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
5622 5654 $scope.SetwindowStoreData(windowviewid, 'IsNormalModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isNormalMode'));
5623 5655 $scope.SetwindowStoreData(windowviewid, 'IsHighlightModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isHighlight'));
5624 5656  
... ... @@ -5650,6 +5682,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5650 5682 $scope.TransparencyEndX = TransparencyEndX;
5651 5683 $scope.TransparencyBoxEndY = TransparencyBoxEndY;
5652 5684  
  5685 + //Save TranparencyBox and slider for CurriculmBuilder
  5686 + //$rootScope.commonTBEndX = TransparencyEndX;
  5687 + //$rootScope.commonTBEndY = TransparencyBoxEndY;
  5688 + var transparencyBounds = $scope.GetwindowStoreData(windowviewid,'transparencyBounds');
  5689 + transparencyBounds.push({
  5690 + 'h': $scope.TransparencyEndX, 'x': $scope.TransparencyBoxStartX,
  5691 + 'w': $scope.TransparencyBoxEndY, 'y': $scope.TransparencyBoxStartY
  5692 + });
  5693 +
5653 5694 if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) {
5654 5695  
5655 5696 $("#btnExtract_" + windowviewid).removeClass("disabled");
... ... @@ -5730,7 +5771,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5730 5771 TransparencyBoxEndY = new_endy;
5731 5772  
5732 5773  
5733   -
  5774 + var BodyRegionDictionary = $scope.GetwindowStoreData(windowviewid, 'BodyRegionCordinatesData');
5734 5775 $.each(BodyRegionDictionary, function (index, value) {
5735 5776  
5736 5777  
... ... @@ -5909,6 +5950,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5909 5950 // $('#transparencyScale').modal('show');
5910 5951 $('#transparencyScale_' + windowviewid).css('position', 'fixed');
5911 5952 $('#transparencyScale_' + windowviewid).draggable({ containment: 'window', scroll: false });
  5953 + if ($rootScope.isCallFromOtherModule) {
  5954 + $('#transparencyScale_' + windowviewid).draggable({ containment: '#canvasDivDA_' + windowviewid });
  5955 +
  5956 + $scope.SetwindowStoreData(windowviewid, 'transparencyBounds', transparencyBounds);
  5957 + $scope.SetwindowStoreData(windowviewid, 'transparencyValue', 0);
  5958 + $scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', 0);
  5959 + $scope.SetwindowStoreData(windowviewid, 'transparencyX', $scope.TBDrawStart);
  5960 + $scope.SetwindowStoreData(windowviewid, 'transparencyY', $scope.TBDrawStartY );
  5961 + }
5912 5962 $('#transparencyScale_' + windowviewid).css('top', $scope.TBDrawStartY - 10)
5913 5963 $('#transparencyScale_' + windowviewid).css('left', $scope.TBDrawStartX + 130)
5914 5964 $('#transparencyScale_' + windowviewid).css('visibility', 'visible')
... ... @@ -5991,6 +6041,26 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
5991 6041  
5992 6042 $scope.CalculateDimensionsAndDrawTBox = function (windowviewid) {
5993 6043  
  6044 + //$scope.startX = $rootScope.commonTBStartX;
  6045 + //$scope.startY = $rootScope.CommonTBSartY;
  6046 + //$scope.TransparencyBoxStartX = $rootScope.commonTBStartX;
  6047 + //$scope.TransparencyBoxStartY = $rootScope.CommonTBSartY;
  6048 + //$scope.TransparencyEndX = $rootScope.commonTBEndX;
  6049 + //$scope.TransparencyBoxEndY = $rootScope.commonTBEndY;
  6050 + //Get Transparecy attributes from save CB
  6051 + var transparencyBounds = $scope.GetwindowStoreData(windowviewid, 'transparencyBounds');
  6052 + $.each(transparencyBounds, function (index, value){
  6053 + $scope.startX = value.x;
  6054 + $scope.startY = value.y
  6055 + $scope.TransparencyBoxStartX = value.x;
  6056 + $scope.TransparencyBoxStartY = value.y;
  6057 + $scope.TransparencyEndX = value.h;
  6058 + $scope.TransparencyBoxEndY = value.w;
  6059 + })
  6060 +
  6061 + $scope.IncludedBodyRegions = [];
  6062 + $scope.transparencyDrawnRegions = [];
  6063 + $scope.canThirdBRDrawn = false;
5994 6064  
5995 6065 var tranparencyLayer;
5996 6066 // alert($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated")+"---"+($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked")))
... ... @@ -6010,6 +6080,39 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6010 6080 tranparencyLayer = currentLayer + 1;
6011 6081 }
6012 6082 }
  6083 +
  6084 + var $container = document.getElementById("canvasDivDA_" + windowviewid);
  6085 + var $selection = $('<div>').addClass('rectangle');
  6086 + //document.getElementById("daViewDA_" + windowviewid)
  6087 + $selection.css({
  6088 + 'position': 'absolute',
  6089 + 'border': '1px dotted #000',
  6090 + 'top': $scope.TransparencyBoxStartY,
  6091 + 'left': $scope.TransparencyBoxStartX,
  6092 + 'width': 0,
  6093 + 'height': 0,
  6094 + 'z-index': 1000
  6095 + });
  6096 + $selection.appendTo($container);
  6097 +
  6098 + //draw temp box to store the canvas data with original transparecy
  6099 + if (document.getElementById('tempCanvas_' + windowviewid) != null) {
  6100 + $('#tempCanvas_' + windowviewid).remove();
  6101 + }
  6102 + if (document.getElementById('tempCanvas_' + windowviewid) == null || document.getElementById('tempCanvas_' + windowviewid) == undefined) {
  6103 + var tempCanvas = document.createElement('canvas');
  6104 + tempCanvas.id = 'tempCanvas_' + windowviewid;
  6105 + tempCanvas.height = $scope.TransparencyBoxEndY - $scope.startY;
  6106 + tempCanvas.width = $scope.TransparencyEndX - $scope.startX;
  6107 + tempCanvas.style.position = "absolute";
  6108 + tempCanvas.style.left = 200 + 'px';
  6109 + tempCanvas.style.top = 200 + 'px';
  6110 + tempCanvas.style.backgroundColor = "transparent";
  6111 + tempCanvas.style.visibility = 'hidden';
  6112 + tempCanvas.style.border = "black 1px solid";
  6113 + document.getElementById("canvasDivDA_" + windowviewid).appendChild(tempCanvas);
  6114 + }
  6115 +
6013 6116 $scope.SetwindowStoreData(windowviewid, 'layerNumber', tranparencyLayer);
6014 6117  
6015 6118 var BodyRegionDictionary = $scope.GetwindowStoreData(windowviewid, 'BodyRegionCordinatesData');
... ... @@ -6171,12 +6274,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6171 6274 }
6172 6275  
6173 6276 $('#transparencyScale_' + windowviewid).css('position', 'fixed')
6174   - $('#transparencyScale_' + windowviewid).css('top', $scope.TBDrawStartY - 10)
6175   - $('#transparencyScale_' + windowviewid).css('left', $scope.TBDrawStartX + 130)
  6277 + $('#transparencyScale_' + windowviewid).css('top', $scope.startY)
  6278 + $('#transparencyScale_' + windowviewid).css('left', $scope.startX)
6176 6279 $('#transparencyScale_' + windowviewid).css('visibility', 'visible')
6177 6280 $('#transparencyScale_' + windowviewid).css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top.
6178   -
6179   -
  6281 + $('#transparencyScale_' + windowviewid).draggable({ containment: '#canvasDivDA_' + windowviewid, drag: function (evt) { } });
6180 6282 var transNumber = $scope.GetwindowStoreData(windowviewid, 'transNumber');
6181 6283 $("#tbSlider_" + windowviewid + " .ui-slider-handle").css("left", transNumber + "%");
6182 6284 $("#tbSlider_" + windowviewid + " .ui-slider-range-min").css("width", transNumber + "%");
... ... @@ -6312,30 +6414,30 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6312 6414 $("#tbSlider_" + windowviewid).slider('value', 100);
6313 6415  
6314 6416 }
6315   - //else {
  6417 + else {
6316 6418  
6317 6419  
6318   - // var tranparencyLayer;
6319   - // // alert($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated")+"---"+($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked")))
6320   - // if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) ){
6321   - // tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
6322   - // $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
6323   - // $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', false);
6324   - // }
6325   - // else{
6326   - // var currentLayer = $scope.GetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw');
  6420 + var tranparencyLayer;
  6421 + // alert($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated")+"---"+($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked")))
  6422 + if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) ){
  6423 + tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
  6424 + $scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
  6425 + $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', false);
  6426 + }
  6427 + else{
  6428 + var currentLayer = $scope.GetwindowStoreData(windowviewid,'layerNumberBeforeTBDraw');
6327 6429  
6328   - // var totalLayers=$scope.GetwindowStoreData(windowviewid,'totalLayers');
6329   - // if (currentLayer == totalLayers) {
6330   - // tranparencyLayer = currentLayer;
6331   - // }
6332   - // else {
6333   - // tranparencyLayer = currentLayer + 1;
6334   - // }
6335   - // }
6336   - // $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
  6430 + var totalLayers=$scope.GetwindowStoreData(windowviewid,'totalLayers');
  6431 + if (currentLayer == totalLayers) {
  6432 + tranparencyLayer = currentLayer;
  6433 + }
  6434 + else {
  6435 + tranparencyLayer = currentLayer + 1;
  6436 + }
  6437 + }
  6438 + $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
6337 6439  
6338   - //}
  6440 + }
6339 6441  
6340 6442 $('#txtLayerNumberDA_' + windowviewid).val( $scope.GetwindowStoreData(windowviewid,'layerNumber'));
6341 6443  
... ... @@ -7875,7 +7977,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7875 7977  
7876 7978 var len= (ev.target.id).split("_").length;
7877 7979 var windowviewid = (ev.target.id).split("_")[len-1];
7878   -
  7980 + //$scope.SetwindowStoreData(windowviewid, 'transparencyValue', ui.value);
7879 7981 $scope.SetwindowStoreData(windowviewid,'transNumber',ui.value);
7880 7982  
7881 7983 $scope.setOriginalDataAndChangeTransparency(windowviewid);
... ... @@ -8010,7 +8112,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8010 8112  
8011 8113  
8012 8114 //black issue
8013   - var imgData = ctx.getImageData(0, 0, ocument.getElementById(modestyTransTempCanvasId).ocument.getElementById(modestyTransTempCanvasId), transCanvas.height);
  8115 + var imgData = ctx.getImageData(0, 0, document.getElementById(modestyTransTempCanvasId).document.getElementById(modestyTransTempCanvasId), transCanvas.height);
8014 8116 var data = imgData.data;
8015 8117 var c = 0;
8016 8118 for (var i = 0; i < data.length; i += 4) {
... ... @@ -8752,8 +8854,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8752 8854  
8753 8855 // $scope.CloseTransparencyBox(windowviewid);
8754 8856 $scope.GetwindowStoreData(windowviewid, 'isHighLight', true);
8755   - // $scope.CalculateDimensionsAndDrawTBox(windowviewid);
8756   - $scope.setOriginalDataAndChangeTransparency(windowviewid);
  8857 +
  8858 + $scope.CalculateDimensionsAndDrawTBox(windowviewid);
  8859 +
  8860 + $scope.setOriginalDataAndChangeTransparency(windowviewid);
8757 8861  
8758 8862 }
8759 8863 else {
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @66b9734
... ... @@ -307,7 +307,9 @@ AIA.service(&#39;ModuleService&#39;, function ($http, DataService) {
307 307 minimised: windowData.minimised,
308 308 annotationData: windowData.annotationData,
309 309  
310   - transparencyBounds: windowData.transparencyBounds
  310 + transparencyBounds: windowData.transparencyBounds,
  311 + transparencyX: windowData.transparencyX,
  312 + transparencyY: windowData.transparencyY
311 313  
312 314 });
313 315 }
... ...