diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 43d699c..51d99b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4617,11 +4617,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ $scope.TransparencyBoxEndY = TransparencyBoxEndY; if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) { - // $('#transparencyScale').css('visibility', 'hidden'); + + //#Bug 26464 + $timeout(function () { + angular.element(document.activeElement).blur(); + }); + } else { if (previewRectangleWidth == 0 && previewRectangleHeight == 0) { + //#Bug 26464 + $timeout(function () { + angular.element(document.activeElement).blur(); + }); + } else { @@ -6696,14 +6706,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber); console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal); - - $('#layerChangeSlider').slider("option", "value", sliderVal); - //if ($scope.isGenderChnage || $rootScope.isViewChange) { - // $("#txtlayerNumber").val(parseInt(0)); - //} - //else - $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); - + + //START BUG#32146 + if (($rootScope.isHighlightBodyByBodySystem == true || $scope.isbodySystemHighlight == true) && $rootScope.systemNumber > 0) { + } + else { + $('#layerChangeSlider').slider("option", "value", sliderVal); + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); + } + //END BUG#32146 if (document.getElementById('tempCanvas') != null) { $('#tempCanvas').remove(); @@ -8521,7 +8532,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ $('#structureDropdown').html(""); var currentBodyViewId = $rootScope.voId; - var systemListHtml = '
  • Current Structure
  • ' + var systemListHtml = '
  • Current Structure
  • ' var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item; angular.forEach(systemList, function (value, key) { @@ -8687,6 +8698,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0); } } + + //Start BUG#38018 + for (var i = 4; i <= $rootScope.grayImageMRDataList.length; i++) { + var grayCanvasMRID = 'imageCanvas' + i + '_MR'; + var grayCanvasMR = document.getElementById(grayCanvasMRID); + + if (grayCanvasMR != null) { + var grayCanvasContextMR = grayCanvasMR.getContext("2d"); + + var canvasHeight = grayCanvasMR.height; + var canvasWidth = grayCanvasMR.width; + grayCanvasContextMR.clearRect(0, 0, canvasHeight, canvasWidth); + grayCanvasContextMR.putImageData($rootScope.grayImageMRDataList[parseInt(i)], 0, 0); + } + } + //END BUG#38018 + + } $scope.removeBodySyetemSelectionClass = function (title_highlightbody) { @@ -8924,7 +8953,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ if ($('#searchListDiv').html() != "") $('#searchListDiv').empty(); //Delay compile of ul li so that the remove of li is completed. - $timeout(function () { $scope.isSearchDataLoaded = true; @@ -8948,13 +8976,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$filter","$ } } - }, 500); + $scope.IsSearchVisible = true; console.log("primary language: " + $rootScope.vocabTermDataArray[primaryLexiconIndx].language); $rootScope.a = primaryLexiconIndx; - var $e2 = $('