ADAM / AIAHTML5

Commit efca5b367ff540afc24c08aa9066c69711be389f

Authored by Nikita Kulshreshtha
1 parent 7702bf14

removed the enableUI code if body view is not drawn fully

Inline Side-by-side
Showing 1 changed file with 11 additions and 32 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @efca5b3
... ... @@ -1860,14 +1860,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1860 1860 }
1861 1861 );
1862 1862 }
1863   - //else if ($scope.ColoredImageSRC.length == totalCanvas)
1864   - //{
1865   - // // dispatch event for enabling rest UI
1866   - // alert('all canvas drawn');
1867   - // $scope.EnableUI();
1868   - //}
1869   -
1870   - //-NIKI-for solving extarct issue 8286
  1863 +
1871 1864  
1872 1865 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
1873 1866  
... ... @@ -1883,11 +1876,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1883 1876 }
1884 1877  
1885 1878  
1886   -
1887   - //
1888   -
1889   - // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1890   -
  1879 +
1891 1880 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1892 1881  
1893 1882 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
... ... @@ -1931,18 +1920,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1931 1920 $scope.highLightBody();
1932 1921 }
1933 1922 else {
  1923 +
  1924 + //This block is executed when normal body is created and no further process like highlight,extract, etc
1934 1925 $rootScope.isLoading = false;
1935 1926 $('#spinner').css('visibility', 'hidden');
1936   - //debugger;
  1927 +
1937 1928 $scope.EnableUI();
  1929 +
1938 1930 }
1939 1931 }
1940   - else {
1941   - $rootScope.isLoading = false;
1942   - $('#spinner').css('visibility', 'hidden');
1943   - //debugger;
1944   - $scope.EnableUI();
1945   - }
  1932 +
1946 1933 }
1947 1934  
1948 1935 console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
... ... @@ -2299,8 +2286,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2299 2286 );
2300 2287 }
2301 2288  
2302   - //-NIKI-for solving extarct issue 8286
2303   -
  2289 +
2304 2290 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId);
2305 2291  
2306 2292 if (imageCanvas != null || imageCanvas != undefined) {
... ... @@ -2314,9 +2300,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2314 2300  
2315 2301 $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
2316 2302 }
2317   - //
2318   -
2319   -
  2303 +
2320 2304 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
2321 2305  
2322 2306 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
... ... @@ -2367,18 +2351,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2367 2351  
2368 2352 }
2369 2353 else {
  2354 + //This block is executed when normal body is created and no further process like highlight,extract, etc
2370 2355 $rootScope.isLoading = false;
2371 2356 $('#spinner').css('visibility', 'hidden');
2372   - //debugger;
2373 2357 $scope.EnableUI();
2374 2358 }
2375 2359 }
2376   - else {
2377   - $rootScope.isLoading = false;
2378   - $('#spinner').css('visibility', 'hidden');
2379   - //debugger;
2380   - $scope.EnableUI();
2381   - }
  2360 +
2382 2361 }
2383 2362  
2384 2363 console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
... ...