From 57b87639560e3d42cf32730b0a0afb722b51fb93 Mon Sep 17 00:00:00 2001 From: birendra.kumar Date: Mon, 13 Jan 2020 12:39:13 +0530 Subject: [PATCH] partially updated 3D module --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js | 492 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js | 29 +++++++++++++++++++++++++++++ 400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js | 7 +++++++ 400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js | 27 +++++++++++++++++++++++++-- 400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html | 2 +- 7 files changed, 438 insertions(+), 123 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 040acf0..8dbce0f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -1,11 +1,142 @@ -AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", -function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { - - - $scope.showTabButton = false; - $scope.threeDAnatomyData; - $scope.Id; - $scope.$on('$viewContentLoaded', function (event) { +AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", "$timeout", "ModuleService", "$interval", +function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile, $timeout, ModuleService, $interval) { + + + // $scope.threeDAnatomyData; + + $scope.initialize3DWindowData = function (windowviewid, isOpenWithExistsModule, cbwindowid) { + if (isOpenWithExistsModule || cbwindowid == 0) { + if ($rootScope.TheeDWindowData != undefined) { + $rootScope.TheeDWindowData.length = 0; + } + else { + $rootScope.TheeDWindowData = []; + } + + $rootScope.TheeDWindowData.push( + { + 'multiwinid': windowviewid, + 'threeDAnatomyData': [], + 'searchCAListViewData': [], + 'ImagePath': '', + 'moduleName': '', + 'currentViewTitle': '', + 'parentSlugName': '', + 'currentSlug': '', + 'imageId': '', + 'imageName': '', + 'clickedCAVideo': '', + 'clickedCASummary': '', + 'hostedFolderId': '', + 'isTextVisible': true + }); + + } + else { + var isNewWindow = true; + for (var k = 0; k < $rootScope.TheeDWindowData.length; k++) { + if ($rootScope.TheeDWindowData[k].multiwinid == windowviewid) { + isNewWindow = false; + break; + } + } + + if (isNewWindow) { + $rootScope.TheeDWindowData.push( + { + 'multiwinid': windowviewid, + 'threeDAnatomyData': [], + 'searchCAListViewData': [], + 'ImagePath': '', + 'moduleName': '', + 'currentViewTitle': '', + 'parentSlugName': '', + 'currentSlug': '', + 'imageId': '', + 'imageName': '', + 'clickedCAVideo': '', + 'clickedCASummary': '', + 'hostedFolderId': '', + 'isTextVisible': true + }); + + } + } + } + + $scope.Get3DwindowStoreData = function (windowviewid, keyname) { + for (var x = 0 ; x < $rootScope.TheeDWindowData.length; x++) { + + if ($rootScope.TheeDWindowData[x].multiwinid == windowviewid) { + return $rootScope.TheeDWindowData[x][keyname]; + } + } + } + + $scope.Set3DwindowStoreData = function (windowviewid, keyname, value) { + for (var x = 0 ; x < $rootScope.TheeDWindowData.length; x++) { + + if ($rootScope.TheeDWindowData[x].multiwinid == windowviewid) { + $rootScope.TheeDWindowData[x][keyname] = value; + } + } + } + + $rootScope.Get3DWindowId = function () { + // handle for single window + if ($rootScope.TheeDWindowData.length > 0) { + for (var x = 0 ; x < $rootScope.TheeDWindowData.length; x++) { + + return $rootScope.TheeDWindowData[x].multiwinid; + } + } + else return 0; + } + + $scope.DisableUI = function () { + + var caImagePanelConetent = document.getElementsByClassName("jsPanel-content"); + for (var i = 0; i < caImagePanelConetent.length; i++) { + caImagePanelConetent[i].style.pointerEvents = "none"; + caImagePanelConetent[i].style.opacity = "0.7"; + + } + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); + + // CB module disable all + $('#CBDetailPageDiv').css('pointer-events', 'none'); + $('#CBDetailPageDiv').css('opacity', '0.7'); + } + + $scope.EnableUI = function () { + + var caImagePanelConetent = document.getElementsByClassName("jsPanel-content"); + for (var i = 0; i < caImagePanelConetent.length; i++) { + caImagePanelConetent[i].style.pointerEvents = "auto"; + caImagePanelConetent[i].style.opacity = "1"; + } + + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + // CB module enable all + $('#CBDetailPageDiv').css('pointer-events', 'auto'); + $('#CBDetailPageDiv').css('opacity', '1'); + } + + $scope.loadAIModuleById = function (moduleId) { + $rootScope.isCallFromOtherModule = undefined; + + $rootScope.MULTI_VIEW_ID += 1 + + $scope.initialize3DWindowData($rootScope.MULTI_VIEW_ID, true, undefined); + + $scope.DisableUI(); + + if ($rootScope.refreshcheck == null) { + $location.path('/'); + } + var currentURL = $location.path(); var selectedModuleName = ''; //set module title @@ -16,25 +147,36 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location } $rootScope.currentActiveModuleTitle = selectedModuleName; }) - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + + $scope.Set3DwindowStoreData($rootScope.MULTI_VIEW_ID, 'moduleName', "3D Anatomy"); + + $scope.Load3DJsonData($rootScope.MULTI_VIEW_ID); + $scope.scroll(); + + + }; + + $scope.scroll = function () { + $("html,body").scrollTop(0); + } + + $scope.Load3DJsonData = function (windowviewid) { + var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') promise.then( function (result) { - $scope.threeDAnatomyData = result; - - // $scope.selectedThreeDAdata = $scope.threeDAnatomyData.root.ThreeDAData; - - $scope.selectedThreeDAdata = new jinqJs() - .from($scope.threeDAnatomyData.root.ThreeDAData) + + var threeDAnatomyData = new jinqJs() + .from(result.root.ThreeDAData) .orderBy([{ field: '_Title', sort: 'asc' }]) .select(); + $scope.Set3DwindowStoreData(windowviewid, 'threeDAnatomyData', threeDAnatomyData); + // console.log($scope.selectedCIListViewData); $('#grid-view').empty(); - angular.forEach($scope.selectedThreeDAdata, function (value, key) { + angular.forEach(threeDAnatomyData, function (value, key) { $scope.imagePath = "~/../content/images/3da/thumbnails/" + value._ThumbnailImage; var $el = $('
' @@ -52,36 +194,28 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location }); + $timeout(function () { $scope.EnableUI(); }, 200); }, function (error) { + $scope.EnableUI(); // handle errors here console.log(' $scope.threeDAnatomyData = ' + error.statusText); } ); - - }); - $scope.scroll = function () { - // $window.scrollTo(0, 0); - $("html,body").scrollTop(0); - //alert("scroll"); - } - $scope.IsVisible = function () { - //$scope.scroll(); - - $location.url("/3dAnatomy"); - - } - + }; $scope.Open3DModel = function ($event) { $rootScope.currentBodyViewId = $event.currentTarget.id; + var windowviewid = $rootScope.MULTI_VIEW_ID; + var selectedThreeDAdata = $scope.Get3DwindowStoreData(windowviewid, 'threeDAnatomyData'); + if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { var ThreeDTitle = []; ThreeDTitle = new jinqJs() - .from($scope.selectedThreeDAdata) + .from(selectedThreeDAdata) .where('_id = ' + $event.currentTarget.id) - .select('_Title'); - + .select('_Title', '_3dimagepath'); + $rootScope.ViewTitle = ThreeDTitle[0]._Title; } else { @@ -93,121 +227,243 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); localStorage.setItem("currentBodyViewId", $event.currentTarget.id); + var ImagePath = ThreeDTitle[0]._3dimagepath; + + $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', $rootScope.ViewTitle); + $scope.Set3DwindowStoreData(windowviewid, 'imageId', $event.currentTarget.id); + $scope.Set3DwindowStoreData(windowviewid, 'ImagePath', ImagePath); + var u = $location.url(); $location.url('/3d-anatomy-details'); } - $scope.Open3DModelBody = function () { + $scope.Open3DModelBodyMain = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); + if ($rootScope.isCallFromOtherModule) { + $scope.ThreeDModuleData = ModuleService.getModuleData("THREE_D_ANATOMY"); + $scope.readyToLoad = true; + $rootScope.ThreeDWindowLoadComplete = false; + $scope.wincount = 1; + var winlen = $scope.ThreeDModuleData.length; + var timeint = null; + var slideId = ""; + timeint = $interval(function () { - } - $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); - //alert($rootScope.getLocalStorageValue("currentBodyViewId")); - $scope.voId3D = $rootScope.getLocalStorageValue("currentBodyViewId"); + if ($scope.readyToLoad == true) { + var windata = $scope.ThreeDModuleData[$scope.wincount - 1]; + slideId = windata.slideId; + $scope.Open3DModelBody(windata); - //alert($scope.voId3D); + } + $scope.readyToLoad = false; + if ($scope.wincount < winlen && $rootScope.ThreeDWindowLoadComplete == true) { + $scope.wincount = $scope.wincount + 1; + $rootScope.ThreeDWindowLoadComplete = false; + $scope.readyToLoad = true; + } + if ($scope.wincount == winlen && $rootScope.ThreeDWindowLoadComplete == true) { + $scope.stopInterval(); + $scope.$emit("LoadModuleComplete", "THREE_D_ANATOMY", slideId); + } - //once you get id in scope push detail in jspanel content - var openViews; - //if ($rootScope.openViews.length > 0) { - // openViews = new jinqJs() - // .from($rootScope.openViews) - // .where("BodyViewId==" + $scope.voId3D) - // .select(); - //} - //var counter = 1; - var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); - $rootScope.currentActiveViewTitle = tittle; - localStorage.setItem("currentViewTitle", tittle); - //if (openViews != null && openViews.length > 0) { - // angular.forEach(openViews, function (value, key) { + }, 100); - // if (value.body - views == tittle) { - // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; - // $rootScope.currentActiveViewTitle = tittle; - // localStorage.setItem("currentViewTitle", tittle); - // } + $scope.stopInterval = function () { + if (angular.isDefined(timeint)) { + $interval.cancel(timeint); + timeint = undefined; + } - // }); - //} - //else { - // localStorage.setItem("currentViewTitle", tittle); + }; - //} + } + else { + $scope.Open3DModelBody(null); + } + } - // alert($rootScope.getLocalStorageValue("currentViewTitle")); + $scope.Open3DModelBody = function (ThreeDModuleData) { - var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') - promise.then( - function (result) { - $scope.threeDAnatomyData = result; + $scope.DisableUI(); - var clicked3dAview = []; - clicked3dAview = new jinqJs().from($scope.threeDAnatomyData.root.ThreeDAData) - .where('_id == ' + $scope.voId3D) + if ($rootScope.isCallFromOtherModule == true) { + $scope.ThreeDOpenInOtherModules = ThreeDModuleData; + $rootScope.MULTI_VIEW_ID += 1; + var windowviewid = $rootScope.MULTI_VIEW_ID; + + $scope.initialize3DWindowData(windowviewid, false, $scope.ThreeDOpenInOtherModules.currentWindowId); + + var moduleName = $scope.ThreeDOpenInOtherModules.mType; + $scope.Set3DwindowStoreData(windowviewid, 'moduleName', moduleName); + + var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json'); + promise.then( + function (result) { + + var imageId = $scope.ThreeDOpenInOtherModules.id; + + var clicked3DViewData = []; + clicked3DViewData = new jinqJs().from(result.root.ThreeDAData) + .where('_id == ' + imageId) .select('_Title', '_3dimagepath'); - $scope.Selected3DImagePath = clicked3dAview[0]._3dimagepath; - $scope.threeDBodySystemTitle = clicked3dAview[0]._Title; - - if (clicked3dAview.length > 0) { - - $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); - - $.jsPanel({ - id: '3DImagePanel', - selector: '.threeDView', - theme: 'success', - currentController: '3dAController', - parentSlug: '3d-anatomy-list', - content: '
' + - '' + - '
', - title: $rootScope.getLocalStorageValue("currentViewTitle"), - position: { - top: 70, - left: 1, - }, - - size: { width: $(window).outerWidth() - 20, height: $(window).outerHeight() - 10 }, - }); + if (clicked3DViewData.length == 0) { + $rootScope.ThreeDWindowLoadComplete = true + return; + } + + $scope.Set3DwindowStoreData(windowviewid, 'imageId', imageId); - $rootScope.currentSlug = '3d-anatomy-details'; + var ImagePath = clicked3DViewData[0]._3dimagepath; + + $scope.Set3DwindowStoreData(windowviewid, 'ImagePath', ImagePath); - $rootScope.openViews.push( - { - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, - "slug": $rootScope.currentSlug - }); + var ThreeDTitle = $scope.ThreeDOpenInOtherModules.anatomyTitle; + $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', ThreeDTitle); + localStorage.setItem("currentViewTitle", ThreeDTitle); + $scope.Set3DwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', '')); + $scope.load3DAnimation(windowviewid); + + }, + function (error) { + // handle errors here + console.log(' $scope.CAllustrationData = ' + error.statusText); } + ); + } + else { + $scope.Set3DwindowStoreData($rootScope.MULTI_VIEW_ID, 'parentSlugName', '3d-anatomy-list'); + $scope.load3DAnimation($rootScope.MULTI_VIEW_ID); + } - }, - function (error) { - // handle errors here - console.log(' $scope.CIllustrationData = ' + error.statusText); - } + } - ); - $('#ThreeDView').css("height", $(window).outerHeight()); + $scope.load3DAnimation = function (windowviewid) { + + if ($rootScope.refreshcheck == null) { + $location.path('/'); + + } + + $scope.jsPanelID = 'ThreeDImagePanel' + '_' + windowviewid; + + var Selected3DImagePath = $scope.Get3DwindowStoreData(windowviewid, 'ImagePath'); + var tittle = $scope.Get3DwindowStoreData(windowviewid, 'currentViewTitle'); + + if ($rootScope.isCallFromOtherModule) { + // open JS panel for curriculum with define cornonate in CB jason + $scope.jsPanelWidth = $scope.ThreeDOpenInOtherModules.size.width;//1000; + if ($scope.ThreeDOpenInOtherModules.size.width < 900) + $scope.jsPanelWidth = 900; + + $scope.jsPanelHeight = $scope.ThreeDOpenInOtherModules.size.height; + if ($scope.ThreeDOpenInOtherModules.size.height > 750) + $scope.jsPanelHeight = 750; + $scope.jsPanelLeft = 320; + $scope.jsPanelTop = $rootScope.cBModulejsPanelTop(); + + } + else { + $scope.jsPanelWidth = $(window).outerWidth() - 23; + $scope.jsPanelHeight = $(window).outerHeight() - 104; + $scope.jsPanelLeft = 1; + $scope.jsPanelTop = 70; + } + + + if (Selected3DImagePath.length > 0) { + $.jsPanel({ + id: $scope.jsPanelID, + selector: '.threeDView', + theme: 'success', + currentController: '3dAController', + parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), + content: '
' + + '' + + '
', + title: tittle, + position: { + top: $scope.jsPanelTop, + left: $scope.jsPanelLeft + }, + + size: { + width: $scope.jsPanelWidth, + height: $scope.jsPanelHeight + }, + + }); + + $rootScope.currentSlug = '3d-anatomy-details'; + $scope.Set3DwindowStoreData(windowviewid, 'currentSlug', '3d-anatomy-details'); + + $rootScope.openViews.push( + { + "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, + "slug": $scope.Get3DwindowStoreData(windowviewid, 'currentSlug') + }); - $('#ThreeDView').css("width", $(window).outerWidth()); + } + + if (!$rootScope.isCallFromOtherModule) { + $('#ThreeDView').css("height", $(window).outerHeight()-10); + + $('#ThreeDView').css("width", $(window).outerWidth()-20); + + } + + + } + + $scope.AnimationOnLoad = function (windowviewid) { + $scope.EnableUI(); + + if ($rootScope.isCallFromOtherModule) { + $scope.JsPanelclick(windowviewid); + $rootScope.ThreeDWindowLoadComplete = true; + } + $scope.JsPanelclick(windowviewid); } - + $scope.JsPanelclick = function (windowviewid) { + // call from while open module in CB + $("#ThreeDImagePanel_" + windowviewid).on('click', function (event) { + + // var pnlName = event.currentTarget.id; + $scope.$emit("cBEnableDisableMenuOption", ""); + + }); + $("#threedImage_" + windowviewid).on('click', function (event) { -}] + // var pnlName = event.currentTarget.id; + $scope.$emit("cBEnableDisableMenuOption", ""); + }); + $("#threedImage_" + windowviewid + "#document html body").on('click', function (event) { + // var pnlName = event.currentTarget.id; + $scope.$emit("cBEnableDisableMenuOption", ""); + + }); + } -); \ No newline at end of file +}]); + +function AnimationOnLoad(event) { + + console.log('animation loaded') + var scope = angular.element(document.getElementById("ThreeDView")).scope(); + // var len = (event.target.id).split("_").length; + var windowviewid = (event.target.id).split("_")[1]; + + scope.$apply(function () { + scope.AnimationOnLoad(windowviewid); + }); +} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 59522f7..2786ad2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -1211,6 +1211,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ var AtlasWindowId = 0; var CIWindowId = 0; var CAWindowId = 0; + var ThreeDWindowId = 0; $scope.LoadModuleName = []; $scope.Slidenumber = id; @@ -1278,6 +1279,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.LoadModuleName.push(windowData.mType); } } + else if (windowData.mType == "THREE_D_ANATOMY") { + ModuleService.setModuleData(windowData, ThreeDWindowId, $scope.Slidenumber); + ThreeDWindowId = ThreeDWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } + } } } @@ -1323,6 +1332,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ ModuleService.setModuleData(windowData, CAWindowId, $scope.Slidenumber); } + else if (windowData.mType == "THREE_D_ANATOMY") { + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } + ModuleService.setModuleData(windowData, ThreeDWindowId, $scope.Slidenumber); + + } } @@ -1411,10 +1428,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if (CAData != undefined && CAData.length > 0) { $scope.loadClinicalAnimationModule(); } + } + else if (moduleName == "THREE_D_ANATOMY") { + var ThreeDData = ModuleService.getModuleData(moduleName); + if (ThreeDData != undefined && ThreeDData.length > 0) { + $scope.load3DAnatomyModule(); + } } } + $scope.load3DAnatomyModule = function () { + $rootScope.isCallFromOtherModule = true; + $('#parentcustomDiv').append($('
')); + $e = $('#theeDCustomModuleDiv' + $scope.Slidenumber).append(""); + $compile($e)($scope); + } $scope.loadClinicalAnimationModule = function () { $rootScope.isCallFromOtherModule = true; $('#parentcustomDiv').append($('
')); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js index 1bcad65..3ae2d73 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js @@ -25,4 +25,11 @@ AIA.directive('clinicalAnimationDirective', function (ModuleService) { templateUrl: 'app/views/ca/clinical-animations-detail.html', } +}); +AIA.directive('threedAnatomyDirective', function (ModuleService) { + return { + //restrict: 'E', + templateUrl: 'app/views/3dA/3d-anatomy-details.html', + + } }); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index 94e3ddd..b3388fe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -10,9 +10,9 @@ var moduleDataObj = {}; moduleDataObj.AAData = []; moduleDataObj.DAData = []; -moduleDataObj.CAData = []; moduleDataObj.CIData = []; moduleDataObj.CAData = []; +moduleDataObj.ThreeDData = []; AIA.service('ModuleService', function ($http, DataService) { return { @@ -142,11 +142,33 @@ AIA.service('ModuleService', function ($http, DataService) { return moduleDataObj.CIData; else if (moduleName == "CLINICAL_ANIMATIONS") return moduleDataObj.CAData; + else if (moduleName == "THREE_D_ANATOMY") + return moduleDataObj.ThreeDData; + }, setModuleData: function (windowData, windowId, SlideNo) { - if (windowData.mType == "CLINICAL_ANIMATIONS") { + if (windowData.mType == "THREE_D_ANATOMY") { + moduleDataObj.ThreeDData.push({ + slideId: SlideNo, + currentWindowId: windowId, + mType: windowData.mType, + threeDData:windowData.threeDData, + containsCapturedContent: windowData.containsCapturedContent, + anatomyTitle: windowData.windowTitle, + scrollPosition: windowData.scrollPosition, + imageId: windowData.imageId, + maximised: windowData.maximised, + minimised: windowData.minimised, + id: windowData.id, + position: windowData.position, + size: windowData.size, + contextMenu: windowData.contextMenu, + contentPath: windowData.contentPath + }); + } + else if (windowData.mType == "CLINICAL_ANIMATIONS") { moduleDataObj.CAData.push({ slideId: SlideNo, currentWindowId: windowId, @@ -267,6 +289,7 @@ AIA.service('ModuleService', function ($http, DataService) { moduleDataObj.AAData = []; moduleDataObj.CIData = []; moduleDataObj.CAData = []; + moduleDataObj.ThreeDData = []; } }; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html index 2143e23..6e53bd2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3d-anatomy-details.html @@ -1,4 +1,4 @@ 
-
+
\ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html index 82a4005..87ab1a2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html @@ -1,6 +1,6 @@ 
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index c48606d..3a84c74 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -50,7 +50,7 @@
  • About A.D.A.M.
    • --> -
  • Admin
      • -- libgit2 0.21.4