ADAM / AIAHTML5

Commit 85f3a119b7f5b260ea586332a7a676e4a99850f6

Authored by Amrita Vishnoi
1 parent c05ea734

1. AIA May,June Reports 

2. few modifications in DA controller
Inline Side-by-side
Showing 6 changed files with 26 additions and 10 deletions
150-DOCUMENTATION/AIA-June-Report.pptx 0 → 100644
View file @85f3a11
No preview for this file type
150-DOCUMENTATION/AIAMonthlyReportTemplate.pptx 0 → 100644
View file @85f3a11
No preview for this file type
150-DOCUMENTATION/Monthly Report Template v2.pptx 0 → 100644
View file @85f3a11
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @85f3a11
... ... @@ -1374,7 +1374,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1374 1374  
1375 1375  
1376 1376 //4.
1377   -
  1377 + // debugger;
1378 1378 $scope.machedTermNoLocation = [];
1379 1379  
1380 1380  
... ... @@ -1394,7 +1394,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1394 1394 //}
1395 1395  
1396 1396 worker.onmessage = function (e) {
1397   -
  1397 + debugger;
1398 1398 var updatedData = e.data.value;
1399 1399  
1400 1400 for (var i = 1; i < updatedData.length; i++) {
... ...
400-SOURCECODE/AIAHTML5.Web/match-pixel-wp.js
  View file @85f3a11
1 1 previousGrayImageDataList = [];
2 2  
3 3 function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, coloreImageData,
4   - grayImageData, grayImageMRDataList, bodyRegionId)
  4 + grayImageData, grayImageMRDataList, bodyRegionId, canvasId)
5 5 {
6 6  
7   -
  7 + debugger;
8 8 var n = maskCanvasData.data.length;
9 9 var maskData = maskCanvasData.data;
10 10 for (var z = 0; z < termList.length; z++) {
... ... @@ -13,9 +13,11 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore
13 13 grayImageData = previousGrayImageDataList[parseInt(bodyRegionId - 1)];
14 14  
15 15 }
  16 +
16 17 var grayImageDataVar = grayImageData.data;
17 18 var coloredImageDataVar = coloreImageData.data;
18 19  
  20 +
19 21 for (var i = 0; i < n; i += 4) {
20 22  
21 23  
... ... @@ -82,6 +84,7 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore
82 84 self.postMessage({
83 85 'bodyRegionId': bodyRegionId,
84 86 'value': grayImageData,
  87 + 'canvasId': canvasId
85 88  
86 89  
87 90 });
... ... @@ -90,7 +93,7 @@ function updateGrayCanvasDataOnMatcghedLocation(termList, maskCanvasData, colore
90 93 self.onmessage = function (e) {
91 94 console.log('shd')
92 95 updateGrayCanvasDataOnMatcghedLocation(e.data.termList, e.data.maskCanvasData, e.data.coloreImageData,
93   - e.data.grayImageData, e.data.grayImageMRDataList, e.data.bodyRegionId);
  96 + e.data.grayImageData, e.data.grayImageMRDataList, e.data.bodyRegionId, e.data.canvasId);
94 97  
95 98 }
96 99  
... ...
400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
  View file @85f3a11
... ... @@ -14,10 +14,18 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo
14 14 var canvasId = maskCanvasData[x].canvasId;
15 15 var maskData = maskCanvasData[x].maskData;
16 16  
17   - var coloredImageDataVar= coloredImageCanvasList[bodyRegionId - 1];
18   - var grayImageDataVar = grayImageDataList[bodyRegionId - 1];
19   -
  17 + var coloredImageDataVar//= coloredImageCanvasList[bodyRegionId - 1];
  18 + var grayImageDataVar// = grayImageDataList[bodyRegionId - 1];
20 19  
  20 + if (canvasId.match('_MR')) {
  21 + coloredImageDataVar = coloredImageMRCanvasList[bodyRegionId - 1];
  22 + grayImageDataVar = grayImageMRDataList[bodyRegionId - 1];
  23 + }
  24 + else {
  25 + coloredImageDataVar = coloredImageCanvasList[bodyRegionId - 1];
  26 + grayImageDataVar = grayImageDataList[bodyRegionId - 1];
  27 + }
  28 +
21 29 var counter = 0;
22 30  
23 31 var imageDataVar = maskData.data;
... ... @@ -32,7 +40,8 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo
32 40 'coloreImageData': coloredImageDataVar,
33 41 'grayImageData': grayImageDataVar,
34 42 'grayImageMRDataList': grayImageMRDataList,
35   - 'bodyRegionId': bodyRegionId
  43 + 'bodyRegionId': bodyRegionId,
  44 + 'canvasId': canvasId
36 45  
37 46 });
38 47  
... ... @@ -41,7 +50,11 @@ getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, colo
41 50  
42 51  
43 52 doneBRID.push(e.data.bodyRegionId);
44   - UpdatedGrayImageDataList[e.data.bodyRegionId] = e.data.value
  53 + var canvasID = (e.data.canvasId).replace('_mci', '');
  54 +
  55 + UpdatedGrayImageDataList.push({ 'canvasID': canvasID, 'imageData': e.data.value });
  56 +
  57 + //UpdatedGrayImageDataList[e.data.bodyRegionId] = e.data.value
45 58  
46 59  
47 60 if (doneBRID.length==9) {
... ...