Merge branch 'Bug#8127' into Develop

Amrita Vishnoi
2 parents a6d2f05d 8cf2a152
Showing 1 changed file with 66 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1943,18 +1943,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.HighlightBodyOnExtract = function () {
         console.log(' insode HighlightBodyOnExtract. $rootScope.MaskCanvasData length= ' + $rootScope.MaskCanvasData.length + ', $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
+        //terminate previous running workers to create space for new workers
+        $scope.layerNumber = $('#txtlayerNumber').val();
+        $scope.terminateCurrentlyRunningWPs();
+
         var multiTermList = [];
         var CallBackBodyRegion = [];
+        var selectedAnnotation;
         if ($rootScope.isListManagerSelected) {
             multiTermList = $scope.AllTerms;
+            selectedAnnotation = $rootScope.actualTermNumber;
         }
         else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
             angular.forEach($rootScope.previousHighlightList, function (value, key) {
                 var ActualTermNo = $scope.getActualTermNumber(value);
+                selectedAnnotation = ActualTermNo;
                 if (ActualTermNo != null) {
                     var TermList = $scope.getTermNumberList(ActualTermNo);
                     if (TermList != null) {
@@ -1968,16 +1975,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             });
         }
-        //2. Find Actul Term No Based on Icolor.
-        //var ActualTermNo = $scope.getActualTermNumber(RGBColor);
-
-        ////3. Find Term No List Based on ActualTermNo
-        //var TermList = $scope.getTermNumberList(ActualTermNo);
+        //get term list to get term coordinates
+        $scope.TermList = $scope.getTermNumberList(selectedAnnotation);
-
-        //terminate previous running workers to create space for new workers
-        $scope.layerNumber = $('#txtlayerNumber').val();
-        $scope.terminateCurrentlyRunningWPs();
+        $scope.termCoordinate = $scope.getTermCoordinate(selectedAnnotation);
+        
+     
         $timeout(function () {
@@ -2076,7 +2079,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             grayCanvasContext.putImageData(updatedData, 0, 0);
-                        
                             //to resolve lateral arm black issue in highlight mode
                             if ($rootScope.viewOrientationId == 5 && (bodyRegionId == 6 || bodyRegionId == 4)) {
@@ -2098,6 +2100,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                 grayCanvasContext.putImageData(imgData, 0, 0);
                             }
+                            CallBackBodyRegion.push(bodyRegionId);
+
+                            $scope.doAligneCanvasWithTerm = false;
+                            if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && (CallBackBodyRegion.length == 9)) {
+                                $scope.doAligneCanvasWithTerm = true;
+                            }
+                            else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && (CallBackBodyRegion.length == 5)) {
+                                $scope.doAligneCanvasWithTerm = true;
+                            }
+                            else if ((($rootScope.viewOrientationId == '5')) && (CallBackBodyRegion.length == 1)) {
+                                $scope.doAligneCanvasWithTerm = true;
+                            }
+                            else if ((($rootScope.viewOrientationId == '6')) && (CallBackBodyRegion.length == 1)) {
+                                $scope.doAligneCanvasWithTerm = true;
+                            }
+
                             if ($rootScope.multiAnnotationIsON == true) {
@@ -2125,9 +2143,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             //    }
                             //}
+                            if ($scope.doAligneCanvasWithTerm == true) {
+                                $scope.aligneCanvasWithTerm()
+                            }
                             $timeout(function () { $scope.DisableProgressBar() }, 1000);
+                            
+                          
                         };
                         worker.onerror = function (e) {
                             alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
@@ -3579,7 +3602,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.createTransparencyBox = function () {
-        $scope.isTransparencyActivated  = true;
+        
+        $scope.isTransparencyBtnClicked = true;
         //do not create TBOX if in extarct mode otherwise create
         if ($rootScope.isExtract == false) {
@@ -3746,6 +3770,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             document.getElementById('canvasDiv').appendChild(tempCanvas);
         }
+        $scope.isTransparencyActivated = true;
         var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
@@ -4876,9 +4901,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.CloseListManager();
         // $('#btnIdentity').addClass('btn-primary');
-        if ($scope.isTransparencyActivated  == true) {
+        if ($scope.isTransparencyBtnClicked == true) {
-            $scope.isTransparencyActivated  = false;
+           $scope.isTransparencyBtnClicked =  false;
             var canvasDiv = document.getElementById('canvasDiv');
             canvasDiv.removeEventListener("mousedown", mouseDownListener);
@@ -4899,7 +4924,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.isTransparencyBoxActivated = false;
         $rootScope.isNormalMode = false;
-
+       
         //if listanager is visisble then close it
         $rootScope.CloseListManager();
@@ -4930,21 +4955,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
         else {
             $scope.zoomInOut = 25;
+           
+
         }
         //2.
         $scope.CalculateImageCordinates($rootScope.viewOrientationId);
         //3.
-        if ($scope.zoomInOut == 25) {
-            if ($('#canvasDiv') != null)
-                $('#canvasDiv').scrollLeft(0)
-        }
-        else {
-            if ($('#canvasDiv') != null)
-               $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
-        }
+    
+            if ($scope.zoomInOut == 25) {
+                if ($('#canvasDiv') != null)
+                    $('#canvasDiv').scrollLeft(0)
+
+            }
+            else {
+                if ($('#canvasDiv') != null)
+                    $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+
+                
+            }
+
+       
         //remove annotation speech bubble
         if ($('#dot').length > 0) {
             $('#dot').remove();
@@ -5263,8 +5296,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
-
-
+       
         if ($scope.isTransparencyActivated  == true) {
             $("#btnExtract").addClass("disabled");
@@ -5857,8 +5889,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
        // $rootScope.isHighlightBodyByBodySystem = false;
-        $rootScope.isLoading = true;
-        $('#spinner').css('visibility', 'visible');
+       
         $rootScope.isGenderChnage = true;
@@ -5873,6 +5904,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //2 first update the currentbodyviewid in local storage
             localStorage.setItem("currentBodyViewId", currentBodyViewId);
+            $rootScope.isLoading = true;
+            $('#spinner').css('visibility', 'visible');
             //3.
             $scope.layerNumber = 0;
             $scope.loadSelectedBodyView(currentBodyViewId);
@@ -5901,6 +5934,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //2. first update the currentbodyviewid in local storage
             localStorage.setItem("currentBodyViewId", currentBodyViewId);
+            $rootScope.isLoading = true;
+            $('#spinner').css('visibility', 'visible');
             //3.
             $scope.layerNumber = 0;
             $scope.loadSelectedBodyView(currentBodyViewId);
@@ -6059,9 +6094,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
       //  $rootScope.isHighlightBodyByBodySystem = false;
-        $rootScope.isLoading = true;
-        $('#spinner').css('visibility', 'visible');
-
         if ($rootScope.openViews.length > 0) {
             $rootScope.openViews.splice($rootScope.openViews.length - 1);
@@ -6084,6 +6116,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $rootScope.voId = selectedViewId;
                 $rootScope.isLoading = true;
+                $rootScope.isLoading = true;
+                $('#spinner').css('visibility', 'visible');
+
                 //1. first update the currentbodyviewid in local storage
                 localStorage.setItem("currentBodyViewId", $rootScope.voId);
@@ -6119,6 +6154,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $rootScope.voId = selectedViewId;
                 $rootScope.isLoading = true;
+                $rootScope.isLoading = true;
+                $('#spinner').css('visibility', 'visible');
                 //1.
                 $scope.loadSelectedBodyView($rootScope.voId);