diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index d406371..45eb5ab 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -72,6 +72,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //normal mode $rootScope.isNormalMode = false; + $rootScope.isZoomed = false; //navigator man functionality $scope.NavOrientationdata; @@ -1071,7 +1072,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo FlipedImgCanvas.style.visibility = 'visible' } else { - if ($rootScope.isHighLight == true) { + if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { FlipedImgCanvas.style.visibility = 'hidden'; } } @@ -1310,14 +1311,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo imgCanvas.id = 'imageCanvas' + bodyRegionId; - if ($rootScope.isExtract == true) { - imgCanvas.style.visibility = 'visible' - } - else { - if ($rootScope.isHighLight == true) { - imgCanvas.style.visibility = 'hidden'; - } - } + if (bodyRegionId == 3) { //set z index of hip canavs to fix the issue caused by overlapping of arm canavs on hip canavs. @@ -1333,6 +1327,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (($scope.voId == 11 || $scope.voId == 9) && bodyRegionId == 6) { imgCanvas.style.zIndex = "500"; } + + if ($rootScope.isExtract == true) { + imgCanvas.style.visibility = 'visible' + } + else { + + if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { + imgCanvas.style.visibility = 'hidden'; + } + } + + + } imgCanvas.addEventListener('click', function (evt) { @@ -2242,8 +2249,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('.dynCross').on('click', function (evt) { $(this).parent().parent().parent().css('display', 'none'); - - }); @@ -4139,7 +4144,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $scope.Zoom = function () { + $scope.enableZoom = function () { + + $rootScope.isZoomed = true; + //1. $scope.flushCanvas(); if ($scope.zoomInOut == 25) { @@ -4150,7 +4158,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.zoomInOut = 25; } + //2. $scope.CalculateImageCordinates($scope.viewOrientationId); + + //3. if ($scope.zoomInOut == 25) $('#canvasDiv').scrollLeft(0) else @@ -4164,6 +4175,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($('#sppeachBubble').length > 0) { $('#sppeachBubble').remove(); } + + //4. + if ($rootScope.isHighLight == true) { + + $timeout(function () { $scope.highLightBody() }, 50); + } } $scope.flushCanvas = function () { @@ -4194,7 +4211,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); } - $scope.enableHighlight = function () { + $scope.enableHighlight = function () + { if ($rootScope.isHighLight == true) { @@ -4202,6 +4220,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { $rootScope.isHighLight = true; $rootScope.isNormalMode = false; + $rootScope.isZoomed = false; + if ($rootScope.isExtract == true) { //1. $rootScope.isExtract = false; @@ -4210,6 +4230,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //2. $scope.CalculateImageCordinates($scope.viewOrientationId); + + } //3. @@ -4238,7 +4260,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //4. $rootScope.isExtract = false; + //5. + $rootScope.isZoomed = false; + + //6. $scope.CalculateImageCordinates($scope.viewOrientationId); + + } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 010dbb5..fe94fe1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -105,7 +105,7 @@
-