diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 69bd93c..9a768c3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1498,7 +1498,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
// $rootScope.previousHighlightList.push(RGBColor);
- $scope.isClickedOnBodyForHighlight = true;
+ // $scope.isClickedOnBodyForHighlight = true;
$scope.highLightBodyBasedOnIcolor(RGBColor);
}
@@ -1880,7 +1880,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
if (maskCanvasId.match('modestyImg') && RGBColor != '000000') { }
else
{
- $scope.isClickedOnBodyForHighlight = true;
+ //$scope.isClickedOnBodyForHighlight = true;
$scope.highLightBodyBasedOnIcolor(RGBColor);
}
@@ -2504,7 +2504,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
console.log('before worker call BRID: ' + bodyRegionId)
- if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
+ if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {
+ //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
worker.postMessage({
'termList': TermList,
@@ -2516,10 +2517,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
});
}
- else {
- $('#spinner').css('visibility', 'hidden')
- $rootScope.isLoading = false;
- }
+ //else {
+ // $('#spinner').css('visibility', 'hidden')
+ // $rootScope.isLoading = false;
+ //}
worker.onmessage = function (e) {
@@ -2577,23 +2578,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
if ($rootScope.isListManagerSelected == true) {
$scope.aligneCanvasWithTerm();
}
- else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
- var canvasDiv = document.getElementById('canvasDiv');
- if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
-
- $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
- var canvasDiv = document.getElementById('canvasDiv');
- $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
- }
- else {
- $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
- $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
- $rootScope.isLoading = false;
- }
- $('#spinner').css('visibility', 'hidden');
- }
- else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
- ) {
+ //else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
+ // var canvasDiv = document.getElementById('canvasDiv');
+ // if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
+
+ // $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+ // var canvasDiv = document.getElementById('canvasDiv');
+ // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
+ // }
+ // else {
+ // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
+ // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
+ // $rootScope.isLoading = false;
+ //}
+ // $('#spinner').css('visibility', 'hidden');
+ //}
+ //else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
+ // )
+ else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true){
$rootScope.isLoading = false;
@@ -2605,13 +2607,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var canvasDiv = document.getElementById('canvasDiv');
$('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
$('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
- // }
+ }
$rootScope.isLoading = false;
$('#spinner').css('visibility', 'hidden');
- }
+
}
}
@@ -6560,10 +6562,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
$scope.createTermListByPreviousTermsAndHighlight();
}
- else {
- $scope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
- }
+ //else {
+ // $scope.isLoading = false;
+ // $('#spinner').css('visibility', 'hidden');
+ //}
}
@@ -6991,12 +6993,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.setLayerNumberAndHighlightByTermList();
}
- else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
- ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
+ //else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
+ // ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
- $rootScope.isHighLight = true
- $scope.setLayerNumberAndHighlightByTermList();
- }
+ // $rootScope.isHighLight = true
+ // $scope.setLayerNumberAndHighlightByTermList();
+ //}
else {
@@ -7062,11 +7064,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.layerNumber = 0;
//remove existing body view
- var canDiv = document.getElementById('canvasDiv');
- var canDivChildCount = canDiv.childElementCount;
- if (canDivChildCount > 0) {
- canDiv.innerHTML = '';
- }
+ //var canDiv = document.getElementById('canvasDiv');
+ //var canDivChildCount = canDiv.childElementCount;
+ //if (canDivChildCount > 0) {
+ // canDiv.innerHTML = '';
+ //}
var selectedViewId = $scope.bodyViews[event.currentTarget.title];
$rootScope.viewOrientationId = selectedViewId;