ADAM / AIAHTML5

Merged
Merge Request #963 · created by Pankaj Tiwary

Bug 32146

From BUG_32146 into Develop

Merged by Pankaj Tiwary

1 participants
Inline Side-by-side
Showing 1 changed file
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  Edit  View file @41e59c3
... ... @@ -6696,14 +6696,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
6696 6696 var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
6697 6697  
6698 6698 console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
6699   -
6700   - $('#layerChangeSlider').slider("option", "value", sliderVal);
6701   - //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6702   - // $("#txtlayerNumber").val(parseInt(0));
6703   - //}
6704   - //else
6705   - $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
6706   -
  6699 +
  6700 + //START BUG#32146
  6701 + if (($rootScope.isHighlightBodyByBodySystem == true || $scope.isbodySystemHighlight == true) && $rootScope.systemNumber > 0) {
  6702 + }
  6703 + else {
  6704 + $('#layerChangeSlider').slider("option", "value", sliderVal);
  6705 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
  6706 + }
  6707 + //END BUG#32146
6707 6708  
6708 6709 if (document.getElementById('tempCanvas') != null) {
6709 6710 $('#tempCanvas').remove();
... ... @@ -8521,7 +8522,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
8521 8522  
8522 8523 $('#structureDropdown').html("");
8523 8524 var currentBodyViewId = $rootScope.voId;
8524   - var systemListHtml = '<li><a href="#" title="Current Structure">Current Structure</a></li> <li role="separator" class="divider"></li>'
  8525 + var systemListHtml = '<li><a href="#" title="Current Structure" onclick="OnBodySystemSelection(event)">Current Structure</a></li> <li role="separator" class="divider"></li>'
8525 8526 var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
8526 8527  
8527 8528 angular.forEach(systemList, function (value, key) {
... ... @@ -8687,6 +8688,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
8687 8688 grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
8688 8689 }
8689 8690 }
  8691 +
8690 8692 }
8691 8693  
8692 8694 $scope.removeBodySyetemSelectionClass = function (title_highlightbody) {
... ...