diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 0c20b73..bd074a1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -389,7 +389,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var imagePath = "~/../content/images/DA/" + zoomValue + "/body-views/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; - var $el = $('
' + var $el = $('').appendTo('#bodyViewList'); @@ -2043,6 +2043,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#zoomValueDA_' + windowviewid).attr('value', $scope.GetwindowStoreData(windowviewid,'zoomInOut')); + var lastlayer=$scope.GetwindowStoreData(windowviewid,'layerNumber'); + + if ($scope.GetwindowStoreData(windowviewid, 'isTransparent')) { + lastlayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberBeforeTBDraw'); + $scope.SetwindowStoreData(windowviewid, 'layerNumber', lastlayer); + } + else + { + var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers'); + var sliderVal = parseInt(totalayer) - parseInt(lastlayer); + $('#txtLayerNumberDA_' + windowviewid).val(lastlayer); + $("#layerChangeSliderDA_" + windowviewid).slider("option", "value", sliderVal); + } + if (bodyRegionCoordinates != null || bodyRegionCoordinates != undefined) { angular.forEach(bodyRegionCoordinates, function (value, key) { @@ -2181,20 +2195,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var src = "content/images/DA/" + zoomValue + "/body-views/" + bodyVid + "/layers/0/" + value._BodyRegionId + "/" + $scope.figLaefImageName; $scope.DrawImage(rectangle.scaledHeight, rectangle.scaledWidth, rectangle.scaledX, rectangle.scaledY, src, 'modestyImg' + value._BodyRegionId, 'N', windowviewid) - var lastlayer=$scope.GetwindowStoreData(windowviewid,'layerNumber'); - - if ($scope.GetwindowStoreData(windowviewid, 'isTransparent')) { - lastlayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberBeforeTBDraw'); - $scope.SetwindowStoreData(windowviewid, 'layerNumber', lastlayer); - } - else - { - var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers'); - var sliderVal = parseInt(totalayer) - parseInt(lastlayer); - $('#txtLayerNumberDA_' + windowviewid).val(lastlayer); - $("#layerChangeSliderDA_" + windowviewid).slider("option", "value", sliderVal); - } - + if ((parseInt(dtlOfSktn[0]._lns) <= parseInt(lastlayer)) && (parseInt(dtlOfSktn[0]._lne) > parseInt(lastlayer)) && (dtlOfSktn[0]._isfr == 'Y')) { $rootScope.isLayerLessSeven = true; // using at home var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');