From 7d23cc171d146d08d52b6dbb334430cc450db2de Mon Sep 17 00:00:00 2001
From: nikita <nikita.kulshreshtha@ebix.com>
Date: Fri, 20 Jan 2017 16:13:28 +0530
Subject: [PATCH] fixed bug

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 3291621..119a4f5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1431,15 +1431,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $scope.highLightBodyBasedOnIcolor(RGBColor);
             }
 
-            //if ($rootScope.isNormalMode == true) {
-
-
-            //    $rootScope.previousHighlightList.push(RGBColor);
-            //}
-
+          
             //extarct clicked body part is extarct button is already enabled.
-            // debugger;
+
             if ($rootScope.isExtract == true) {
+                if ($rootScope.multiAnnotationIsON == false) {
+                    $rootScope.isListManagerSelected = false;
+                }
                 $scope.enableExtract(false);
             }
 
@@ -1740,15 +1738,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //see the annotation apart from leaf then the actual click will be on modesty canvas, but for annotation er
                 // 
             else if (maskCanvasId.match('modestyImg') && RGBColor == '000000') {
-                //if ($rootScope.voId == 11) {
-                //    maskCanvasId = 'imageCanvas6_mci';
-                //    x = $('#imageCanvas6_mci').left;
-                //    y = $('#imageCanvas6_mci').top;
-                //}
-                //else {
+               
                 bodyRegionId = maskCanvasId.slice(-1);
                 maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci';
-                // }
+               
                 var maskCanvas = document.getElementById(maskCanvasId);
                 var maskCanvasContext = maskCanvas.getContext("2d");
                 RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
@@ -1811,13 +1804,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
             }
 
-            //if ($rootScope.isNormalMode == true) {
-            //    $rootScope.previousHighlightList.push(RGBColor);
-            //}
-
-            // debugger;
+            
             //extarct clisked body part is extarct button is already enabled.
             if ($rootScope.isExtract == true) {
+                if ($rootScope.multiAnnotationIsON == false) {
+                    $rootScope.isListManagerSelected = false;
+                }
                 $scope.enableExtract(false);
             }
 
@@ -2065,7 +2057,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var CallBackBodyRegion = [];
         var selectedAnnotation;
 
-        if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0) && $rootScope.isListManagerSelected) {
+        if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
+             && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
 
             multiTermList = $scope.AllTerms;
             angular.forEach($rootScope.previousHighlightList, function (value, key) {
@@ -6362,9 +6355,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
 
                         var imageCanvas = document.getElementById(id);
 
-                        //var coloredCanvasID = 'imageCanvas' + bodyRegionId;
-                        //var coloredCanvas = document.getElementById(coloredCanvasID);
-
+                     
                         var width = value.Width;
                         var ht = value.Height;
 
@@ -6373,16 +6364,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         var coloredImageDataVar = coloredImageData;
 
 
-                        //if (value.haveMirror == 'true') {
-                        //    $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
-                        //}
-                        //else {
-
-                        //    $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
-
-                        //}
-
-
                         var context = imageCanvas.getContext('2d');
 
 
--
libgit2 0.21.4