Commit 5af49ee8c4683baeea9edb7ed4dbf561d1cf4ef1
1 parent
449197a5
now annotation shapes history is maintained on mode change. annotation text is d…
…ispalyed while annotatin toolbar is on. body part is hilghlighted and extracted also multi annottaion,highlight and extract is working while annotaion toolbar on
Showing
1 changed file
with
4 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6836,8 +6836,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -6836,8 +6836,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
6836 | 6836 | ||
6837 | previousHighlightList.push(RGBColor); | 6837 | previousHighlightList.push(RGBColor); |
6838 | // $scope.GetwindowStoreData(windowviewid, 'previousHighlightList', previousHighlightList); | 6838 | // $scope.GetwindowStoreData(windowviewid, 'previousHighlightList', previousHighlightList); |
6839 | - | ||
6840 | - $scope.highLightBodyBasedOnIcolor(RGBColor, windowviewid) | 6839 | + if ($scope.GetwindowStoreData(windowviewid,'isHighLight') == true) { |
6840 | + $scope.highLightBodyBasedOnIcolor(RGBColor, windowviewid); | ||
6841 | + } | ||
6841 | } | 6842 | } |
6842 | 6843 | ||
6843 | $rootScope.setSelectedBodyRegionData = function (windowviewid) { | 6844 | $rootScope.setSelectedBodyRegionData = function (windowviewid) { |
@@ -8053,7 +8054,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8053,7 +8054,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
8053 | } | 8054 | } |
8054 | 8055 | ||
8055 | $scope.enableNormalMode = function (windowviewid) { | 8056 | $scope.enableNormalMode = function (windowviewid) { |
8056 | - $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]); | 8057 | + // $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]); |
8057 | 8058 | ||
8058 | $('#btnTranparency_' + windowviewid).removeClass("disabled"); | 8059 | $('#btnTranparency_' + windowviewid).removeClass("disabled"); |
8059 | $('#btnTranparency_' + windowviewid).css("pointer-events", "auto"); | 8060 | $('#btnTranparency_' + windowviewid).css("pointer-events", "auto"); |