diff --git a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js index 1429312..d4cc56a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js @@ -3,7 +3,6 @@ var doneBRID = []; var abc = 'hello'; getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, coloredImageCanvasList, coloredImageMRCanvasList, grayImageDataList, grayImageMRDataList) { - // console.log('for termNumer: ' + termNo + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")) var matchedRGBLocationInBodyRegion = []; var matched; @@ -11,7 +10,6 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo { matched = false; - // alert('called for bodyRegionId: ' + $scope.MaskImageSRC[x].bodyRegionId); var bodyRegionId = maskCanvasData[x].bodyRegionId; var canvasId = maskCanvasData[x].canvasId; var maskData = maskCanvasData[x].maskData; @@ -19,15 +17,7 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo var coloredImageDataVar= coloredImageCanvasList[bodyRegionId - 1]; var grayImageDataVar = grayImageDataList[bodyRegionId - 1]; - //if (canvasId.match('MR')) { - // coloredImageDataVar = coloredImageMRCanvasList[bodyRegionId - 1]; - // grayImageDataVar = grayImageMRDataList[bodyRegionId - 1]; - //} - //else { - // coloredImageDataVar = coloredImageCanvasList[bodyRegionId - 1]; - // grayImageDataVar = grayImageDataList[bodyRegionId - 1]; - //} - + var counter = 0; var imageDataVar = maskData.data; @@ -47,30 +37,18 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo }); machLocationWP.onmessage = function (e) { - console.log('callback: ' + e.data.value+', x='+x); - - //var upadteddata = e.data.value; - //var bodyRegionId = e.data.bodyRegionId; - - //var grayCanvasID = 'imageCanvas' + bodyRegionId; - //var grayCanvas = document.getElementById(grayCanvasID); - //var grayCanvasContext = grayCanvas.getContext("2d"); - + - //grayCanvasContext.putImageData(upadteddata, 0, 0); doneBRID.push(e.data.bodyRegionId); UpdatedGrayImageDataList[e.data.bodyRegionId] = e.data.value - - console.log('UpdatedGrayImageDataList: '+ UpdatedGrayImageDataList); - - console.log('doneBRID: ' + e.data.bodyRegionId+'length: '+doneBRID.length); + if (doneBRID.length==9) { - console.log('before sending UpdatedGrayImageDataList= ' + UpdatedGrayImageDataList) + self.postMessage({ 'value': UpdatedGrayImageDataList, - 'name': 'Happy' + }) }