diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f3e9fbb..74ed3b9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -472,7 +472,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo url: 'app/views/da/da-view.html' }, title: localStorage.getItem("currentViewTitle"), - + position: { top: 70, left: 1, @@ -482,6 +482,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); + console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel')) //0.1 $rootScope.currentSlug = 'da-body-view'; @@ -496,35 +497,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //0.3 var daBodyviewElement = angular.element(document.getElementById("daBodyview")); - $timeout(function () { $compile(daBodyviewElement.contents())($scope) }, 250); + $timeout(function () { + $compile(daBodyviewElement.contents())($scope); + console.log('html is compiled' + document.getElementById('daView')) + if (document.getElementById('daView') != null) { - //0.4 added some stylesheets - $('#daBodyview').css("height", $(window).outerHeight()); + //0.4 added some stylesheets + $('#daBodyview').css("height", $(window).outerHeight()); - $('#daBodyview').css("width", $(window).outerWidth()); + $('#daBodyview').css("width", $(window).outerWidth()); - //1. load navigator man first - $scope.LoadBodyViewNavigatorImage(); + //1. load navigator man first + console.log('before LoadBodyViewNavigatorImage call') + $scope.LoadBodyViewNavigatorImage(); - //$scope.loadSearchDataForBodyView(); + //$scope.loadSearchDataForBodyView(); - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - $scope.layerNumber = 0; + $scope.layerNumber = 0; - //2. + //2. - console.log('currentBodyViewId just before sending: ' + currentBodyViewId); - $scope.loadBodyViewData(currentBodyViewId); + console.log('currentBodyViewId just before sending: ' + currentBodyViewId); + $scope.loadBodyViewData(currentBodyViewId); - //2. load bodyRegion data - $rootScope.isLoading = true; - $rootScope.voId = localStorage.getItem("currentBodyViewId"); + //2. load bodyRegion data + $rootScope.isLoading = true; + $rootScope.voId = localStorage.getItem("currentBodyViewId"); - $('#daBodyview').css("height", $(window).outerHeight()); + $('#daBodyview').css("height", $(window).outerHeight()); - $('#daBodyview').css("width", $(window).outerWidth()); + $('#daBodyview').css("width", $(window).outerWidth()); + } + }, 250); } angular.element(document).ready(function (e) { @@ -654,6 +661,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //Code for displaying NavigatorImage for BodyView $scope.LoadBodyViewNavigatorImage = function () { + console.log('insideLoadBodyViewNavigatorImage') var NavigatorManJsonPath = '~/../content/data/json/da/da_dat_orient_image.json'; $http({ method: 'GET', url: NavigatorManJsonPath }) @@ -720,7 +728,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.LoadDefaultLayerImage = function () { - + console.log('inside LoadDefaultLayerImage') $rootScope.isNormalMode = true; $scope.layerNumber = 0; @@ -799,8 +807,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.BodyRegionCordinatesData = []; // create an empty array $('#daBodyview').css('width', '100%'); - $('#canvasDiv').css('height', $('#daImagePanel').outerHeight() - 104) - //$('#canvasDiv').css('width', $('#daImagePanel').outerWidth() - 100) + var canvasDIvHeight = parseInt($('#daImagePanel').outerHeight()) - 104; + $('#canvasDiv').css('height', canvasDIvHeight); $('#leftToolBar').css('height', $('#daImagePanel').outerHeight())