ADAM / AIAHTML5

Commit 84d49e964f1a89c7fb871d08036c17745a3d9515

Authored by Amrita Vishnoi
1 parent 939bc127

Getting success in accessing image name on open View

Inline Side-by-side
Showing 4 changed files with 194 additions and 51 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @84d49e9
@@ -23,7 +23,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -23,7 +23,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
23 $rootScope.bgartData; 23 $rootScope.bgartData;
24 $scope.drawnBodyRegions; 24 $scope.drawnBodyRegions;
25 //view specific constants 25 //view specific constants
26 - $rootScope.voId; 26 + //TODO
  27 + //$rootScope.voId;
  28 +
  29 + $rootScope.voId = 1;
27 $scope.layerNumber; 30 $scope.layerNumber;
28 $scope.daCounter = 1; 31 $scope.daCounter = 1;
29 $scope.bagartDetails; 32 $scope.bagartDetails;
@@ -304,10 +307,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -304,10 +307,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
304 } 307 }
305 308
306 }; 309 };
307 -  
308 -  
309 - 310 +
310 $scope.openView = function ($event) { 311 $scope.openView = function ($event) {
  312 + alert('openView is called in AA')
  313 + debugger;
311 314
312 $rootScope.MenuModuleName = "DA"; 315 $rootScope.MenuModuleName = "DA";
313 //alert($rootScope.MenuModuleName); 316 //alert($rootScope.MenuModuleName);
@@ -405,6 +408,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -405,6 +408,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
405 //load json data for body view 408 //load json data for body view
406 $scope.loadDissectibleAnatomyData = function () { 409 $scope.loadDissectibleAnatomyData = function () {
407 410
  411 + alert('AA: loadDissectibleAnatomyData is called');
  412 +
408 $rootScope.ClearIframe(); 413 $rootScope.ClearIframe();
409 414
410 //load common data 415 //load common data
@@ -446,46 +451,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -446,46 +451,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
446 451
447 } 452 }
448 453
449 -  
450 - //da-body-views functions  
451 -  
452 $scope.openBodyView = function () { 454 $scope.openBodyView = function () {
453 455
454 //0. we will initially append container to load body 456 //0. we will initially append container to load body
455 457
456 //check if localstorage has any settings 458 //check if localstorage has any settings
457 - //var curentEthnicity = localStorage.getItem("globalEthnicity");  
458 - //if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {  
459 - // $rootScope.globalSetting.ethnicity = curentEthnicity;  
460 - //} 459 + var curentEthnicity = localStorage.getItem("globalEthnicity");
  460 + if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {
  461 + $rootScope.globalSetting.ethnicity = curentEthnicity;
  462 + }
461 463
462 - //var curentmodesty = localStorage.getItem("globalModesty");  
463 - //if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {  
464 - // $rootScope.globalSetting.modesty = curentmodesty  
465 - //} 464 + var curentmodesty = localStorage.getItem("globalModesty");
  465 + if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {
  466 + $rootScope.globalSetting.modesty = curentmodesty
  467 + }
466 468
467 //0.1 469 //0.1
468 - //var currentBodyViewId = localStorage.getItem("currentBodyViewId"); 470 + var currentBodyViewId = localStorage.getItem("currentBodyViewId");
469 471
470 - //$scope.loadSearchDataForBodyView(); 472 + $scope.loadSearchDataForBodyView();
471 473
472 474
473 - //console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); 475 + console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
474 476
475 - //var openViews;  
476 - //if ($rootScope.openViews != null || $rootScope.openViews != undefined) {  
477 - // if ($rootScope.openViews.length > 0) {  
478 - // openViews = new jinqJs()  
479 - // .from($rootScope.openViews)  
480 - // .where("BodyViewId == " + currentBodyViewId)  
481 - // .select();  
482 - // }  
483 - //} 477 + var openViews;
  478 + if ($rootScope.openViews != null || $rootScope.openViews != undefined) {
  479 + if ($rootScope.openViews.length > 0) {
  480 + openViews = new jinqJs()
  481 + .from($rootScope.openViews)
  482 + .where("BodyViewId == " + currentBodyViewId)
  483 + .select();
  484 + }
  485 + }
484 486
485 // 0.2 getting corresponding body view title 487 // 0.2 getting corresponding body view title
486 //var counter = 1; 488 //var counter = 1;
487 - //var tittle = localStorage.getItem("currentViewTitleFromJson");  
488 - //localStorage.setItem("currentViewTitle", tittle); 489 + var tittle = localStorage.getItem("currentViewTitleFromJson");
  490 + localStorage.setItem("currentViewTitle", tittle);
489 491
490 //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD 492 //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
491 //if (openViews != null && openViews != undefined) { 493 //if (openViews != null && openViews != undefined) {
@@ -509,12 +511,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -509,12 +511,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
509 id: 'daImagePanel', 511 id: 'daImagePanel',
510 selector: '.daBodyView', 512 selector: '.daBodyView',
511 theme: 'success', 513 theme: 'success',
512 - currentController: 'TileListViewController',  
513 - parentSlug: 'tile-view-list', 514 + currentController: 'DAController',
  515 + parentSlug: 'da-view-list',
514 ajax: { 516 ajax: {
515 - url: 'app/views/aa/atlas-anatomy-detail.html' 517 + url: 'app/views/da/da-view.html'
516 }, 518 },
517 - title: "abc", 519 + title: localStorage.getItem("currentViewTitle"),
518 520
519 position: { 521 position: {
520 top: 70, 522 top: 70,
@@ -527,15 +529,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -527,15 +529,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
527 529
528 console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel')) 530 console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
529 //0.1 531 //0.1
530 - //$rootScope.currentSlug = 'da-body-view'; 532 + $rootScope.currentSlug = 'da-body-view';
531 533
532 //0.2 534 //0.2
533 - //$rootScope.openViews.push(  
534 - // {  
535 - // "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,  
536 - // "slug": $rootScope.currentSlug  
537 - // }  
538 - // ); 535 + $rootScope.openViews.push(
  536 + {
  537 + "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
  538 + "slug": $rootScope.currentSlug
  539 + }
  540 + );
539 541
540 //0.3 542 //0.3
541 var daBodyviewElement = angular.element(document.getElementById("daBodyview")); 543 var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
@@ -553,7 +555,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -553,7 +555,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
553 555
554 //1. load navigator man first 556 //1. load navigator man first
555 console.log('before LoadBodyViewNavigatorImage call') 557 console.log('before LoadBodyViewNavigatorImage call')
556 - // $scope.LoadBodyViewNavigatorImage(); 558 + $scope.LoadBodyViewNavigatorImage();
557 559
558 //$scope.loadSearchDataForBodyView(); 560 //$scope.loadSearchDataForBodyView();
559 561
@@ -563,8 +565,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -563,8 +565,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
563 565
564 //2. 566 //2.
565 567
566 - //console.log('currentBodyViewId just before sending: ' + currentBodyViewId);  
567 - // $scope.loadBodyViewData(currentBodyViewId); 568 + console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
  569 + $scope.loadBodyViewData(currentBodyViewId);
568 570
569 //2. load bodyRegion data 571 //2. load bodyRegion data
570 $rootScope.isLoading = true; 572 $rootScope.isLoading = true;
@@ -577,6 +579,136 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -577,6 +579,136 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
577 }, 250); 579 }, 250);
578 } 580 }
579 581
  582 + //da-body-views functions
  583 +
  584 + //$scope.openBodyView = function () {
  585 +
  586 + // //0. we will initially append container to load body
  587 +
  588 + // //check if localstorage has any settings
  589 + // //var curentEthnicity = localStorage.getItem("globalEthnicity");
  590 + // //if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {
  591 + // // $rootScope.globalSetting.ethnicity = curentEthnicity;
  592 + // //}
  593 +
  594 + // //var curentmodesty = localStorage.getItem("globalModesty");
  595 + // //if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {
  596 + // // $rootScope.globalSetting.modesty = curentmodesty
  597 + // //}
  598 +
  599 + // //0.1
  600 + // //var currentBodyViewId = localStorage.getItem("currentBodyViewId");
  601 +
  602 + // //$scope.loadSearchDataForBodyView();
  603 +
  604 +
  605 + // //console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
  606 +
  607 + // //var openViews;
  608 + // //if ($rootScope.openViews != null || $rootScope.openViews != undefined) {
  609 + // // if ($rootScope.openViews.length > 0) {
  610 + // // openViews = new jinqJs()
  611 + // // .from($rootScope.openViews)
  612 + // // .where("BodyViewId == " + currentBodyViewId)
  613 + // // .select();
  614 + // // }
  615 + // //}
  616 +
  617 + // // 0.2 getting corresponding body view title
  618 + // //var counter = 1;
  619 + // //var tittle = localStorage.getItem("currentViewTitleFromJson");
  620 + // //localStorage.setItem("currentViewTitle", tittle);
  621 +
  622 + // //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
  623 + // //if (openViews != null && openViews != undefined) {
  624 + // // angular.forEach(openViews, function (value, key) {
  625 +
  626 + // // if (value.bodyView == tittle) {
  627 + // // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;
  628 + // // $rootScope.currentActiveViewTitle = tittle;
  629 + // // localStorage.setItem("currentViewTitle", tittle);
  630 + // // }
  631 +
  632 + // // });
  633 + // //}
  634 + // //else {
  635 + // // localStorage.setItem("currentViewTitle", tittle);
  636 + // //}
  637 +
  638 + // //0.3
  639 +
  640 + // $.jsPanel({
  641 + // id: 'daImagePanel',
  642 + // selector: '.daBodyView',
  643 + // theme: 'success',
  644 + // currentController: 'TileListViewController',
  645 + // parentSlug: 'tile-view-list',
  646 + // ajax: {
  647 + // url: 'app/views/aa/atlas-anatomy-detail.html'
  648 + // },
  649 + // title: "abc",
  650 +
  651 + // position: {
  652 + // top: 70,
  653 + // left: 1,
  654 + // },
  655 +
  656 + // size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
  657 +
  658 + // });
  659 +
  660 + // console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
  661 + // //0.1
  662 + // //$rootScope.currentSlug = 'da-body-view';
  663 +
  664 + // //0.2
  665 + // //$rootScope.openViews.push(
  666 + // // {
  667 + // // "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
  668 + // // "slug": $rootScope.currentSlug
  669 + // // }
  670 + // // );
  671 +
  672 + // //0.3
  673 + // var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
  674 +
  675 + // $timeout(function () {
  676 + // $compile(daBodyviewElement.contents())($scope);
  677 +
  678 + // console.log('html is compiled' + document.getElementById('daView'))
  679 + // if (document.getElementById('daView') != null) {
  680 +
  681 + // //0.4 added some stylesheets
  682 + // $('#daBodyview').css("height", $(window).outerHeight());
  683 +
  684 + // $('#daBodyview').css("width", $(window).outerWidth());
  685 +
  686 + // //1. load navigator man first
  687 + // console.log('before LoadBodyViewNavigatorImage call')
  688 + // // $scope.LoadBodyViewNavigatorImage();
  689 +
  690 + // //$scope.loadSearchDataForBodyView();
  691 +
  692 + // $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
  693 +
  694 + // $scope.layerNumber = 0;
  695 +
  696 + // //2.
  697 +
  698 + // //console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
  699 + // // $scope.loadBodyViewData(currentBodyViewId);
  700 +
  701 + // //2. load bodyRegion data
  702 + // $rootScope.isLoading = true;
  703 + // $rootScope.voId = localStorage.getItem("currentBodyViewId");
  704 +
  705 + // $('#daBodyview').css("height", $(window).outerHeight());
  706 +
  707 + // $('#daBodyview').css("width", $(window).outerWidth());
  708 + // }
  709 + // }, 250);
  710 + //}
  711 +
