diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index ca963ec..30de25d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1302,7 +1302,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ((dtlOfSktn != null || dtlOfSktn != undefined) && (dtlOfSktn.length > 0)) {
- if ((parseInt(dtlOfSktn[0]._lns) <= parseInt($scope.layerNumber)) && (parseInt(dtlOfSktn[0]._lne) > parseInt($scope.layerNumber)) && (dtlOfSktn[0]._isfr == 'Y')) {
+
$scope.figLaefImageName = dtlOfSktn[0]._ImageId;
@@ -1317,8 +1317,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var src = "content/images/DA/" + $rootScope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/0/" + value._BodyRegionId + "/" + $scope.figLaefImageName;
$scope.DrawImage(rectangle.scaledHeight, rectangle.scaledWidth, rectangle.scaledX, rectangle.scaledY, src, 'modestyImg' + value._BodyRegionId, 'N')
-
- }
+ if ((parseInt(dtlOfSktn[0]._lns) <= parseInt($scope.layerNumber)) && (parseInt(dtlOfSktn[0]._lne) > parseInt($scope.layerNumber)) && (dtlOfSktn[0]._isfr == 'Y')) {
+ $rootScope.isLayerLessSeven = true;
+ if (($rootScope.globalSetting.modesty == 'Y')) {
+
+ $('.modestyImg').css('visibility', 'visible');
+ }
+ }
+ else
+ {
+
+ $rootScope.isLayerLessSeven = false;
+ $('.modestyImg').css('visibility', 'hidden');
+ }
}
}
}
@@ -1336,11 +1347,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//$('#spinner').css('visibility', 'hidden');
}
- if (($rootScope.globalSetting.modesty == 'Y')) {
- if ($('.modestyImg') != null) {
- $('.modestyImg').css('visibility', 'visible');
- }
- }
+
//set scrollbars on canvas and hide loading label
//check the OS
@@ -5221,13 +5228,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
if ($rootScope.isModestyOn == true && (parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
-
- modestyCanavs.style.visibility = 'visible';
+
+ $rootScope.isTBLayerLessSeven = true;
+
+ modestyCanavs.style.visibility = 'visible';
+
}
else {
-
+
+ $rootScope.isTBLayerLessSeven = false;
modestyCanavs.style.visibility = 'hidden';
+
}
}
@@ -5529,10 +5541,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
ctx.putImageData(imageD1, 0, 0);
- if ($rootScope.isModestyOn)
+
+
+
+ if ($rootScope.isModestyOn && $rootScope.isTBLayerLessSeven == true) {
+
document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'visible';
- else
+ }
+ else {
+
document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'hidden';
+ }
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1de99b7..1773521 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -4863,6 +4863,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$('.transModestyImg').css('visibility', 'hidden');
}
}
+ if ($rootScope.isLayerLessSeven == true) {
+ if (($rootScope.globalSetting.modesty == 'Y')) {
+ $('.modestyImg').css('visibility', 'visible');
+ }
+
+
+ }
+ else {
+
+ $('.modestyImg').css('visibility', 'hidden');
+ }
+ if ($rootScope.isTBLayerLessSeven == true) {
+ if (($rootScope.globalSetting.modesty == 'Y')) {
+
+ $('.transModestyImgif').css('visibility', 'visible');
+ }
+
+
+ }
+ else {
+ $('.transModestyImg').css('visibility', 'hidden');
+ }
$rootScope.changeNavigatorModesty();
}