diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index 7fe806b..d70d6f2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -42905,6 +42905,7 @@
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index ca23879..5f6a6bd 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -46,7 +46,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.zoomInOut = 75;
$scope.i = 0;
$scope.speachBubbleArray = [];
- $scope.multiAnnotationIsON = true;
+ $scope.multiAnnotationIsON = false;
$scope.previousGrayImageDataVar;
$scope.previousGrayCanvas;
@@ -1379,8 +1379,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
$scope.highLightBodyBasedOnIcolor = function (RGBColor) {
- // console.log(' $scope.highLightBodyBasedOnIcolor')
-
+ debugger;
//terminate previous running workers to create space for new workers
var workerCount = $scope.runningWorkers.length;
if (workerCount > 0) {
@@ -1420,67 +1419,96 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var coloredImageDataVar;
var grayImageDataVar;
+ var white;
+
if (canvasId.match('_MR')) {
coloredImageDataVar = $rootScope.coloredImageMRCanvasList[bodyRegionId];
-
- if ($scope.multiAnnotationIsON == true)
- {
- grayImageDataVar = $rootScope.grayImageMRDataListCurrent[bodyRegionId]
+
+ if ($rootScope.isExtract) {
+ if ($scope.multiAnnotationIsON == true) {
+
+ grayImageDataVar = $rootScope.grayImageMRDataListCurrent[bodyRegionId]
+ }
+ else
+ white = $rootScope.whiteImageMRDataList[bodyRegionId];
}
else
- grayImageDataVar = $rootScope.grayImageMRDataList[bodyRegionId];
-
- if ($rootScope.isExtract) {
+ {
if ($scope.multiAnnotationIsON == true) {
grayImageDataVar = $rootScope.grayImageMRDataListCurrent[bodyRegionId]
}
else
- grayImageDataVar = $rootScope.whiteImageMRDataList[bodyRegionId];
+ grayImageDataVar = $rootScope.grayImageMRDataList[bodyRegionId];
+
}
+
}
else {
coloredImageDataVar = $rootScope.coloredImageCanvasList[bodyRegionId - 1];
- if ($scope.multiAnnotationIsON == true) {
- grayImageDataVar = $rootScope.grayImageDataListCurrent[bodyRegionId - 1]
- }
- else
- grayImageDataVar = $rootScope.grayImageDataList[bodyRegionId - 1];
-
+
if ($rootScope.isExtract) {
if ($scope.multiAnnotationIsON == true) {
- grayImageDataVar = $rootScope.grayImageDataListCurrent[bodyRegionId]
+ grayImageDataVar = $rootScope.grayImageDataListCurrent[bodyRegionId-1]
+ }
+ else
+ white = $rootScope.whiteImageDataList[bodyRegionId-1];
+ }
+ else
+ {
+ if ($scope.multiAnnotationIsON == true) {
+ grayImageDataVar = $rootScope.grayImageDataListCurrent[bodyRegionId - 1]
}
else
- grayImageDataVar = $rootScope.whiteImageDataList[bodyRegionId];
+ grayImageDataVar = $rootScope.grayImageDataList[bodyRegionId - 1];
+
}
}
- //var coloredImageDataVar = $rootScope.coloredImageCanvasList[bodyRegionId - 1];
- //var grayImageDataVar = $rootScope.grayImageDataList[bodyRegionId - 1];
+ if ($rootScope.isExtract == true)
+ {
+ var worker = new Worker('extract-wp.js');
+
+ //push workers in array to further used the refernece to delete the workers
+ $scope.runningWorkers.push({ 'workerName': worker })
+
+ // console.log('for bodyRegionId = ' + bodyRegionId+ ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
+ worker.postMessage({
- var worker = new Worker('term-number-wp.js');
+ 'termList': TermList,
+ 'maskCanvasData': maskData,
+ 'coloredImageData': coloredImageDataVar,
+ 'grayImageData': white,
+ 'bodyRegionId': bodyRegionId,
+ 'canvasId': canvasId
- //push workers in array to further used the refernece to delete the workers
- $scope.runningWorkers.push({ 'workerName': worker })
+ });
+ }
+ else {
- // console.log('for bodyRegionId = ' + bodyRegionId+ ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
- worker.postMessage({
+ var worker = new Worker('term-number-wp.js');
- 'termList': TermList,
- 'maskCanvasData': maskData,
- 'coloredImageData': coloredImageDataVar,
- 'grayImageData': grayImageDataVar,
- 'bodyRegionId': bodyRegionId,
- 'canvasId': canvasId
+ //push workers in array to further used the refernece to delete the workers
+ $scope.runningWorkers.push({ 'workerName': worker })
- });
+ // console.log('for bodyRegionId = ' + bodyRegionId+ ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
+ worker.postMessage({
+
+ 'termList': TermList,
+ 'maskCanvasData': maskData,
+ 'coloredImageData': coloredImageDataVar,
+ 'grayImageData': grayImageDataVar,
+ 'bodyRegionId': bodyRegionId,
+ 'canvasId': canvasId
+
+ });
+ }
//}
@@ -3235,8 +3263,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
- $scope.enableExtract = function ()
- {
+ $scope.enableExtract = function () {
alert('extract called');
debugger;
@@ -3249,16 +3276,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//1.
$scope.highLightBody();
-
+
}
}
-
+
$scope.highLightBody = function () {
- // debugger;
+ debugger;
if ($rootScope.isHighLight == true) {
@@ -3293,8 +3320,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
-
-
var context_gray = imageCanvas.getContext('2d');
@@ -3310,10 +3335,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
img.onload = function () {
//console.log(Math.max(img.width) + ', ' + Math.max(img.height))
- // debugger;
+ debugger;
var DAData = new BitmapData(Math.max(img.width), Math.max(img.height));
DAData.draw(img);
-
+
var colorMode;
if ($rootScope.isExtract) {
@@ -3322,7 +3347,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
else {
colorMode = $scope.applyGrayMatrix();
}
- // debugger;
+ // debugger;
var zeroPoint = new Point();
DAData.applyFilter(DAData, DAData.rect, zeroPoint, colorMode);
@@ -3336,46 +3361,52 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var grayImageImageDataVar = grayImageData.data;
- if (value.haveMirror == 'true') {
- $rootScope.grayImageMRDataList[parseInt(value.bodyRegionId)] = grayImageData;
- }
- else {
- //$rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId - 1)] = 1;
-
- $rootScope.grayImageDataList[parseInt(value.bodyRegionId - 1)] = grayImageData;
- }
-
+
if ($rootScope.isExtract) {
if (value.haveMirror == 'true') {
- $rootScope.whiteImageMRDataList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
+ $rootScope.whiteImageMRDataList[parseInt(value.bodyRegionId)] = grayImageData;
}
else {
//$rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId - 1)] = 1;
- $rootScope.whiteImageDataList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
+ $rootScope.whiteImageDataList[parseInt(value.bodyRegionId - 1)] = grayImageData;
}
}
+
+ else
+ {
+ if (value.haveMirror == 'true') {
+ $rootScope.grayImageMRDataList[parseInt(value.bodyRegionId)] = grayImageData;
+ }
+ else {
+ //$rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId - 1)] = 1;
+
+ $rootScope.grayImageDataList[parseInt(value.bodyRegionId - 1)] = grayImageData;
+ }
+
+ }
}
$timeout(function () { imageCanvas.style.visibility = 'visible' }, 50);
})
-
-
if ($rootScope.isExtract) {
if ($rootScope.previousHighlightList.length > 0) {
angular.forEach($rootScope.previousHighlightList, function (value, key) {
- $scope.highLightBodyBasedOnIcolor(value);
+
+ $timeout(function () { $scope.highLightBodyBasedOnIcolor(value)}, 50);
});
}
}
+ }
+
}
- }
+
@@ -3393,7 +3424,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var rgbPx2 = rgbPx.concat(RGB3);
var matrix = rgbPx2.concat(ALPHA);
-
+
var grayScale = new ColorMatrixFilter(matrix);
return grayScale;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 1d354fb..c5586a3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -1,4 +1,4 @@
-