1. AIA May,June Reports

2. few modifications in DA controller

1. AIA May,June Reports
2. few modifications in DA controller
Amrita Vishnoi
1 parent c05ea734
Showing 6 changed files with 26 additions and 10 deletions
150-DOCUMENTATION/AIA-June-Report.pptx
150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx
150-DOCUMENTATION/Monthly Report Template v2.pptx
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js
400-SOURCECODE/AIAHTML5.Web/term-number-wp.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++) {
 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);
 }
@@ -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) {