Commit a080a6b1b96bcd2459bfec5e3fa4b17b26766772
1 parent
9d9110a0
deleted commented code in highlightbody function.
loading icon in list manager place changed.
Showing
2 changed files
with
7 additions
and
26 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -4781,27 +4781,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 4781 | 4781 | |
| 4782 | 4782 | var context_gray = imageCanvas.getContext('2d'); |
| 4783 | 4783 | |
| 4784 | - | |
| 4785 | - //NIKI- for lateral arm highlight issue | |
| 4786 | - | |
| 4787 | - //if ($rootScope.viewOrientationId == 5 && value.bodyRegionId == 6) { | |
| 4788 | - // var imgData = context_gray.getImageData(0, 0, width, ht); | |
| 4789 | - // var data = imgData.data; | |
| 4790 | - // for (var i = 0; i < data.length; i += 4) { | |
| 4791 | - // if (data[i + 3] < 255) { | |
| 4792 | - // data[i] = 255 - data[i]; | |
| 4793 | - // data[i + 1] = 255 - data[i + 1]; | |
| 4794 | - // data[i + 2] = 255 - data[i + 2]; | |
| 4795 | - // data[i + 3] = 255 - data[i + 3]; | |
| 4796 | - // } | |
| 4797 | - // } | |
| 4798 | - // context_gray.putImageData(imgData, 0, 0); | |
| 4799 | - //} | |
| 4800 | - //NIKI | |
| 4801 | - | |
| 4802 | - | |
| 4803 | - | |
| 4804 | - | |
| 4805 | 4784 | var dataURL = imageCanvas.toDataURL(); |
| 4806 | 4785 | |
| 4807 | 4786 | |
| ... | ... | @@ -4834,10 +4813,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 4834 | 4813 | |
| 4835 | 4814 | context_gray.putImageData(DAData.data, 0, 0) |
| 4836 | 4815 | |
| 4837 | - //NIKI | |
| 4816 | + //NIKI- to resolve lateral arm black issue in highlight mode | |
| 4838 | 4817 | |
| 4839 | 4818 | if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 ||value.bodyRegionId==4)) { |
| 4840 | - console.log('inside lateral arm') | |
| 4819 | + | |
| 4841 | 4820 | var imgData = context_gray.getImageData(0, 0, width, ht); |
| 4842 | 4821 | var data = imgData.data; |
| 4843 | 4822 | var c=0; |
| ... | ... | @@ -6546,7 +6525,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 6546 | 6525 | } |
| 6547 | 6526 | // }) |
| 6548 | 6527 | |
| 6549 | - | |
| 6528 | + | |
| 6550 | 6529 | //.error(function (data, status, headers, config) { |
| 6551 | 6530 | |
| 6552 | 6531 | // console.log(data); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -301,12 +301,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 301 | 301 | $rootScope.ShowListManager = function () { |
| 302 | 302 | console.log('ShowListManager') |
| 303 | 303 | |
| 304 | + $rootScope.isLoading = true; | |
| 305 | + $('#spinner').css('visibility', 'visible'); | |
| 306 | + | |
| 304 | 307 | $('#listManager').css('display', 'block'); |
| 305 | 308 | $("#listManager").css("visibility", "visible"); |
| 306 | 309 | $('#listManager').draggable(); |
| 307 | 310 | |
| 308 | - $rootScope.isLoading = true; | |
| 309 | - $('#spinner').css('visibility', 'visible'); | |
| 311 | + | |
| 310 | 312 | $rootScope.islistManagerEventAlredayDispachted = true; |
| 311 | 313 | |
| 312 | 314 | $rootScope.$broadcast('listManagerEvent', true); | ... | ... |