diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 654aad2..b69421b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -555,40 +555,25 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //0.3 var daBodyviewElement = angular.element(document.getElementById("daBodyview")); - $timeout(function () { + $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", (parseInt($(window).outerHeight())-62-20)); - - $('#daBodyview').css("width", $(window).outerWidth()); - - //1. load navigator man first - console.log('before LoadBodyViewNavigatorImage call') - $scope.LoadBodyViewNavigatorImage(); - - //$rootScope.loadSearchData(); - - $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle"); + console.log('html is compiled ' + document.getElementById('daView')) - $scope.layerNumber = 0; - - //2. - - - console.log('currentBodyViewId just before sending: ' + currentBodyViewId); - $scope.loadBodyViewData(currentBodyViewId); + if (document.getElementById('daView') != null) { - //2. load bodyRegion data - $rootScope.isLoading = true; - $rootScope.voId = $rootScope.getLocalStorageValue("currentBodyViewId"); + $scope.loadDAView(currentBodyViewId); } - //$('#daBodyview').css("height", $(window).outerHeight()); + else + { + $compile(daBodyviewElement.contents())($scope); + console.log('html is compiled in else ' + document.getElementById('daView')) - //$('#daBodyview').css("width", $(window).outerWidth()); + $scope.loadDAView(currentBodyViewId); + + } + if ($('#daImagePanel').offset().top == 0) $('#daImagePanel').css("top", '70px'); @@ -605,16 +590,35 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $location.path('/'); - /*relaoding unavailable data for resolving refesh issue*/ - /* console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...'); - $scope.loadDissectibleAnatomyData(); - - if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) { - $rootScope.MenuModuleName = "DA"; - }*/ + + } + } + $scope.loadDAView = function (currentBodyViewId) + { + + //0.4 added some stylesheets + $('#daBodyview').css("height", (parseInt($(window).outerHeight()) - 62 - 20)); + + $('#daBodyview').css("width", $(window).outerWidth()); + + //1. load navigator man first + console.log('before LoadBodyViewNavigatorImage call') + $scope.LoadBodyViewNavigatorImage(); + + + $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle"); + + $scope.layerNumber = 0; + + //2. + console.log('currentBodyViewId just before sending: ' + currentBodyViewId); + $scope.loadBodyViewData(currentBodyViewId); + + //2. load bodyRegion data + $rootScope.isLoading = true; + $rootScope.voId = $rootScope.getLocalStorageValue("currentBodyViewId"); - } } angular.element(document).ready(function (e) {