ADAM / AIAHTML5

Commit 4b43df6f4d7d9675e8411404139144cc24619ff3

Authored by Amrita Vishnoi
2 parents 4705a3f7 efca5b36

Merge branch 'DisableUI4' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 11 additions and 32 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4b43df6
@@ -1892,14 +1892,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1892,14 +1892,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1892 } 1892 }
1893 ); 1893 );
1894 } 1894 }
1895 - //else if ($scope.ColoredImageSRC.length == totalCanvas)  
1896 - //{  
1897 - // // dispatch event for enabling rest UI  
1898 - // alert('all canvas drawn');  
1899 - // $scope.EnableUI();  
1900 - //}  
1901 -  
1902 - //-NIKI-for solving extarct issue 8286 1895 +
1903 1896
1904 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR'); 1897 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
1905 1898
@@ -1915,11 +1908,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1915,11 +1908,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1915 } 1908 }
1916 1909
1917 1910
1918 -  
1919 - //  
1920 -  
1921 - // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)  
1922 - 1911 +
1923 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { 1912 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1924 1913
1925 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { 1914 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -1963,18 +1952,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1963,18 +1952,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1963 $scope.highLightBody(); 1952 $scope.highLightBody();
1964 } 1953 }
1965 else { 1954 else {
  1955 +
  1956 + //This block is executed when normal body is created and no further process like highlight,extract, etc
1966 $rootScope.isLoading = false; 1957 $rootScope.isLoading = false;
1967 $('#spinner').css('visibility', 'hidden'); 1958 $('#spinner').css('visibility', 'hidden');
1968 - //debugger; 1959 +
1969 $scope.EnableUI(); 1960 $scope.EnableUI();
  1961 +
1970 } 1962 }
1971 } 1963 }
1972 - else {  
1973 - $rootScope.isLoading = false;  
1974 - $('#spinner').css('visibility', 'hidden');  
1975 - //debugger;  
1976 - $scope.EnableUI();  
1977 - } 1964 +
1978 } 1965 }
1979 1966
1980 console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); 1967 console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
@@ -2331,8 +2318,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2331,8 +2318,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2331 ); 2318 );
2332 } 2319 }
2333 2320
2334 - //-NIKI-for solving extarct issue 8286  
2335 - 2321 +
2336 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId); 2322 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId);
2337 2323
2338 if (imageCanvas != null || imageCanvas != undefined) { 2324 if (imageCanvas != null || imageCanvas != undefined) {
@@ -2346,9 +2332,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2346,9 +2332,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2346 2332
2347 $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar; 2333 $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
2348 } 2334 }
2349 - //  
2350 -  
2351 - 2335 +
2352 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) { 2336 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
2353 2337
2354 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) { 2338 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
@@ -2399,18 +2383,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -2399,18 +2383,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2399 2383
2400 } 2384 }
2401 else { 2385 else {
  2386 + //This block is executed when normal body is created and no further process like highlight,extract, etc
2402 $rootScope.isLoading = false; 2387 $rootScope.isLoading = false;
2403 $('#spinner').css('visibility', 'hidden'); 2388 $('#spinner').css('visibility', 'hidden');
2404 - //debugger;  
2405 $scope.EnableUI(); 2389 $scope.EnableUI();
2406 } 2390 }
2407 } 2391 }
2408 - else {  
2409 - $rootScope.isLoading = false;  
2410 - $('#spinner').css('visibility', 'hidden');  
2411 - //debugger;  
2412 - $scope.EnableUI();  
2413 - } 2392 +
2414 } 2393 }
2415 2394
2416 console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); 2395 console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);