Commit f9cc28e61bcc4d4f28576157dce0f75bfff0c62e
1 parent
22b75d44
Fix in extract in normal mode
Showing
2 changed files
with
12 additions
and
16 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -2107,7 +2107,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2107 | 2107 | //layer change function |
2108 | 2108 | $scope.LayerChange = function () { |
2109 | 2109 | |
2110 | - | |
2110 | + //1. | |
2111 | 2111 | $scope.terminateCurrentlyRunningWPs(); |
2112 | 2112 | |
2113 | 2113 | var canvasDiv = document.getElementById('canvasDiv'); |
... | ... | @@ -4782,11 +4782,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
4782 | 4782 | |
4783 | 4783 | if ($rootScope.isExtract == true) { |
4784 | 4784 | if ($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined || $rootScope.previousHighlightList.length > 0) { |
4785 | - angular.forEach($rootScope.previousHighlightList, function (value, key) { | |
4786 | - $timeout(function () { $scope.HighlightBodyOnExtract(value) }, 50); | |
4785 | + | |
4786 | + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50); | |
4787 | 4787 | |
4788 | 4788 | // to do |
4789 | - }); | |
4789 | + | |
4790 | 4790 | } |
4791 | 4791 | } |
4792 | 4792 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/extract-wp.js
... | ... | @@ -90,20 +90,16 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo |
90 | 90 | } |
91 | 91 | // debugger; |
92 | 92 | previousGrayImageDataList[parseInt(bodyRegionId - 1)] = grayImageData; |
93 | - | |
94 | - // if (matched == true) { | |
95 | - | |
96 | - // } | |
97 | - | |
98 | - | |
99 | - self.postMessage({ | |
100 | - 'bodyRegionId': bodyRegionId, | |
101 | - 'value': grayImageData, | |
102 | - 'canvasId': canvasId | |
103 | - | |
104 | - }); | |
93 | + | |
105 | 94 | } |
106 | 95 | } |
96 | + | |
97 | + self.postMessage({ | |
98 | + 'bodyRegionId': bodyRegionId, | |
99 | + 'value': grayImageData, | |
100 | + 'canvasId': canvasId | |
101 | + | |
102 | + }); | |
107 | 103 | } |
108 | 104 | |
109 | 105 | self.onmessage = function (e) { | ... | ... |