From 85f3a119b7f5b260ea586332a7a676e4a99850f6 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Wed, 13 Jul 2016 10:16:50 +0530 Subject: [PATCH] 1. AIA May,June Reports 2. few modifications in DA controller --- 150-DOCUMENTATION/AIA-June-Report.pptx | Bin 0 -> 116803 bytes 150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx | Bin 0 -> 116803 bytes 150-DOCUMENTATION/Monthly Report Template v2.pptx | Bin 0 -> 106353 bytes 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 4 ++-- 400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js | 9 ++++++--- 400-SOURCECODE/AIAHTML5.Web/term-number-wp.js | 23 ++++++++++++++++++----- 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 150-DOCUMENTATION/AIA-June-Report.pptx create mode 100644 150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx create mode 100644 150-DOCUMENTATION/Monthly Report Template v2.pptx diff --git a/150-DOCUMENTATION/AIA-June-Report.pptx b/150-DOCUMENTATION/AIA-June-Report.pptx new file mode 100644 index 0000000..07ab44c Binary files /dev/null and b/150-DOCUMENTATION/AIA-June-Report.pptx differ diff --git a/150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx b/150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx new file mode 100644 index 0000000..04dc41b Binary files /dev/null and b/150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx differ diff --git a/150-DOCUMENTATION/Monthly Report Template v2.pptx b/150-DOCUMENTATION/Monthly Report Template v2.pptx new file mode 100644 index 0000000..4c9138e Binary files /dev/null and b/150-DOCUMENTATION/Monthly Report Template v2.pptx differ diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index c1b235a..c461391 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1374,7 +1374,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //4. - + // debugger; $scope.machedTermNoLocation = []; @@ -1394,7 +1394,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //} worker.onmessage = function (e) { - + debugger; var updatedData = e.data.value; for (var i = 1; i < updatedData.length; i++) { diff --git a/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js b/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js index 10ad35b..bb51879 100644 --- a/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js @@ -1,10 +1,10 @@ previousGrayImageDataList = []; function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, coloreImageData, - grayImageData, grayImageMRDataList, bodyRegionId) + grayImageData, grayImageMRDataList, bodyRegionId, canvasId) { - + debugger; var n = maskCanvasData.data.length; var maskData = maskCanvasData.data; for (var z = 0; z < termList.length; z++) { @@ -13,9 +13,11 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore grayImageData = previousGrayImageDataList[parseInt(bodyRegionId - 1)]; } + var grayImageDataVar = grayImageData.data; var coloredImageDataVar = coloreImageData.data; + for (var i = 0; i < n; i += 4) { @@ -82,6 +84,7 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore self.postMessage({ 'bodyRegionId': bodyRegionId, 'value': grayImageData, + 'canvasId': canvasId }); @@ -90,7 +93,7 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore self.onmessage = function (e) { console.log('shd') updateGrayCanvasDataOnMatcghedLocation(e.data.termList, e.data.maskCanvasData, e.data.coloreImageData, - e.data.grayImageData, e.data.grayImageMRDataList, e.data.bodyRegionId); + e.data.grayImageData, e.data.grayImageMRDataList, e.data.bodyRegionId, e.data.canvasId); } diff --git a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js index d4cc56a..7366dbf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/term-number-wp.js @@ -14,10 +14,18 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo var canvasId = maskCanvasData[x].canvasId; var maskData = maskCanvasData[x].maskData; - var coloredImageDataVar= coloredImageCanvasList[bodyRegionId - 1]; - var grayImageDataVar = grayImageDataList[bodyRegionId - 1]; - + 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; @@ -32,7 +40,8 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo 'coloreImageData': coloredImageDataVar, 'grayImageData': grayImageDataVar, 'grayImageMRDataList': grayImageMRDataList, - 'bodyRegionId': bodyRegionId + 'bodyRegionId': bodyRegionId, + 'canvasId': canvasId }); @@ -41,7 +50,11 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo doneBRID.push(e.data.bodyRegionId); - UpdatedGrayImageDataList[e.data.bodyRegionId] = e.data.value + var canvasID = (e.data.canvasId).replace('_mci', ''); + + UpdatedGrayImageDataList.push({ 'canvasID': canvasID, 'imageData': e.data.value }); + + //UpdatedGrayImageDataList[e.data.bodyRegionId] = e.data.value if (doneBRID.length==9) { -- libgit2 0.21.4