diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 8dc09e3..882273e 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -7,134 +7,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.OpenedTileData=[];
- $scope.genderId = "";
- $scope.BodyViewData;
- $scope.selectedGenderBodyViewData;
- $scope.imagePath = "";
- $rootScope.BodyRegionData;
- $rootScope.BodyRegionCordinatesData;
- $scope.isTransparencyActivated = false;
- $rootScope.BodyLayerData;
- $rootScope.VocabTermData;
-
- $scope.VocabTermTxt;
- $scope.CommonData
- $rootScope.TermNumberData;
- $rootScope.BodySystemData
- $scope.bodyViewId = 0;
- $rootScope.bgartData;
- $scope.drawnBodyRegions;
- //view specific constants
- //TODO
- //$rootScope.voId;
-
- $rootScope.voId = 1;
- $scope.layerNumber;
- $scope.daCounter = 1;
- $scope.bagartDetails;
- $scope.transNumber = 50;
-
- //for transarency scale
- $scope.TBDrawStartX;
- $scope.TBDrawStartY;
- $rootScope.path = "~/../content/images/speeachBubbleClose.png";
- $rootScope.isHighLight = false;
- $rootScope.coloredImageCanvasList = [];
- $rootScope.coloredImageMRCanvasList = [];
- $rootScope.ColoredCanvasData = [];
- $rootScope.grayImageDataList = [];
- $rootScope.grayImageMRDataList = [];
- $rootScope.updatedGrayDataList = [];
- $rootScope.updatedGrayMRDataList = [];
- $scope.isEligibleForHighlight = false;
- $scope.doHighlightOrExtract = false;
- $scope.isEligibleForHighlightBodyByTermList = false;
-
- // $scope.AnteriorView = "active";
-
- $scope.zoomInOut = 75;
- $scope.speechBubbleCounter = 0;
- $scope.j = 0;
- $scope.speechbubbleList = [];
- $scope.speachBubbleArrayAnnotation = [];
- $rootScope.multiAnnotationIsON = false;
- $scope.previousGrayImageDataVar;
- $scope.previousGrayCanvas;
- $rootScope.updatedImageDataList = [];
- $rootScope.updatedImageMRDataList = [];
-
- $scope.previousSelectedTermList = [];
- $scope.runningWorkers = [];
- $scope.runningSearchWorkers = [];
- $scope.runningBodyViewWorkers = [];
-
- // This variable is used for unhighlight previously highlighted body portion, if multiAnnotation is false.
- $scope.machedIcolorInBodyRegion = [];
-
- $rootScope.MaskCanvasData = [];
-
- //extract
- $rootScope.isExtract = false;
-
-
- $rootScope.whiteImageDataList = [];
- $rootScope.whiteImageMRDataList = [];
- $rootScope.previousHighlightList = [];
-
- $rootScope.isViewChange = false;
- $rootScope.isGenderChnage = false;
-
- // to do it is setting but not using. need to check
- $rootScope.updatedWhiteImageDataList = [];
- $rootScope.updatedWhiteImageMRDataList = [];
-
- //normal mode
- $rootScope.isNormalMode = true;
- $rootScope.isZoomed = false;
-
- //navigator man functionality
- $scope.navigatorImage;
- $scope.NavigatorData;
- $scope.navimgsrc;
-
- $scope.dragdivleft = 0;
- $scope.dragdivtop = 0;
-
- $scope.IsSearchVisible = false;
- $scope.shapesize = 1;
- $scope.dragdivposition = {
- "left": $scope.dragdivleft,
- "top": $scope.dragdivtop
- };
-
-
- //array for bodyviewid correspoing to male female(used for gender change)
- $scope.correspondingBodyViewIds = {
- '1': '5',
- '2': '6',
- '3': '7',
- '4': '8',
- '9': '11',
- '10': '12',
-
- '5': '1',
- '6': '2',
- '7': '3',
- '8': '4',
- '11': '9',
- '12': '10',
-
- }
-
- $scope.bodyViews = {
- 'Anterior': '1',
- 'Lateral': '2',
- 'Medial': '3',
- 'Posterior': '4',
- 'Lateral Arm': '5',
- 'Medial Arm': '6'
- }
-
+
$scope.loadForModuleById = function (moduleId) {
$scope.moduleId = moduleId;
@@ -157,23 +30,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
$scope.openModuleItemView = function (event) {
- alert('openModuleItemView is called')
- var moduleItemDataToBeSaved = event.target.id;
-
+
+ //0. Get selected Image Id
+ var moduleItemDataToBeSaved = event.target.id;
+
+ //1.Filter selected module ietem data and get the pushed opened moduile array object
$rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
+ //2. Pick the image name to create a source to open
$rootScope.imageName = $rootScope.OpenedTileData[3];
-
$rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
- alert('img Name: ' + $rootScope.OpenItemImageName);
+ //3. Navigate to the Module-item-view
var u = $location.url();
$location.url('/module-item-view');
}
- $scope.openBodyView = function ()
+ $scope.openModuleItem = function ()
{
+ //1. create a jsPanel and load the module item view
+
+
+
$.jsPanel({
id: 'aaImagePanel',
selector: '.aaBodyView',
@@ -205,8 +84,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
alert('aaView val: ' + document.getElementById('aaDetailPageDiv'));
//console.log('html is compiled' + document.getElementById('daView'))
if (document.getElementById('aaDetailPageDiv') != null) {
-
-
////0.4 added some stylesheets
$('#aaBodyView').css("height", $(window).outerHeight());
@@ -215,7 +92,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
- $scope.loadAAImage($rootScope.OpenItemImagePath);
+ $("#modItemImage").attr('src', $rootScope.OpenItemImagePath);
//$('#aaBodyView').css("height", $(window).outerHeight());
@@ -226,11 +103,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.loadAAImage = function (OpenedModuleItemPath)
{
+
+
//var imgNode = document.getElementById('modItemImage');
- //imgNode.src = $rootScope.OpenItemImagePath;
+ ////document.getElementById("imageid").src = "../template/save.png";
+ ////imgNode.src = $rootScope.OpenItemImagePath;
+ //alert($rootScope.OpenItemImagePath);
- var imageNode = "''";
- $('#imageDiv').append(imageNode);
+ // var imageNode = "'
'";
+ //$('#imageDiv').append(imageNode);
}
angular.element(document).ready(function (e) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
index 4e8b606..30a3c5f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
@@ -56,15 +56,6 @@ AIA.service('ModuleService', function($http, DataService) {
.where("_Title == " + title)
.select();
- //AADataForSelectedItem.push("imageId: " + selectedTileData[0]._ImageId);
- //AADataForSelectedItem.push("BodyRegion:" + selectedTileData[0]._BodyRegion);
- //AADataForSelectedItem.push("BodySystem: " + selectedTileData[0]._BodySystem);
- //AADataForSelectedItem.push("ImageName: " + selectedTileData[0]._ImageName);
- //AADataForSelectedItem.push("ImageType:" + selectedTileData[0]._ImageType);
- //AADataForSelectedItem.push("TileImageName: " + selectedTileData[0]._TileImageName);
-
- //AADataForSelectedItem.push("ViewOrientation: " + selectedTileData[0]._ViewOrientation);
-
AADataForSelectedItem.push(selectedTileData[0]._ImageId);
AADataForSelectedItem.push(selectedTileData[0]._BodyRegion);
AADataForSelectedItem.push(selectedTileData[0]._BodySystem);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
index bded6e6..a1a3eb0 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -87,9 +87,7 @@