Commit ff4355861eb6c591f1b0e24c17e0b9dbe9ea3af9
1 parent
43a10c1d
fixed issue of partial highlight. Now we are sending updated data after completi…
…ng all terms for one body region.
Showing
3 changed files
with
22 additions
and
16 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -1380,13 +1380,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 1380 | 1380 | |
| 1381 | 1381 | |
| 1382 | 1382 | |
| 1383 | - var dataForthisBR = new jinqJs() | |
| 1384 | - .from($scope.ColoredCanvasData) | |
| 1385 | - .where('bodyRegionId == ' + 1) | |
| 1386 | - .select(); | |
| 1387 | - var coloredImageData = dataForthisBR.coloredImageData; | |
| 1383 | + //var dataForthisBR = new jinqJs() | |
| 1384 | + // .from($scope.ColoredCanvasData) | |
| 1385 | + // .where('bodyRegionId == ' + 1) | |
| 1386 | + // .select(); | |
| 1387 | + //var coloredImageData = dataForthisBR.coloredImageData; | |
| 1388 | 1388 | |
| 1389 | - //for (var i = 0; i < TermList.length; i++) { | |
| 1389 | + | |
| 1390 | 1390 | var worker = new Worker('term-number-wp.js'); |
| 1391 | 1391 | |
| 1392 | 1392 | // console.log('Start time taken for term: ' + TermList[i]._TermNumber + 'in posting: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js
| ... | ... | @@ -86,16 +86,16 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore |
| 86 | 86 | previousGrayImageDataList[parseInt(bodyRegionId - 1)] = grayImageData; |
| 87 | 87 | |
| 88 | 88 | // if (matched == true) { |
| 89 | - self.postMessage({ | |
| 90 | - 'bodyRegionId': bodyRegionId, | |
| 91 | - 'value': grayImageData, | |
| 92 | - | |
| 93 | - | |
| 94 | - }); | |
| 89 | + | |
| 95 | 90 | // } |
| 96 | 91 | |
| 97 | 92 | } |
| 98 | - | |
| 93 | + self.postMessage({ | |
| 94 | + 'bodyRegionId': bodyRegionId, | |
| 95 | + 'value': grayImageData, | |
| 96 | + | |
| 97 | + | |
| 98 | + }); | |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | self.onmessage = function (e) { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
| ... | ... | @@ -19,8 +19,14 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo |
| 19 | 19 | var coloredImageDataVar= coloredImageCanvasList[bodyRegionId - 1]; |
| 20 | 20 | var grayImageDataVar = grayImageDataList[bodyRegionId - 1]; |
| 21 | 21 | |
| 22 | - //var coloredImageDataVar = coloredImageDataVar1.data; | |
| 23 | - //var grayImageDataVar = grayImageDataVar1.data; | |
| 22 | + //if (canvasId.match('MR')) { | |
| 23 | + // coloredImageDataVar = coloredImageMRCanvasList[bodyRegionId - 1]; | |
| 24 | + // grayImageDataVar = grayImageMRDataList[bodyRegionId - 1]; | |
| 25 | + //} | |
| 26 | + //else { | |
| 27 | + // coloredImageDataVar = coloredImageCanvasList[bodyRegionId - 1]; | |
| 28 | + // grayImageDataVar = grayImageDataList[bodyRegionId - 1]; | |
| 29 | + //} | |
| 24 | 30 | |
| 25 | 31 | var counter = 0; |
| 26 | 32 | |
| ... | ... | @@ -58,7 +64,7 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo |
| 58 | 64 | |
| 59 | 65 | console.log('UpdatedGrayImageDataList: '+ UpdatedGrayImageDataList); |
| 60 | 66 | |
| 61 | - console.log('doneBRID: ' + doneBRID.length); | |
| 67 | + console.log('doneBRID: ' + e.data.bodyRegionId+'length: '+doneBRID.length); | |
| 62 | 68 | |
| 63 | 69 | if (doneBRID.length==9) { |
| 64 | 70 | console.log('before sending UpdatedGrayImageDataList= ' + UpdatedGrayImageDataList) | ... | ... |