diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 0404fae..1792d45 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4781,27 +4781,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var context_gray = imageCanvas.getContext('2d'); - - //NIKI- for lateral arm highlight issue - - //if ($rootScope.viewOrientationId == 5 && value.bodyRegionId == 6) { - // var imgData = context_gray.getImageData(0, 0, width, ht); - // var data = imgData.data; - // for (var i = 0; i < data.length; i += 4) { - // if (data[i + 3] < 255) { - // data[i] = 255 - data[i]; - // data[i + 1] = 255 - data[i + 1]; - // data[i + 2] = 255 - data[i + 2]; - // data[i + 3] = 255 - data[i + 3]; - // } - // } - // context_gray.putImageData(imgData, 0, 0); - //} - //NIKI - - - - var dataURL = imageCanvas.toDataURL(); @@ -4834,10 +4813,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo context_gray.putImageData(DAData.data, 0, 0) - //NIKI + //NIKI- to resolve lateral arm black issue in highlight mode if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 ||value.bodyRegionId==4)) { - console.log('inside lateral arm') + var imgData = context_gray.getImageData(0, 0, width, ht); var data = imgData.data; var c=0; @@ -6546,7 +6525,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } // }) - + //.error(function (data, status, headers, config) { // console.log(data); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 8d63c35..a50c5d4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -301,12 +301,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.ShowListManager = function () { console.log('ShowListManager') + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); + $('#listManager').css('display', 'block'); $("#listManager").css("visibility", "visible"); $('#listManager').draggable(); - $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); + $rootScope.islistManagerEventAlredayDispachted = true; $rootScope.$broadcast('listManagerEvent', true);