ADAM / AIAHTML5

Commit 463c269df247e27fbc9aa4f2e1b9d1abbd41bda1

Authored by Sandeep Kumar
1 parent d6da4a51

Changes for for SaveCB

Inline Side-by-side
Showing 2 changed files with 22 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @463c269
... ... @@ -198,7 +198,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
198 198 $("#openCBJsonFile").trigger("click");
199 199 var fileupload = document.getElementById("openCBJsonFile");
200 200  
201   -
202 201 fileupload.onchange = function () {
203 202  
204 203 var fileId, file, objFileRead;
... ... @@ -2374,10 +2373,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2374 2373 $scope.updateWindowsContentForSaveCB = function (currentId) {
2375 2374  
2376 2375 $scope.saveDAWindowActivity(currentId);
2377   - //$scope.saveAAWindowActivity(currentId);
2378   - //$scope.saveCIWindowActivity(currentId);
2379   - //$scope.saveCAWindowActivity(currentId);
2380   - //$scope.save3DWindowActivity(currentId);
  2376 + $scope.saveAAWindowActivity(currentId);
  2377 + $scope.saveCIWindowActivity(currentId);
  2378 + $scope.saveCAWindowActivity(currentId);
  2379 + $scope.save3DWindowActivity(currentId);
2381 2380  
2382 2381 //$scope.savePicWindowActivity($scope.windowDataforCB);
2383 2382 //if ($scope.updatedWindowListForSaveCB.length > 0) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @463c269
... ... @@ -3658,7 +3658,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3658 3658 // {
3659 3659 // var updatedWhiteImageDataList=$scope.GetwindowStoreData(windowviewid,'updatedWhiteImageDataList');
3660 3660 // updatedWhiteImageDataList[bodyRegionId - 1] = updatedData;
3661   - // }
  3661 + // }
3662 3662  
3663 3663 }
3664 3664 else {
... ... @@ -3691,7 +3691,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3691 3691 }
3692 3692 }
3693 3693 }
3694   -
  3694 + //Set Canvas Position which saved from CB module
  3695 + //var isExtract = $scope.GetwindowStoreData(windowviewid, 'isExtract')
  3696 + if ($rootScope.isCallFromOtherModule) {
  3697 + var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
  3698 + var canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
  3699 + $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
  3700 + $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
  3701 +
  3702 + $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
  3703 + $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
  3704 + }
  3705 +
3695 3706 };
3696 3707 worker.onerror = function (e) {
3697 3708 alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
... ... @@ -8393,6 +8404,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8393 8404 $scope.DisableUI();
8394 8405  
8395 8406 console.log('isCalledFromButton= ' + isCalledFromButton);
  8407 +
  8408 + var CanvasDivLeftPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivLeftPosition');
  8409 + var CanvasDivTopPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivTopPosition');
  8410 + $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
  8411 + $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
8396 8412  
8397 8413 $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',$('#canvasDivDA_' + windowviewid).scrollLeft());
8398 8414 $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',$('#canvasDivDA_' + windowviewid).scrollTop());
... ...