diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 08496e9..af37d25 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2128,6 +2128,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$timeout(function () { $scope.DisableProgressBar() }, 1000);
+
};
worker.onerror = function (e) {
alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
@@ -4899,6 +4900,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.isTransparencyBoxActivated = false;
$rootScope.isNormalMode = false;
+
+ //$rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
+
+ //$rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
//if listanager is visisble then close it
@@ -4930,21 +4935,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
else {
$scope.zoomInOut = 25;
+
+
}
//2.
$scope.CalculateImageCordinates($rootScope.viewOrientationId);
//3.
- if ($scope.zoomInOut == 25) {
- if ($('#canvasDiv') != null)
- $('#canvasDiv').scrollLeft(0)
+
+ if ($rootScope.isExtract == true) {
+
+
+ $("#canvasDiv").scrollTop($rootScope.canavsDivTop);
+
+ $("#canvasDiv").scrollLeft($rootScope.canavsDivLeft);
+
+ console.log('$rootScope.CanvasDivTopPosition= ' + $rootScope.CanvasDivTopPosition + 'and $rootScope.CanvasDivLeftPosition= ' + $rootScope.CanvasDivLeftPosition)
}
else {
- if ($('#canvasDiv') != null)
- $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
- }
+ if ($scope.zoomInOut == 25) {
+ if ($('#canvasDiv') != null)
+ $('#canvasDiv').scrollLeft(0)
+
+ }
+ else {
+ if ($('#canvasDiv') != null)
+ $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+
+ }
+
+ }
//remove annotation speech bubble
if ($('#dot').length > 0) {
$('#dot').remove();
@@ -5247,6 +5269,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$("#canvasDiv").scroll(function (event) {
$rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
$rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
+ console.log('scroll event. $rootScope.CanvasDivTopPosition= ' + $rootScope.CanvasDivTopPosition + ' and $rootScope.CanvasDivLeftPosition= ' + $rootScope.CanvasDivLeftPosition)
});
@@ -5263,6 +5286,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
+ //befoe extracr scroll pos
+ $rootScope.canavsDivTop = $("#canvasDiv").scrollTop();
+ $rootScope.canavsDivLeft = $("#canvasDiv").scrollLeft();
if ($scope.isTransparencyActivated == true) {