diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index ad5b20f..a28909f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4694,9 +4694,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //if listanager is visisble then close it - $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); + $rootScope.isHighlightBodyByBodySystem = false; + + $('#sppeachBubble').css('display', 'none'); $("#dot").css("display", "none"); @@ -4750,73 +4752,30 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.flushCanvas = function () { - //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) { - // angular.forEach($scope.ColoredImageSRC, function (value, key) { - - // var id; - // var maskId; - // if (value.haveMirror == 'true') { - // id = 'imageCanvas' + value.bodyRegionId + '_MR'; - // maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci' - // } - // else { - // id = 'imageCanvas' + value.bodyRegionId; - // maskId = 'imageCanvas' + value.bodyRegionId + '_mci'; - // } - - // var canvas = document.getElementById(id); - // if (canvas != null || canvas != undefined) { - // document.getElementById('canvasDiv').removeChild(canvas); - // } - - // var maskcanvas = document.getElementById(maskId); - // if (maskcanvas != null || maskcanvas != undefined) { - // document.getElementById('canvasDiv').removeChild(maskcanvas); - - // } - // if (i == 4 || i == 5 || i == 6) { - // id = 'imageCanvas' + i + '_MR'; - // maskId = 'imageCanvas' + i + '_MR_mci'; - - // var canvas = document.getElementById(id); - // if (canvas != null || canvas != undefined) - // document.getElementById('canvasDiv').removeChild(canvas); - - // var maskcanvas = document.getElementById(maskId); - // if (maskcanvas != null || maskcanvas != undefined) - // document.getElementById('canvasDiv').removeChild(maskcanvas); - // } - - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); - // for (var i = 0; i < modestyCanvases.length; i++) { - // modestyCanvases[i].remove(); - // } - // }); - // //remove modesty canavs - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); - // if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { - // for (var j = 0; j < modestyCanvases.length; j++) { - // modestyCanvases[j].remove(); - // } - // } - //} - - for (var i = 1; i < 7; i++) { - - var id; - var maskId; + if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) { + angular.forEach($scope.ColoredImageSRC, function (value, key) { - id = 'imageCanvas' + i; - maskId = 'imageCanvas' + i + '_mci'; + var id; + var maskId; + if (value.haveMirror == 'true') { + id = 'imageCanvas' + value.bodyRegionId + '_MR'; + maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci' + } + else { + id = 'imageCanvas' + value.bodyRegionId; + maskId = 'imageCanvas' + value.bodyRegionId + '_mci'; + } - var canvas = document.getElementById(id); - if (canvas != null || canvas != undefined) - document.getElementById('canvasDiv').removeChild(canvas); + var canvas = document.getElementById(id); + if (canvas != null || canvas != undefined) { + document.getElementById('canvasDiv').removeChild(canvas); + } - var maskcanvas = document.getElementById(maskId); - if (maskcanvas != null || maskcanvas != undefined) - document.getElementById('canvasDiv').removeChild(maskcanvas); + var maskcanvas = document.getElementById(maskId); + if (maskcanvas != null || maskcanvas != undefined) { + document.getElementById('canvasDiv').removeChild(maskcanvas); + } if (i == 4 || i == 5 || i == 6) { id = 'imageCanvas' + i + '_MR'; maskId = 'imageCanvas' + i + '_MR_mci'; @@ -4830,6 +4789,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo document.getElementById('canvasDiv').removeChild(maskcanvas); } + var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); + for (var i = 0; i < modestyCanvases.length; i++) { + modestyCanvases[i].remove(); + } + }); //remove modesty canavs var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { @@ -4838,6 +4802,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } } + + } $scope.terminateCurrentlyRunningWPs = function () { @@ -4863,6 +4829,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); + $rootScope.isHighlightBodyByBodySystem = false; + if ($rootScope.isHighLight == true) { } @@ -4928,6 +4896,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.CloseListManager(); + $rootScope.isHighlightBodyByBodySystem = false; + + if ($rootScope.isNormalMode == true) { } @@ -4985,6 +4956,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.enableExtract = function () { + $rootScope.isHighlightBodyByBodySystem = false; + + $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop(); $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft(); @@ -5544,6 +5518,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); + $rootScope.isHighlightBodyByBodySystem = false; + + + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -5719,6 +5697,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //$rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); + $rootScope.isHighlightBodyByBodySystem = false; + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -7299,7 +7279,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.$on('listManagerEvent', function (event, data) { $('#spinner').css('visibility', 'visible'); - console.log('listManagerEvent') + console.log('listManagerEvent'); + + + if ($rootScope.islistManagerEventAlredayDispachted == true) { @@ -7410,6 +7393,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); + + $rootScope.isHighlightBodyByBodySystem = false; + //1. $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)