580 angular.element(document).ready(function (e) { 712 angular.element(document).ready(function (e) {
581 $("#daImagePanel").resize(function () { 713 $("#daImagePanel").resize(function () {
582 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); 714 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
@@ -618,10 +750,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -618,10 +750,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
618 750
619 //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")) 751 //console.log('for bodyRegionId = ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
620 752
  753 + //searchWorker.postMessage({
  754 + // 'currentBodyViewId': currentBodyViewId,
  755 + //})
  756 +
621 searchWorker.postMessage({ 757 searchWorker.postMessage({
622 - 'currentBodyViewId': currentBodyViewId, 758 + 'currentBodyViewId': 1,
623 }) 759 })
624 760
  761 +
625 searchWorker.onmessage = function (e) { 762 searchWorker.onmessage = function (e) {
626 //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1")); 763 //console.log('callback searchWorker , time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"));
627 764
@@ -804,7 +941,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -804,7 +941,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
804 $rootScope.viewOrientationId = 6; 941 $rootScope.viewOrientationId = 6;
805 } 942 }
806 943
807 - $scope.CalculateImageCordinates($rootScope.viewOrientationId); 944 + //TODO
  945 + //$scope.CalculateImageCordinates($rootScope.viewOrientationId);
  946 + $scope.CalculateImageCordinates(1);
808 947
809 948
810 }; 949 };
@@ -1199,7 +1338,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1199,7 +1338,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1199 if ($rootScope.viewOrientationId == 3 && bodyRegionId == 1) { 1338 if ($rootScope.viewOrientationId == 3 && bodyRegionId == 1) {
1200 console.log('$rootScope.voId: ' + $rootScope.voId); 1339 console.log('$rootScope.voId: ' + $rootScope.voId);
1201 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == 'W') { 1340 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == 'W') {
1202 - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/W/" + SelectedLayerData.BodyRegion[z].Image._ImageName; 1341 + //TODO
  1342 + //return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/W/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  1343 + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + 1 + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/W/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
1203 } 1344 }
1204 } 1345 }
1205 1346
@@ -1207,7 +1348,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1207,7 +1348,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1207 1348
1208 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) { 1349 if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
1209 1350
1210 - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; 1351 + //TODO
  1352 + //return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  1353 + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" +1 + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
1211 } 1354 }
1212 } 1355 }
1213 } 1356 }
@@ -5639,7 +5782,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5639,7 +5782,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5639 5782
5640 $scope.enableHighlight = function () { 5783 $scope.enableHighlight = function () {
5641 5784
5642 - 5785 + alert('hi highlight');
5643 // $("#btnExtract").removeClass("disabled"); 5786 // $("#btnExtract").removeClass("disabled");
5644 $("#btnTranparency").removeClass("disabled"); 5787 $("#btnTranparency").removeClass("disabled");
5645 // $rootScope.isTransparencyBoxActivated = false; 5788 // $rootScope.isTransparencyBoxActivated = false;
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @84d49e9
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 </div> 161 </div>
162 <div class="col-xs-12 pad0"> 162 <div class="col-xs-12 pad0">
163 <div class="col-xs-6"> 163 <div class="col-xs-6">
164 - <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" onclick="OnEnableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/Highlight-bulb.png" alt=""></button> 164 + <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" ng-click="OnEnableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/Highlight-bulb.png" alt=""></button>
165 </div> 165 </div>
166 166
167 <div class="col-xs-6 dropdown hover-tool"> 167 <div class="col-xs-6 dropdown hover-tool">
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html
  View file @84d49e9
1 <div> 1 <div>
2 <div ng-include="aap/widget/MainMenu.html"></div> 2 <div ng-include="aap/widget/MainMenu.html"></div>
3 - <div ng-init="openBodyView()" id="" class="daBodyView" ng-controller="TileViewListController"></div> 3 + <div ng-init="openBodyView()" id="" class="daBodyView" ng-controller="DAController"></div>
4 <!--<div > 4 <!--<div >
5 5
6 </div>--> 6 </div>-->
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
  View file @84d49e9
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <div ng-repeat="(key,val) in moduleLandingData.data.root.Item"> 17 <div ng-repeat="(key,val) in moduleLandingData.data.root.Item">
18 <div id="{{val._Id}}" class="col-sm-3 col-md-3" title="{{val._Title}}" ng-click="openModuleItemView($event)"> 18 <div id="{{val._Id}}" class="col-sm-3 col-md-3" title="{{val._Title}}" ng-click="openModuleItemView($event)">
19 <div class="thumbnail"> 19 <div class="thumbnail">
20 - <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" alt="" title=""> 20 + <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openView($event)" alt="" title="">
21 <div class="caption"><p>{{val._Title}}</p></div> 21 <div class="caption"><p>{{val._Title}}</p></div>
22 </div> 22 </div>
23 </div> 23 </div>