diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index ff1f777..51b54ec 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -281,7 +281,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var view_list = angular.element($event.currentTarget);
var view_list_male_female = view_list.attr('title');
- $rootScope.Normal = "LeftButtonsDefaultState";
+ //$rootScope.Normal = "LeftButtonsDefaultState";
if (view_list_male_female == "Male") {
@@ -294,6 +294,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.female = "active";
}
+
}
@@ -2461,8 +2462,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
if ($rootScope.isHighLight) {
//alert('isHighlight: ' + $scope.isHighLight);
- $('#btnHighLight').removeClass('btn btn-black');
- $('#btnHighLight').addClass('btn-primary');
+ //$('#btnHighLight').removeClass('btn btn-black');
+ //$('#btnHighLight').addClass('btn-primary');
+
+ $("#btnHighLight").addClass("btn-primary");
+ $("#btnHighLight").removeClass("btn-black");
+
+ if (!$("#btnNormalMode").hasClass("btn-black")) {
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if (!$("#btnExtract").hasClass("btn-black")) {
+ $("#btnExtract").addClass("btn-black");
+ }
+
+ if ($("#btnExtract").hasClass("btn-primary")) {
+ $("#btnExtract").removeClass("btn-primary");
+ }
+
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ }
console.log('highLightBody call from DisableProgressBar')
// $scope.highLightBody();
@@ -4682,9 +4703,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// unhighlight other
- $scope.Normal = "";
- $scope.Extract = "";
- $scope.Highlight = "LeftButtonsDefaultState";
+ //$scope.Normal = "";
+ //$scope.Extract = "";
+ //$scope.Highlight = "LeftButtonsDefaultState";
+
+ $("#btnHighLight").addClass("btn-primary");
+ $("#btnHighLight").removeClass("btn-black");
+
+ if (!$("#btnNormalMode").hasClass("btn-black")) {
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if (!$("#btnExtract").hasClass("btn-black")) {
+ $("#btnExtract").addClass("btn-black");
+ }
+
+ if ($("#btnExtract").hasClass("btn-primary")) {
+ $("#btnExtract").removeClass("btn-primary");
+ }
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ }
}
$scope.enableNormalMode = function () {
@@ -4715,9 +4755,27 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
- $scope.Normal = "LeftButtonsDefaultState";
- $scope.Extract = "";
- $scope.Highlight = "";
+ //$scope.Normal = "LeftButtonsDefaultState";
+ //$scope.Extract = "";
+ //$scope.Highlight = "";
+ $("#btnNormalMode").addClass("btn-primary");
+ $("#btnNormalMode").removeClass("btn-black");
+
+ if (!$("#btnExtract").hasClass("btn-black")) {
+ $("#btnExtract").addClass("btn-black");
+ }
+
+ if (!$("#btnHighLight").hasClass("btn-black")) {
+ $("#btnHighLight").addClass("btn-black");
+ }
+
+ if ($("#btnExtract").hasClass("btn-primary")) {
+ $("#btnExtract").removeClass("btn-primary");
+ }
+
+ if ($("#btnHighLight").hasClass("btn-primary")) {
+ $("#btnHighLight").removeClass("btn-primary");
+ }
}
$scope.enableExtract = function () {
@@ -4755,9 +4813,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
//5. unhighlight other
- $scope.Normal = "";
- $scope.Extract = "LeftButtonsDefaultState";
- $scope.Highlight = "";
+ //$scope.Normal = "";
+ //$scope.Extract = "LeftButtonsDefaultState";
+ //$scope.Highlight = "";
+
+ $("#btnExtract").addClass("btn-primary");
+ $("#btnExtract").removeClass("btn-black");
+
+ if (!$("#btnNormalMode").hasClass("btn-black")) {
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if (!$("#btnHighLight").hasClass("btn-black")) {
+ $("#btnHighLight").addClass("btn-black");
+ }
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ }
+
+ if ($("#btnHighLight").hasClass("btn-primary")) {
+ $("#btnHighLight").removeClass("btn-primary");
+ }
}
$scope.enableShowHideStructureBox = function () {
@@ -6673,6 +6750,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.Urinary = "active";
}
+ //Highlight button should be active
+ $("#btnHighLight").addClass("btn-primary");
+ $("#btnHighLight").removeClass("btn-black");
+
+ if (!$("#btnNormalMode").hasClass("btn-black")) {
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if (!$("#btnExtract").hasClass("btn-black")) {
+ $("#btnExtract").addClass("btn-black");
+ }
+
+ if ($("#btnExtract").hasClass("btn-primary")) {
+ $("#btnExtract").removeClass("btn-primary");
+ }
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ }
+
}
$scope.ShowSearch = function () {
@@ -6709,6 +6806,27 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.IsSearchVisible = false;
+ //Highlight only Highlight button
+
+ $("#btnHighLight").addClass("btn-primary");
+ $("#btnHighLight").removeClass("btn-black");
+
+ if (!$("#btnNormalMode").hasClass("btn-black")) {
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if (!$("#btnExtract").hasClass("btn-black")) {
+ $("#btnExtract").addClass("btn-black");
+ }
+
+ if ($("#btnExtract").hasClass("btn-primary")) {
+ $("#btnExtract").removeClass("btn-primary");
+ }
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ }
+
}
//Function to set the vertical and horizontal scroll position of CanvasDiv as per the Navigator
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 61fc6f1..46f779a 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -145,13 +145,13 @@
-
+
-
+
-
+