Commit 17b7d66f22884f3235d900e4b0c68fe9cf8e2cfe
Merge branch 'NormalAfterLM' into Develop
Showing
1 changed file
with
6 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1917,7 +1917,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1917,7 +1917,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
1917 | 1917 | ||
1918 | 1918 | ||
1919 | //terminate previous running workers to create space for new workers | 1919 | //terminate previous running workers to create space for new workers |
1920 | - | 1920 | + $scope.layerNumber = $('#txtlayerNumber').val(); |
1921 | $scope.terminateCurrentlyRunningWPs(); | 1921 | $scope.terminateCurrentlyRunningWPs(); |
1922 | 1922 | ||
1923 | $timeout(function () { | 1923 | $timeout(function () { |
@@ -2090,6 +2090,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2090,6 +2090,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2090 | // $rootScope.updatedGrayDataList = null; | 2090 | // $rootScope.updatedGrayDataList = null; |
2091 | // $rootScope.updatedGrayDataList = []; | 2091 | // $rootScope.updatedGrayDataList = []; |
2092 | //} | 2092 | //} |
2093 | + | ||
2094 | + $scope.layerNumber = $('#txtlayerNumber').val(); | ||
2095 | + | ||
2093 | $rootScope.isLoading = true; | 2096 | $rootScope.isLoading = true; |
2094 | $('#spinner').css('visibility', 'visible'); | 2097 | $('#spinner').css('visibility', 'visible'); |
2095 | 2098 | ||
@@ -5030,6 +5033,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5030,6 +5033,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5030 | $rootScope.isListManagerSelected = false; | 5033 | $rootScope.isListManagerSelected = false; |
5031 | 5034 | ||
5032 | //7. | 5035 | //7. |
5036 | + | ||
5037 | + $scope.layerNumber = $('#txtlayerNumber').val(); | ||
5033 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); | 5038 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); |
5034 | // alert($rootScope.viewOrientationId + "gadash") | 5039 | // alert($rootScope.viewOrientationId + "gadash") |
5035 | 5040 |