ADAM / AIAHTML5

Commit b9674f890835ac4c0b77dde09428cbc7f7b353d7

Authored by Amrita Vishnoi
2 parents 8818690b 28569def

Merge branch 'layerchangeTBModesty' into Develop-IPAD-MAC

Inline Side-by-side
Showing 2 changed files with 54 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @b9674f8
... ... @@ -1302,7 +1302,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1302 1302  
1303 1303 if ((dtlOfSktn != null || dtlOfSktn != undefined) && (dtlOfSktn.length > 0)) {
1304 1304  
1305   - if ((parseInt(dtlOfSktn[0]._lns) <= parseInt($scope.layerNumber)) && (parseInt(dtlOfSktn[0]._lne) > parseInt($scope.layerNumber)) && (dtlOfSktn[0]._isfr == 'Y')) {
  1305 +
1306 1306  
1307 1307 $scope.figLaefImageName = dtlOfSktn[0]._ImageId;
1308 1308  
... ... @@ -1317,8 +1317,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1317 1317 var src = "content/images/DA/" + $rootScope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/0/" + value._BodyRegionId + "/" + $scope.figLaefImageName;
1318 1318  
1319 1319 $scope.DrawImage(rectangle.scaledHeight, rectangle.scaledWidth, rectangle.scaledX, rectangle.scaledY, src, 'modestyImg' + value._BodyRegionId, 'N')
1320   -
1321   - }
  1320 + if ((parseInt(dtlOfSktn[0]._lns) <= parseInt($scope.layerNumber)) && (parseInt(dtlOfSktn[0]._lne) > parseInt($scope.layerNumber)) && (dtlOfSktn[0]._isfr == 'Y')) {
  1321 + $rootScope.isLayerLessSeven = true;
  1322 + if (($rootScope.globalSetting.modesty == 'Y')) {
  1323 +
  1324 + $('.modestyImg').css('visibility', 'visible');
  1325 + }
  1326 + }
  1327 + else
  1328 + {
  1329 +
  1330 + $rootScope.isLayerLessSeven = false;
  1331 + $('.modestyImg').css('visibility', 'hidden');
  1332 + }
1322 1333 }
1323 1334 }
1324 1335 }
... ... @@ -1336,11 +1347,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1336 1347 //$('#spinner').css('visibility', 'hidden');
1337 1348 }
1338 1349  
1339   - if (($rootScope.globalSetting.modesty == 'Y')) {
1340   - if ($('.modestyImg') != null) {
1341   - $('.modestyImg').css('visibility', 'visible');
1342   - }
1343   - }
  1350 +
1344 1351 //set scrollbars on canvas and hide loading label
1345 1352  
1346 1353 //check the OS
... ... @@ -5221,13 +5228,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5221 5228 var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
5222 5229  
5223 5230 if ($rootScope.isModestyOn == true && (parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
5224   -
5225   - modestyCanavs.style.visibility = 'visible';
  5231 +
  5232 + $rootScope.isTBLayerLessSeven = true;
  5233 +
  5234 + modestyCanavs.style.visibility = 'visible';
  5235 +
5226 5236 }
5227 5237 else {
5228   -
  5238 +
  5239 + $rootScope.isTBLayerLessSeven = false;
5229 5240 modestyCanavs.style.visibility = 'hidden';
5230 5241  
  5242 +
5231 5243 }
5232 5244 }
5233 5245  
... ... @@ -5529,10 +5541,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5529 5541 }
5530 5542  
5531 5543 ctx.putImageData(imageD1, 0, 0);
5532   - if ($rootScope.isModestyOn)
  5544 +
  5545 +
  5546 +
  5547 + if ($rootScope.isModestyOn && $rootScope.isTBLayerLessSeven == true) {
  5548 +
5533 5549 document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'visible';
5534   - else
  5550 + }
  5551 + else {
  5552 +
5535 5553 document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'hidden';
  5554 + }
5536 5555  
5537 5556 }
5538 5557  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b9674f8
... ... @@ -4863,6 +4863,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4863 4863 $('.transModestyImg').css('visibility', 'hidden');
4864 4864 }
4865 4865 }
  4866 + if ($rootScope.isLayerLessSeven == true) {
  4867 + if (($rootScope.globalSetting.modesty == 'Y')) {
  4868 + $('.modestyImg').css('visibility', 'visible');
  4869 + }
  4870 +
  4871 +
  4872 + }
  4873 + else {
  4874 +
  4875 + $('.modestyImg').css('visibility', 'hidden');
  4876 + }
  4877 + if ($rootScope.isTBLayerLessSeven == true) {
  4878 + if (($rootScope.globalSetting.modesty == 'Y')) {
  4879 +
  4880 + $('.transModestyImgif').css('visibility', 'visible');
  4881 + }
  4882 +
  4883 +
  4884 + }
  4885 + else {
  4886 + $('.transModestyImg').css('visibility', 'hidden');
  4887 + }
4866 4888 $rootScope.changeNavigatorModesty();
4867 4889 }
4868 4890  
... ...