ADAM / AIAHTML5

Commit 29cd8ddc1c4d2696f514668e5a6741a002892461

Authored by Amrita Vishnoi
2 parents 34fb900d 485e8c02

Merge branch '3145ac5b-Removed' into Develop

Inline Side-by-side
Showing 5 changed files with 50 additions and 48 deletions
150-DOCUMENTATION/~$AIA-Aug-Report.pptx 0 → 100644
View file @29cd8dd
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @29cd8dd
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="false"/>
  42 + <add key="isUserAuthenticated" value="false
43 43 </appSettings>
44 44 <system.web>
45 45 <compilation debug="true" targetFramework="4.5" />
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @29cd8dd
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @29cd8dd
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @29cd8dd
... ... @@ -1498,7 +1498,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1498 1498 }
1499 1499  
1500 1500 // $rootScope.previousHighlightList.push(RGBColor);
1501   - $scope.isClickedOnBodyForHighlight = true;
  1501 + // $scope.isClickedOnBodyForHighlight = true;
1502 1502 $scope.highLightBodyBasedOnIcolor(RGBColor);
1503 1503 }
1504 1504  
... ... @@ -1506,9 +1506,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1506 1506 //extarct clicked body part is extarct button is already enabled.
1507 1507  
1508 1508 if ($rootScope.isExtract == true) {
1509   - if ($rootScope.multiAnnotationIsON == false) {
1510   - $rootScope.isListManagerSelected = false;
1511   - }
  1509 + //if ($rootScope.multiAnnotationIsON == false) {
  1510 + // $rootScope.isListManagerSelected = false;
  1511 + //}
1512 1512 $scope.enableExtract(false);
1513 1513 }
1514 1514  
... ... @@ -1880,7 +1880,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1880 1880 if (maskCanvasId.match('modestyImg') && RGBColor != '000000') { }
1881 1881 else
1882 1882 {
1883   - $scope.isClickedOnBodyForHighlight = true;
  1883 + //$scope.isClickedOnBodyForHighlight = true;
1884 1884 $scope.highLightBodyBasedOnIcolor(RGBColor);
1885 1885 }
1886 1886  
... ... @@ -1889,9 +1889,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1889 1889  
1890 1890 //extarct clisked body part is extarct button is already enabled.
1891 1891 if ($rootScope.isExtract == true) {
1892   - if ($rootScope.multiAnnotationIsON == false) {
1893   - $rootScope.isListManagerSelected = false;
1894   - }
  1892 + //if ($rootScope.multiAnnotationIsON == false) {
  1893 + // $rootScope.isListManagerSelected = false;
  1894 + //}
1895 1895 $scope.enableExtract(false);
1896 1896 }
1897 1897  
... ... @@ -2137,7 +2137,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2137 2137 var selectedAnnotation;
2138 2138  
2139 2139 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)
2140   - && $rootScope.isListManagerSelected && $rootScope.multiAnnotationIsON == true) {
  2140 + && $rootScope.isListManagerSelected) {
2141 2141  
2142 2142 multiTermList = $scope.AllTerms;
2143 2143 angular.forEach($rootScope.previousHighlightList, function (value, key) {
... ... @@ -2504,7 +2504,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2504 2504  
2505 2505 console.log('before worker call BRID: ' + bodyRegionId)
2506 2506  
2507   - if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
  2507 + if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null) {
  2508 + //if (grayImageDataVar != null && coloredImageDataVar != null && maskData != null && TermList != undefined && TermList.length > 0) {
2508 2509 worker.postMessage({
2509 2510  
2510 2511 'termList': TermList,
... ... @@ -2516,10 +2517,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2516 2517  
2517 2518 });
2518 2519 }
2519   - else {
2520   - $('#spinner').css('visibility', 'hidden')
2521   - $rootScope.isLoading = false;
2522   - }
  2520 + //else {
  2521 + // $('#spinner').css('visibility', 'hidden')
  2522 + // $rootScope.isLoading = false;
  2523 + //}
2523 2524  
2524 2525  
2525 2526 worker.onmessage = function (e) {
... ... @@ -2577,23 +2578,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2577 2578 if ($rootScope.isListManagerSelected == true) {
2578 2579 $scope.aligneCanvasWithTerm();
2579 2580 }
2580   - else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
2581   - var canvasDiv = document.getElementById('canvasDiv');
2582   - if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
2583   -
2584   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
2585   - var canvasDiv = document.getElementById('canvasDiv');
2586   - $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
2587   - }
2588   - else {
2589   - $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
2590   - $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
2591   - $rootScope.isLoading = false;
2592   - }
2593   - $('#spinner').css('visibility', 'hidden');
2594   - }
2595   - else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
2596   - ) {
  2581 + //else if ($rootScope.previousHighlightList != undefined && $rootScope.previousHighlightList.length > 0 && ($scope.isGenderChnage == true || $scope.isViewChange == true)) {
  2582 + // var canvasDiv = document.getElementById('canvasDiv');
  2583 + // if ($rootScope.viewOrientationId == '1' || $rootScope.viewOrientationId == '4') {
  2584 +
  2585 + // $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  2586 + // var canvasDiv = document.getElementById('canvasDiv');
  2587 + // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
  2588 + // }
  2589 + // else {
  2590 + // $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
  2591 + // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
  2592 + // $rootScope.isLoading = false;
  2593 + //}
  2594 + // $('#spinner').css('visibility', 'hidden');
  2595 + //}
  2596 + //else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true || $scope.isClickedOnBodyForHighlight
  2597 + // )
  2598 + else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true){
2597 2599  
2598 2600 $rootScope.isLoading = false;
2599 2601  
... ... @@ -2605,13 +2607,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2605 2607 var canvasDiv = document.getElementById('canvasDiv');
2606 2608 $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition);
2607 2609 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition);
2608   - // }
  2610 + }
