diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 456d332..bcc3edf 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1505,7 +1505,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
if ($scope.isEligibleForHighlight == true) {
- if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
+ if ($scope.isExtract == true) {
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
+ $scope.highLightBody();
+ }
+ else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
+
+ console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight)
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -1853,10 +1860,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.isEligibleForHighlight = false;
}
+
if ($scope.isEligibleForHighlight == true) {
- if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
+ if ($scope.isExtract == true) {
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
+ $scope.highLightBody();
+ }
+ else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
+ console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight)
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -5160,6 +5174,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
}
+ // #7972 Mozilla Firefox> Incorrect navigation
+ $("#canvasDiv").scroll(function (event) {
+ $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
+ $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
+
+ });
+
+
+
$scope.enableExtract = function (isCalledFromButton) {
console.log('isCalledFromButton= ' + isCalledFromButton);
@@ -5607,6 +5630,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
context.putImageData(DAData.data, 0, 0)
+
+ //NIKI- to resolve lateral arm black issue in mode
+
+ if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 || value.bodyRegionId == 4)) {
+
+ var imgData = context.getImageData(0, 0, width, ht);
+ var data = imgData.data;
+ var c = 0;
+ for (var i = 0; i < data.length; i += 4) {
+ if (data[i] == data[i + 1] && data[i + 1] == data[i + 2] && data[i + 2] === 0) {
+ data[i + 3] = 0;
+ }
+
+ }
+ context.putImageData(imgData, 0, 0);
+ }
+
+
var grayImageData = context.getImageData(0, 0, width, ht);
var grayImageImageDataVar = grayImageData.data;