ADAM / AIAHTML5

Commit 975942311a8b73071f99a9c9b3ddc46cd2deb6b4

Authored by Nikita Kulshreshtha
2 parents 56375750 b32144cb

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Inline Side-by-side
Showing 1 changed file with 25 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @9759423
... ... @@ -1943,6 +1943,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1943 1943 $scope.HighlightBodyOnExtract = function () {
1944 1944 console.log(' insode HighlightBodyOnExtract. $rootScope.MaskCanvasData length= ' + $rootScope.MaskCanvasData.length + ', $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
1945 1945  
  1946 +
  1947 + $("#btnExtract").removeClass("btn-black");
  1948 + $("#btnExtract").addClass("btn-primary");
  1949 +
  1950 +
  1951 + if ($("#btnNormalMode").hasClass("btn-primary")) {
  1952 + $("#btnNormalMode").removeClass("btn-primary");
  1953 + $("#btnNormalMode").addClass("btn-black");
  1954 + }
  1955 +
  1956 + if ($("#btnHighLight").hasClass("btn-primary")) {
  1957 + $("#btnHighLight").removeClass("btn-primary");
  1958 + $("#btnHighLight").addClass("btn-black");
  1959 + }
  1960 +
  1961 +
1946 1962 //terminate previous running workers to create space for new workers
1947 1963 $scope.layerNumber = $('#txtlayerNumber').val();
1948 1964 $scope.terminateCurrentlyRunningWPs();
... ... @@ -7981,14 +7997,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7981 7997  
7982 7998 }
7983 7999 }
7984   - $('#spinner').css('visibility', 'visible');
7985   - console.log('listManagerEvent');
  8000 +
7986 8001  
7987 8002  
7988 8003  
7989 8004 if ($rootScope.islistManagerEventAlredayDispachted == true) {
7990 8005  
7991   -
  8006 + $('#spinner').css('visibility', 'visible');
  8007 + console.log('listManagerEvent');
7992 8008 var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
7993 8009  
7994 8010 $('#bodySystems').empty();
... ... @@ -8076,13 +8092,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8076 8092 var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
8077 8093 $compile($el)($scope);
8078 8094  
8079   - $rootScope.isLoading = false;
8080   - $('#spinner').css('visibility', 'hidden');
8081 8095 }
  8096 +
  8097 + $rootScope.isLoading = false;
  8098 + $('#spinner').css('visibility', 'hidden');
  8099 +
8082 8100 var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';
8083 8101 $("#totalTerms").empty();
8084 8102 $('#totalTerms').append(termsTotal);
8085   -
  8103 +
  8104 +
8086 8105  
8087 8106 }
8088 8107 }
... ...