ADAM / AIAHTML5

Commit 7689becc0193d1a7296eda01515bc6df71607998

Authored by Birendra
1 parent c8d79b2a

fix slider issue in other bodyview

Inline Side-by-side
Showing 1 changed file with 16 additions and 15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7689bec
@@ -389,7 +389,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -389,7 +389,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
389 var imagePath = "~/../content/images/DA/" + zoomValue + "/body-views/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; 389 var imagePath = "~/../content/images/DA/" + zoomValue + "/body-views/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage;
390 390
391 391
392 - var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._title + ' data-ng-click="openView($event)"><div class="thumbnail" >' 392 + var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._title + ' data-ng-click="openView($event)"><div class="thumbnail" ><a href="#">'
393 + '<img class= "daImg" id="' + value._title + '" src="' + imagePath + '" alt="" title="" >' 393 + '<img class= "daImg" id="' + value._title + '" src="' + imagePath + '" alt="" title="" >'
394 + '<div class="caption"><p>' + value._title + '</p></div></a></div></div>').appendTo('#bodyViewList'); 394 + '<div class="caption"><p>' + value._title + '</p></div></a></div></div>').appendTo('#bodyViewList');
395 395
@@ -2043,6 +2043,20 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2043,6 +2043,20 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2043 2043
2044 $('#zoomValueDA_' + windowviewid).attr('value', $scope.GetwindowStoreData(windowviewid,'zoomInOut')); 2044 $('#zoomValueDA_' + windowviewid).attr('value', $scope.GetwindowStoreData(windowviewid,'zoomInOut'));
2045 2045
  2046 + var lastlayer=$scope.GetwindowStoreData(windowviewid,'layerNumber');
  2047 +
  2048 + if ($scope.GetwindowStoreData(windowviewid, 'isTransparent')) {
  2049 + lastlayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberBeforeTBDraw');
  2050 + $scope.SetwindowStoreData(windowviewid, 'layerNumber', lastlayer);
  2051 + }
  2052 + else
  2053 + {
  2054 + var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
  2055 + var sliderVal = parseInt(totalayer) - parseInt(lastlayer);
  2056 + $('#txtLayerNumberDA_' + windowviewid).val(lastlayer);
  2057 + $("#layerChangeSliderDA_" + windowviewid).slider("option", "value", sliderVal);
  2058 + }
  2059 +
2046 if (bodyRegionCoordinates != null || bodyRegionCoordinates != undefined) { 2060 if (bodyRegionCoordinates != null || bodyRegionCoordinates != undefined) {
2047 angular.forEach(bodyRegionCoordinates, function (value, key) { 2061 angular.forEach(bodyRegionCoordinates, function (value, key) {
2048 2062
@@ -2181,20 +2195,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -2181,20 +2195,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2181 var src = "content/images/DA/" + zoomValue + "/body-views/" + bodyVid + "/layers/0/" + value._BodyRegionId + "/" + $scope.figLaefImageName; 2195 var src = "content/images/DA/" + zoomValue + "/body-views/" + bodyVid + "/layers/0/" + value._BodyRegionId + "/" + $scope.figLaefImageName;
2182 2196
2183 $scope.DrawImage(rectangle.scaledHeight, rectangle.scaledWidth, rectangle.scaledX, rectangle.scaledY, src, 'modestyImg' + value._BodyRegionId, 'N', windowviewid) 2197 $scope.DrawImage(rectangle.scaledHeight, rectangle.scaledWidth, rectangle.scaledX, rectangle.scaledY, src, 'modestyImg' + value._BodyRegionId, 'N', windowviewid)
2184 - var lastlayer=$scope.GetwindowStoreData(windowviewid,'layerNumber');  
2185 -  
2186 - if ($scope.GetwindowStoreData(windowviewid, 'isTransparent')) {  
2187 - lastlayer = $scope.GetwindowStoreData(windowviewid, 'layerNumberBeforeTBDraw');  
2188 - $scope.SetwindowStoreData(windowviewid, 'layerNumber', lastlayer);  
2189 - }  
2190 - else  
2191 - {  
2192 - var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');  
2193 - var sliderVal = parseInt(totalayer) - parseInt(lastlayer);  
2194 - $('#txtLayerNumberDA_' + windowviewid).val(lastlayer);  
2195 - $("#layerChangeSliderDA_" + windowviewid).slider("option", "value", sliderVal);  
2196 - }  
2197 - 2198 +
2198 if ((parseInt(dtlOfSktn[0]._lns) <= parseInt(lastlayer)) && (parseInt(dtlOfSktn[0]._lne) > parseInt(lastlayer)) && (dtlOfSktn[0]._isfr == 'Y')) { 2199 if ((parseInt(dtlOfSktn[0]._lns) <= parseInt(lastlayer)) && (parseInt(dtlOfSktn[0]._lne) > parseInt(lastlayer)) && (dtlOfSktn[0]._isfr == 'Y')) {
2199 $rootScope.isLayerLessSeven = true; // using at home 2200 $rootScope.isLayerLessSeven = true; // using at home
2200 var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue'); 2201 var ModestyValue=$scope.GetwindowStoreData(windowviewid,'ModestyValue');