2609 2611  
2610 2612 $rootScope.isLoading = false;
2611 2613  
2612 2614 $('#spinner').css('visibility', 'hidden');
2613 2615  
2614   - }
  2616 +
2615 2617  
2616 2618 }
2617 2619 }
... ... @@ -6560,10 +6562,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6560 6562 else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
6561 6563 $scope.createTermListByPreviousTermsAndHighlight();
6562 6564 }
6563   - else {
6564   - $scope.isLoading = false;
6565   - $('#spinner').css('visibility', 'hidden');
6566   - }
  6565 + //else {
  6566 + // $scope.isLoading = false;
  6567 + // $('#spinner').css('visibility', 'hidden');
  6568 + //}
6567 6569  
6568 6570 }
6569 6571  
... ... @@ -6991,12 +6993,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6991 6993 $scope.setLayerNumberAndHighlightByTermList();
6992 6994  
6993 6995 }
6994   - else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
6995   - ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
  6996 + //else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
  6997 + // ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
6996 6998  
6997   - $rootScope.isHighLight = true
6998   - $scope.setLayerNumberAndHighlightByTermList();
6999   - }
  6999 + // $rootScope.isHighLight = true
  7000 + // $scope.setLayerNumberAndHighlightByTermList();
  7001 + //}
7000 7002  
7001 7003 else {
7002 7004  
... ... @@ -7062,11 +7064,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7062 7064 $scope.layerNumber = 0;
7063 7065  
7064 7066 //remove existing body view
7065   - var canDiv = document.getElementById('canvasDiv');
7066   - var canDivChildCount = canDiv.childElementCount;
7067   - if (canDivChildCount > 0) {
7068   - canDiv.innerHTML = '';
7069   - }
  7067 + //var canDiv = document.getElementById('canvasDiv');
  7068 + //var canDivChildCount = canDiv.childElementCount;
  7069 + //if (canDivChildCount > 0) {
  7070 + // canDiv.innerHTML = '';
  7071 + //}
7070 7072  
7071 7073 var selectedViewId = $scope.bodyViews[event.currentTarget.title];
7072 7074 $rootScope.viewOrientationId = selectedViewId;
... ...