ADAM / AIAHTML5

Commit 6346f5c07ac96994d8b95d8681c8ecf434e547d8

Authored by Nikita Kulshreshtha
1 parent 4d0f7dfb

added removed code of bug 12159. 

now issue is the annotations are  not shown(undefined) whe we change view form lateral arm to medial arm and vice verca.
Inline Side-by-side
Showing 1 changed file with 40 additions and 40 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6346f5c
@@ -1502,7 +1502,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1502,7 +1502,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1502 } 1502 }
1503 1503
1504 // $rootScope.previousHighlightList.push(RGBColor); 1504 // $rootScope.previousHighlightList.push(RGBColor);
1505 - // $scope.isClickedOnBodyForHighlight = true; 1505 + $scope.isClickedOnBodyForHighlight = true;
1506 $scope.highLightBodyBasedOnIcolor(RGBColor); 1506 $scope.highLightBodyBasedOnIcolor(RGBColor);
1507 } 1507 }
1508 1508
@@ -1510,9 +1510,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1510,9 +1510,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1510 //extarct clicked body part is extarct button is already enabled. 1510 //extarct clicked body part is extarct button is already enabled.
1511 1511
1512 if ($rootScope.isExtract == true) { 1512 if ($rootScope.isExtract == true) {
1513 - //if ($rootScope.multiAnnotationIsON == false) {  
1514 - // $rootScope.isListManagerSelected = false;  
1515 - //} 1513 + if ($rootScope.multiAnnotationIsON == false) {
  1514 + $rootScope.isListManagerSelected = false;
  1515 + }
1516 $scope.enableExtract(false); 1516 $scope.enableExtract(false);
1517 } 1517 }
1518 1518
@@ -1884,7 +1884,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1884,7 +1884,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1884 if (maskCanvasId.match('modestyImg') && RGBColor != '000000') { } 1884 if (maskCanvasId.match('modestyImg') && RGBColor != '000000') { }
1885 else 1885 else
1886 { 1886 {
1887 - //$scope.isClickedOnBodyForHighlight = true; 1887 + $scope.isClickedOnBodyForHighlight = true;
1888 $scope.highLightBodyBasedOnIcolor(RGBColor); 1888 $scope.highLightBodyBasedOnIcolor(RGBColor);
1889 } 1889 }
1890 1890
@@ -1893,9 +1893,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1893,9 +1893,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1893 1893
1894 //extarct clisked body part is extarct button is already enabled. 1894 //extarct clisked body part is extarct button is already enabled.
1895 if ($rootScope.isExtract == true) { 1895 if ($rootScope.isExtract == true) {
1896 - //if ($rootScope.multiAnnotationIsON == false) {  
1897 - // $rootScope.isListManagerSelected = false;  
1898 - //} 1896 + if ($rootScope.multiAnnotationIsON == false) {
  1897 + $rootScope.isListManagerSelected = false;
  1898 + }
1899 $scope.enableExtract(false); 1899 $scope.enableExtract(false);
1900 } 1900 }
1901 1901
@@ -2141,7 +2141,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2141,7 +2141,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2141 var selectedAnnotation; 2141 var selectedAnnotation;
2142 2142
2143 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0) 2143 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
2144 - && $rootScope.isListManagerSelected) { 2144 + && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
2145 2145
2146 multiTermList = $scope.AllTerms; 2146 multiTermList = $scope.AllTerms;
2147 angular.forEach($rootScope.previousHighlightList, function (value, key) { 2147 angular.forEach($rootScope.previousHighlightList, function (value, key) {
@@ -2508,8 +2508,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2508,8 +2508,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2508 2508
2509 console.log('before worker call BRID: ' + bodyRegionId) 2509 console.log('before worker call BRID: ' + bodyRegionId)
2510 2510
2511 - if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {  
2512 - //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) { 2511 + //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {
  2512 + if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
2513 worker.postMessage({ 2513 worker.postMessage({
2514 2514
2515 'termList': TermList, 2515 'termList': TermList,
@@ -2521,10 +2521,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2521,10 +2521,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2521 2521
2522 }); 2522 });
2523 } 2523 }
2524 - //else {  
2525 - // $('#spinner').css('visibility', 'hidden')  
2526 - // $rootScope.isLoading = false;  
2527 - //} 2524 + else {
  2525 + $('#spinner').css('visibility', 'hidden')
  2526 + $rootScope.isLoading = false;
  2527 + }
2528 2528
2529 2529
2530 worker.onmessage = function (e) { 2530 worker.onmessage = function (e) {
@@ -2582,21 +2582,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2582,21 +2582,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2582 if ($rootScope.isListManagerSelected == true) { 2582 if ($rootScope.isListManagerSelected == true) {
2583 $scope.aligneCanvasWithTerm(); 2583 $scope.aligneCanvasWithTerm();
2584 } 2584 }
2585 - //else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {  
2586 - // var canvasDiv = document.getElementById('canvasDiv');  
2587 - // if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {  
2588 -  
2589 - // $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)  
2590 - // var canvasDiv = document.getElementById('canvasDiv');  
2591 - // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);  
2592 - // }  
2593 - // else {  
2594 - // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);  
2595 - // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);  
2596 - // $rootScope.isLoading = false;  
2597 - //}  
2598 - // $('#spinner').css('visibility', 'hidden');  
2599 - //} 2585 + else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
  2586 + var canvasDiv = document.getElementById('canvasDiv');
  2587 + if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
  2588 +
  2589 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  2590 + var canvasDiv = document.getElementById('canvasDiv');
  2591 + $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
  2592 + }
  2593 + else {
  2594 + $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
  2595 + $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
  2596 + $rootScope.isLoading = false;
  2597 + }
  2598 + $('#spinner').css('visibility', 'hidden');
  2599 + }
2600 //else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight 2600 //else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
2601 // ) 2601 // )
2602 else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true){ 2602 else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true){
@@ -6996,12 +6996,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6996,12 +6996,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6996 $scope.setLayerNumberAndHighlightByTermList(); 6996 $scope.setLayerNumberAndHighlightByTermList();
6997 6997
6998 } 6998 }
6999 - //else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&  
7000 - // ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) { 6999 + else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
  7000 + ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
7001 7001
7002 - // $rootScope.isHighLight = true  
7003 - // $scope.setLayerNumberAndHighlightByTermList();  
7004 - //} 7002 + $rootScope.isHighLight = true
  7003 + $scope.setLayerNumberAndHighlightByTermList();
  7004 + }
7005 7005
7006 else { 7006 else {
7007 7007
@@ -7066,11 +7066,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -7066,11 +7066,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7066 $scope.layerNumber = 0; 7066 $scope.layerNumber = 0;
7067 7067
7068 //remove existing body view 7068 //remove existing body view
7069 - //var canDiv = document.getElementById('canvasDiv');  
7070 - //var canDivChildCount = canDiv.childElementCount;  
7071 - //if (canDivChildCount > 0) {  
7072 - // canDiv.innerHTML = '';  
7073 - //} 7069 + var canDiv = document.getElementById('canvasDiv');
  7070 + var canDivChildCount = canDiv.childElementCount;
  7071 + if (canDivChildCount > 0) {
  7072 + canDiv.innerHTML = '';
  7073 + }
7074 7074
7075 var selectedViewId = $scope.bodyViews[event.currentTarget.title]; 7075 var selectedViewId = $scope.bodyViews[event.currentTarget.title];
7076 $rootScope.viewOrientationId = selectedViewId; 7076 $rootScope.viewOrientationId = selectedViewId;