diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a90d90e..d2176f4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1380,13 +1380,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo - var dataForthisBR = new jinqJs() - .from($scope.ColoredCanvasData) - .where('bodyRegionId == ' + 1) - .select(); - var coloredImageData = dataForthisBR.coloredImageData; + //var dataForthisBR = new jinqJs() + // .from($scope.ColoredCanvasData) + // .where('bodyRegionId == ' + 1) + // .select(); + //var coloredImageData = dataForthisBR.coloredImageData; - //for (var i = 0; i < TermList.length; i++) { + var worker = new Worker('term-number-wp.js'); // console.log('Start time taken for term: ' + TermList[i]._TermNumber + 'in posting: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")); diff --git a/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js b/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js index dcae699..5bcb60b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js @@ -86,16 +86,16 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore previousGrayImageDataList[parseInt(bodyRegionId - 1)] = grayImageData; // if (matched == true) { - self.postMessage({ - 'bodyRegionId': bodyRegionId, - 'value': grayImageData, - - - }); + // } } - + self.postMessage({ + 'bodyRegionId': bodyRegionId, + 'value': grayImageData, + + + }); } self.onmessage = function (e) { diff --git a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js index cc7e069..1429312 100644 --- a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js @@ -19,8 +19,14 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo var coloredImageDataVar= coloredImageCanvasList[bodyRegionId - 1]; var grayImageDataVar = grayImageDataList[bodyRegionId - 1]; - //var coloredImageDataVar = coloredImageDataVar1.data; - //var grayImageDataVar = grayImageDataVar1.data; + //if (canvasId.match('MR')) { + // coloredImageDataVar = coloredImageMRCanvasList[bodyRegionId - 1]; + // grayImageDataVar = grayImageMRDataList[bodyRegionId - 1]; + //} + //else { + // coloredImageDataVar = coloredImageCanvasList[bodyRegionId - 1]; + // grayImageDataVar = grayImageDataList[bodyRegionId - 1]; + //} var counter = 0; @@ -58,7 +64,7 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo console.log('UpdatedGrayImageDataList: '+ UpdatedGrayImageDataList); - console.log('doneBRID: ' + doneBRID.length); + console.log('doneBRID: ' + e.data.bodyRegionId+'length: '+doneBRID.length); if (doneBRID.length==9) { console.log('before sending UpdatedGrayImageDataList= ' + UpdatedGrayImageDataList)