ADAM / AIAHTML5

Commit e8e9536342e5a6d92b4c6347d37094199575b95e

Authored by Pankaj Tiwary
2 parents 1fa84b11 41e59c3b

Merge branch 'BUG_32146' into 'Develop' 

Bug 32146

See merge request !963
Inline Side-by-side
Showing 1 changed file with 11 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e8e9536
... ... @@ -6706,14 +6706,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
6706 6706 var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
6707 6707  
6708 6708 console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
6709   -
6710   - $('#layerChangeSlider').slider("option", "value", sliderVal);
6711   - //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6712   - // $("#txtlayerNumber").val(parseInt(0));
6713   - //}
6714   - //else
6715   - $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
6716   -
  6709 +
  6710 + //START BUG#32146
  6711 + if (($rootScope.isHighlightBodyByBodySystem == true || $scope.isbodySystemHighlight == true) && $rootScope.systemNumber > 0) {
  6712 + }
  6713 + else {
  6714 + $('#layerChangeSlider').slider("option", "value", sliderVal);
  6715 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
  6716 + }
  6717 + //END BUG#32146
6717 6718  
6718 6719 if (document.getElementById('tempCanvas') != null) {
6719 6720 $('#tempCanvas').remove();
... ... @@ -8531,7 +8532,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$
8531 8532  
8532 8533 $('#structureDropdown').html("");
8533 8534 var currentBodyViewId = $rootScope.voId;
8534   - var systemListHtml = '<li><a href="#" title="Current Structure">Current Structure</a></li> <li role="separator" class="divider"></li>'
  8535 + var systemListHtml = '<li><a href="#" title="Current Structure" onclick="OnBodySystemSelection(event)">Current Structure</a></li> <li role="separator" class="divider"></li>'
8535 8536 var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
8536 8537  
8537 8538 angular.forEach(systemList, function (value, key) {
... ... @@ -8697,6 +8698,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
8697 8698 grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
8698 8699 }
8699 8700 }
  8701 +
8700 8702 }
8701 8703  
8702 8704 $scope.removeBodySyetemSelectionClass = function (title_highlightbody) {
... ...