ADAM / AIAHTML5

Commit 1cfc55b510194574ac63cd05954d354cc1732252

Authored by Nikita Kulshreshtha
2 parents 47c50671 0729a1a7

commit after DAHighLightFixes merge

Inline Side-by-side
Showing 14 changed files with 163 additions and 262 deletions
150-DOCUMENTATION/AIA-July-Report.pptx
View file @1cfc55b
No preview for this file type
150-DOCUMENTATION/AIA-June-Report.pptx
View file @1cfc55b
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @1cfc55b
... ... @@ -39,9 +39,7 @@
39 39 </PropertyGroup>
40 40 <ItemGroup>
41 41 <Content Include="app\controllers\3dAController.js" />
42   - <Content Include="app\controllers\abc.js" />
43 42 <Content Include="app\controllers\ADAMImgController.js" />
44   - <Content Include="app\controllers\DAControllerList.js" />
45 43 <Content Include="app\controllers\LinkController.js" />
46 44 <Content Include="app\controllers\AnatTestController.js" />
47 45 <Content Include="app\controllers\AODController.js" />
... ... @@ -77,146 +75,6 @@
77 75 <Content Include="app\views\LabExerc\LabExerc-view.html" />
78 76 <Content Include="app\widget\MainMenu.html" />
79 77 <Content Include="body-view-wp.js" />
80   - <Content Include="content\images\DA\ethnicity\body-views\10\A\navigator_images\da_oi_101.jpg" />
81   - <Content Include="content\images\DA\ethnicity\body-views\10\A\thumbnails\da_tni_3344_A.jpg" />
82   - <Content Include="content\images\DA\ethnicity\body-views\10\B\navigator_images\da_oi_103.jpg" />
83   - <Content Include="content\images\DA\ethnicity\body-views\10\B\thumbnails\da_tni_3344_B.jpg" />
84   - <Content Include="content\images\DA\ethnicity\body-views\10\L\navigator_images\da_oi_105.jpg" />
85   - <Content Include="content\images\DA\ethnicity\body-views\10\L\thumbnails\da_tni_3344_L.jpg" />
86   - <Content Include="content\images\DA\ethnicity\body-views\10\W\navigator_images\da_oi_107.jpg" />
87   - <Content Include="content\images\DA\ethnicity\body-views\10\W\thumbnails\da_tni_3344_W.jpg" />
88   - <Content Include="content\images\DA\ethnicity\body-views\11\A\navigator_images\da_oi_10.jpg" />
89   - <Content Include="content\images\DA\ethnicity\body-views\11\A\navigator_images\da_oi_11.jpg" />
90   - <Content Include="content\images\DA\ethnicity\body-views\11\A\thumbnails\da_tni_3345_AN.jpg" />
91   - <Content Include="content\images\DA\ethnicity\body-views\11\A\thumbnails\da_tni_3345_AY.jpg" />
92   - <Content Include="content\images\DA\ethnicity\body-views\11\B\navigator_images\da_oi_14.jpg" />
93   - <Content Include="content\images\DA\ethnicity\body-views\11\B\navigator_images\da_oi_15.jpg" />
94   - <Content Include="content\images\DA\ethnicity\body-views\11\B\thumbnails\da_tni_3345_BN.jpg" />
95   - <Content Include="content\images\DA\ethnicity\body-views\11\B\thumbnails\da_tni_3345_BY.jpg" />
96   - <Content Include="content\images\DA\ethnicity\body-views\11\L\navigator_images\da_oi_21.jpg" />
97   - <Content Include="content\images\DA\ethnicity\body-views\11\L\navigator_images\da_oi_22.jpg" />
98   - <Content Include="content\images\DA\ethnicity\body-views\11\L\thumbnails\da_tni_3345_LN.jpg" />
99   - <Content Include="content\images\DA\ethnicity\body-views\11\L\thumbnails\da_tni_3345_LY.jpg" />
100   - <Content Include="content\images\DA\ethnicity\body-views\11\W\navigator_images\da_oi_25.jpg" />
101   - <Content Include="content\images\DA\ethnicity\body-views\11\W\navigator_images\da_oi_26.jpg" />
102   - <Content Include="content\images\DA\ethnicity\body-views\11\W\thumbnails\da_tni_3345_WN.jpg" />
103   - <Content Include="content\images\DA\ethnicity\body-views\11\W\thumbnails\da_tni_3345_WY.jpg" />
104   - <Content Include="content\images\DA\ethnicity\body-views\12\A\navigator_images\da_oi_29.jpg" />
105   - <Content Include="content\images\DA\ethnicity\body-views\12\A\thumbnails\da_tni_3346_A.jpg" />
106   - <Content Include="content\images\DA\ethnicity\body-views\12\B\navigator_images\da_oi_31.jpg" />
107   - <Content Include="content\images\DA\ethnicity\body-views\12\B\thumbnails\da_tni_3346_B.jpg" />
108   - <Content Include="content\images\DA\ethnicity\body-views\12\L\navigator_images\da_oi_33.jpg" />
109   - <Content Include="content\images\DA\ethnicity\body-views\12\L\thumbnails\da_tni_3346_L.jpg" />
110   - <Content Include="content\images\DA\ethnicity\body-views\12\W\navigator_images\da_oi_35.jpg" />
111   - <Content Include="content\images\DA\ethnicity\body-views\12\W\thumbnails\da_tni_3346_W.jpg" />
112   - <Content Include="content\images\DA\ethnicity\body-views\1\A\navigator_images\da_oi_81.jpg" />
113   - <Content Include="content\images\DA\ethnicity\body-views\1\A\navigator_images\da_oi_82.jpg" />
114   - <Content Include="content\images\DA\ethnicity\body-views\1\A\thumbnails\da_tni_3335_AN.jpg" />
115   - <Content Include="content\images\DA\ethnicity\body-views\1\A\thumbnails\da_tni_3335_AY.jpg" />
116   - <Content Include="content\images\DA\ethnicity\body-views\1\B\navigator_images\da_oi_85.jpg" />
117   - <Content Include="content\images\DA\ethnicity\body-views\1\B\navigator_images\da_oi_86.jpg" />
118   - <Content Include="content\images\DA\ethnicity\body-views\1\B\thumbnails\da_tni_3335_BN.jpg" />
119   - <Content Include="content\images\DA\ethnicity\body-views\1\B\thumbnails\da_tni_3335_BY.jpg" />
120   - <Content Include="content\images\DA\ethnicity\body-views\1\L\navigator_images\da_oi_89.jpg" />
121   - <Content Include="content\images\DA\ethnicity\body-views\1\L\navigator_images\da_oi_94.jpg" />
122   - <Content Include="content\images\DA\ethnicity\body-views\1\L\thumbnails\da_tni_3335_LN.jpg" />
123   - <Content Include="content\images\DA\ethnicity\body-views\1\L\thumbnails\da_tni_3335_LY.jpg" />
124   - <Content Include="content\images\DA\ethnicity\body-views\1\W\navigator_images\da_oi_109.jpg" />
125   - <Content Include="content\images\DA\ethnicity\body-views\1\W\navigator_images\da_oi_110.jpg" />
126   - <Content Include="content\images\DA\ethnicity\body-views\1\W\thumbnails\da_tni_3335_WN.jpg" />
127   - <Content Include="content\images\DA\ethnicity\body-views\1\W\thumbnails\da_tni_3335_WY.jpg" />
128   - <Content Include="content\images\DA\ethnicity\body-views\2\A\navigator_images\da_oi_113.jpg" />
129   - <Content Include="content\images\DA\ethnicity\body-views\2\A\thumbnails\da_tni_3336_A.jpg" />
130   - <Content Include="content\images\DA\ethnicity\body-views\2\B\navigator_images\da_oi_115.jpg" />
131   - <Content Include="content\images\DA\ethnicity\body-views\2\B\thumbnails\da_tni_3336_B.jpg" />
132   - <Content Include="content\images\DA\ethnicity\body-views\2\L\navigator_images\da_oi_117.jpg" />
133   - <Content Include="content\images\DA\ethnicity\body-views\2\L\thumbnails\da_tni_3336_L.jpg" />
134   - <Content Include="content\images\DA\ethnicity\body-views\2\W\navigator_images\da_oi_119.jpg" />
135   - <Content Include="content\images\DA\ethnicity\body-views\2\W\thumbnails\da_tni_3336_W.jpg" />
136   - <Content Include="content\images\DA\ethnicity\body-views\3\A\navigator_images\da_oi_121.jpg" />
137   - <Content Include="content\images\DA\ethnicity\body-views\3\A\thumbnails\da_tni_3337_AN.jpg" />
138   - <Content Include="content\images\DA\ethnicity\body-views\3\A\thumbnails\da_tni_3337_AY.jpg" />
139   - <Content Include="content\images\DA\ethnicity\body-views\3\B\navigator_images\da_oi_123.jpg" />
140   - <Content Include="content\images\DA\ethnicity\body-views\3\B\thumbnails\da_tni_3337_BN.jpg" />
141   - <Content Include="content\images\DA\ethnicity\body-views\3\B\thumbnails\da_tni_3337_BY.jpg" />
142   - <Content Include="content\images\DA\ethnicity\body-views\3\L\navigator_images\da_oi_125.jpg" />
143   - <Content Include="content\images\DA\ethnicity\body-views\3\L\thumbnails\da_tni_3337_LN.jpg" />
144   - <Content Include="content\images\DA\ethnicity\body-views\3\L\thumbnails\da_tni_3337_LY.jpg" />
145   - <Content Include="content\images\DA\ethnicity\body-views\3\W\navigator_images\da_oi_127.jpg" />
146   - <Content Include="content\images\DA\ethnicity\body-views\3\W\thumbnails\da_tni_3337_WN.jpg" />
147   - <Content Include="content\images\DA\ethnicity\body-views\3\W\thumbnails\da_tni_3337_WY.jpg" />
148   - <Content Include="content\images\DA\ethnicity\body-views\4\A\navigator_images\da_oi_129.jpg" />
149   - <Content Include="content\images\DA\ethnicity\body-views\4\A\thumbnails\da_tni_3338_A.jpg" />
150   - <Content Include="content\images\DA\ethnicity\body-views\4\B\navigator_images\da_oi_131.jpg" />
151   - <Content Include="content\images\DA\ethnicity\body-views\4\B\thumbnails\da_tni_3338_B.jpg" />
152   - <Content Include="content\images\DA\ethnicity\body-views\4\L\navigator_images\da_oi_133.jpg" />
153   - <Content Include="content\images\DA\ethnicity\body-views\4\L\thumbnails\da_tni_3338_L.jpg" />
154   - <Content Include="content\images\DA\ethnicity\body-views\4\W\navigator_images\da_oi_135.jpg" />
155   - <Content Include="content\images\DA\ethnicity\body-views\4\W\thumbnails\da_tni_3338_W.jpg" />
156   - <Content Include="content\images\DA\ethnicity\body-views\5\A\navigator_images\da_oi_1.jpg" />
157   - <Content Include="content\images\DA\ethnicity\body-views\5\A\navigator_images\da_oi_2.jpg" />
158   - <Content Include="content\images\DA\ethnicity\body-views\5\A\thumbnails\da_tni_3339_AN.jpg" />
159   - <Content Include="content\images\DA\ethnicity\body-views\5\A\thumbnails\da_tni_3339_AY.jpg" />
160   - <Content Include="content\images\DA\ethnicity\body-views\5\B\navigator_images\da_oi_5.jpg" />
161   - <Content Include="content\images\DA\ethnicity\body-views\5\B\navigator_images\da_oi_6.jpg" />
162   - <Content Include="content\images\DA\ethnicity\body-views\5\B\thumbnails\da_tni_3339_BN.jpg" />
163   - <Content Include="content\images\DA\ethnicity\body-views\5\B\thumbnails\da_tni_3339_BY.jpg" />
164   - <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_18.jpg" />
165   - <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_9.jpg" />
166   - <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LN.jpg" />
167   - <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LY.jpg" />
168   - <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37_WN.jpg" />
169   - <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38_WY.jpg" />
170   - <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WN.jpg" />
171   - <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WY.jpg" />
172   - <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_41.jpg" />
173   - <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_42.jpg" />
174   - <Content Include="content\images\DA\ethnicity\body-views\6\A\thumbnails\da_tni_3340_AN.jpg" />
175   - <Content Include="content\images\DA\ethnicity\body-views\6\A\thumbnails\da_tni_3340_AY.jpg" />
176   - <Content Include="content\images\DA\ethnicity\body-views\6\B\navigator_images\da_oi_45.jpg" />
177   - <Content Include="content\images\DA\ethnicity\body-views\6\B\navigator_images\da_oi_46.jpg" />
178   - <Content Include="content\images\DA\ethnicity\body-views\6\B\thumbnails\da_tni_3340_BN.jpg" />
179   - <Content Include="content\images\DA\ethnicity\body-views\6\B\thumbnails\da_tni_3340_BY.jpg" />
180   - <Content Include="content\images\DA\ethnicity\body-views\6\L\navigator_images\da_oi_49.jpg" />
181   - <Content Include="content\images\DA\ethnicity\body-views\6\L\navigator_images\da_oi_50.jpg" />
182   - <Content Include="content\images\DA\ethnicity\body-views\6\L\thumbnails\da_tni_3340_LN.jpg" />
183   - <Content Include="content\images\DA\ethnicity\body-views\6\L\thumbnails\da_tni_3340_LY.jpg" />
184   - <Content Include="content\images\DA\ethnicity\body-views\6\W\navigator_images\da_oi_53.jpg" />
185   - <Content Include="content\images\DA\ethnicity\body-views\6\W\navigator_images\da_oi_54.jpg" />
186   - <Content Include="content\images\DA\ethnicity\body-views\6\W\thumbnails\da_tni_3340_WN.jpg" />
187   - <Content Include="content\images\DA\ethnicity\body-views\6\W\thumbnails\da_tni_3340_WY.jpg" />
188   - <Content Include="content\images\DA\ethnicity\body-views\7\A\navigator_images\da_oi_57.jpg" />
189   - <Content Include="content\images\DA\ethnicity\body-views\7\A\navigator_images\da_oi_58.jpg" />
190   - <Content Include="content\images\DA\ethnicity\body-views\7\A\thumbnails\da_tni_3341_AN.jpg" />
191   - <Content Include="content\images\DA\ethnicity\body-views\7\A\thumbnails\da_tni_3341_AY.jpg" />
192   - <Content Include="content\images\DA\ethnicity\body-views\7\B\navigator_images\da_oi_61.jpg" />
193   - <Content Include="content\images\DA\ethnicity\body-views\7\B\navigator_images\da_oi_62.jpg" />
194   - <Content Include="content\images\DA\ethnicity\body-views\7\B\thumbnails\da_tni_3341_BN.jpg" />
195   - <Content Include="content\images\DA\ethnicity\body-views\7\B\thumbnails\da_tni_3341_BY.jpg" />
196   - <Content Include="content\images\DA\ethnicity\body-views\7\L\navigator_images\da_oi_65.jpg" />
197   - <Content Include="content\images\DA\ethnicity\body-views\7\L\navigator_images\da_oi_66.jpg" />
198   - <Content Include="content\images\DA\ethnicity\body-views\7\L\thumbnails\da_tni_3341_LN.jpg" />
199   - <Content Include="content\images\DA\ethnicity\body-views\7\L\thumbnails\da_tni_3341_LY.jpg" />
200   - <Content Include="content\images\DA\ethnicity\body-views\7\W\navigator_images\da_oi_69.jpg" />
201   - <Content Include="content\images\DA\ethnicity\body-views\7\W\navigator_images\da_oi_70.jpg" />
202   - <Content Include="content\images\DA\ethnicity\body-views\7\W\thumbnails\da_tni_3341_WN.jpg" />
203   - <Content Include="content\images\DA\ethnicity\body-views\7\W\thumbnails\da_tni_3341_WY.jpg" />
204   - <Content Include="content\images\DA\ethnicity\body-views\8\A\navigator_images\da_oi_73.jpg" />
205   - <Content Include="content\images\DA\ethnicity\body-views\8\A\thumbnails\da_tni_3342_A.jpg" />
206   - <Content Include="content\images\DA\ethnicity\body-views\8\B\navigator_images\da_oi_75.jpg" />
207   - <Content Include="content\images\DA\ethnicity\body-views\8\B\thumbnails\da_tni_3342_B.jpg" />
208   - <Content Include="content\images\DA\ethnicity\body-views\8\L\navigator_images\da_oi_77.jpg" />
209   - <Content Include="content\images\DA\ethnicity\body-views\8\L\thumbnails\da_tni_3342_L.jpg" />
210   - <Content Include="content\images\DA\ethnicity\body-views\8\W\navigator_images\da_oi_79.jpg" />
211   - <Content Include="content\images\DA\ethnicity\body-views\8\W\thumbnails\da_tni_3342_w.jpg" />
212   - <Content Include="content\images\DA\ethnicity\body-views\9\A\navigator_images\da_oi_90.jpg" />
213   - <Content Include="content\images\DA\ethnicity\body-views\9\A\thumbnails\da_tni_3343_A.jpg" />
214   - <Content Include="content\images\DA\ethnicity\body-views\9\B\navigator_images\da_oi_92.jpg" />
215   - <Content Include="content\images\DA\ethnicity\body-views\9\B\thumbnails\da_tni_3343_B.jpg" />
216   - <Content Include="content\images\DA\ethnicity\body-views\9\L\navigator_images\da_oi_97.jpg" />
217   - <Content Include="content\images\DA\ethnicity\body-views\9\L\thumbnails\da_tni_3343_L.jpg" />
218   - <Content Include="content\images\DA\ethnicity\body-views\9\W\navigator_images\da_oi_99.jpg" />
219   - <Content Include="content\images\DA\ethnicity\body-views\9\W\thumbnails\da_tni_3343_W.jpg" />
220 78 <Content Include="content\css\main.css" />
221 79 <Content Include="content\data\json\da\body-views\1\da_dat_tm_sg_1.json" />
222 80 <Content Include="content\data\json\da\body-views\10\da_dat_body_system_term_10.json" />
... ... @@ -363,8 +221,8 @@
363 221 <Content Include="content\images\DA\ethnicity\body-views\5\L\navigator_images\da_oi_9.jpg" />
364 222 <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LN.jpg" />
365 223 <Content Include="content\images\DA\ethnicity\body-views\5\L\thumbnails\da_tni_3339_LY.jpg" />
366   - <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37_WN.jpg" />
367   - <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38_WY.jpg" />
  224 + <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_37.jpg" />
  225 + <Content Include="content\images\DA\ethnicity\body-views\5\W\navigator_images\da_oi_38.jpg" />
368 226 <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WN.jpg" />
369 227 <Content Include="content\images\DA\ethnicity\body-views\5\W\thumbnails\da_tni_3339_WY.jpg" />
370 228 <Content Include="content\images\DA\ethnicity\body-views\6\A\navigator_images\da_oi_41.jpg" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @1cfc55b
... ... @@ -686,7 +686,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
686 686  
687 687 //1.Get image source
688 688 var src = $scope.GetImageSource(value._BodyRegionId);
689   -
  689 +
690 690 $scope.imageSource = src;
691 691 // debugger;
692 692  
... ... @@ -993,45 +993,45 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
993 993  
994 994 var SelectedLayerData = [];
995 995 SelectedLayerData = $rootScope.BodyLayerData.Layers.DataLayer[dataLength - $scope.userInput - 1];
996   - if((SelectedLayerData!=null || SelectedLayerData!=undefined) && SelectedLayerData.BodyRegion.length>0){
997   - if ($scope.layerNumber == 0) {
998   - for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) {
  996 + if ((SelectedLayerData != null || SelectedLayerData != undefined) && SelectedLayerData.BodyRegion.length > 0) {
  997 + if ($scope.layerNumber == 0) {
  998 + for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) {
999 999  
1000   - var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
1001   - var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone;
  1000 + var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
  1001 + var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone;
1002 1002  
1003   - if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
  1003 + if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) {
1004 1004  
1005   - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  1005 + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  1006 + }
1006 1007 }
1007 1008 }
1008   - }
1009 1009  
1010   - else {
1011   - // debugger;
1012   - //below 4 bodyviews have only single body region
1013   - if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) {
1014   - var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
  1010 + else {
  1011 + // debugger;
  1012 + //below 4 bodyviews have only single body region
  1013 + if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) {
  1014 + var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId;
1015 1015  
1016   - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
  1016 + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName;
1017 1017  
1018   - }
1019   - else // it is for other body view which have multiple body regions and layer no > 0
1020   - {
1021   - // debugger;
1022   - for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
1023   - var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
1024   - if (bodyRegion == bodyRegionId) {
  1018 + }
  1019 + else // it is for other body view which have multiple body regions and layer no > 0
  1020 + {
  1021 + // debugger;
  1022 + for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) {
  1023 + var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId;
  1024 + if (bodyRegion == bodyRegionId) {
1025 1025  
1026   - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
  1026 + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName;
1027 1027  
1028 1028  
  1029 + }
1029 1030 }
1030 1031 }
1031 1032 }
1032 1033 }
1033 1034 }
1034   - }
1035 1035  
1036 1036 $scope.GetBackgroundImgSource = function (bodyRegionId) {
1037 1037 // debugger;
... ... @@ -4326,36 +4326,74 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4326 4326  
4327 4327 $scope.flushCanvas = function () {
4328 4328  
4329   - if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) {
4330   - angular.forEach($scope.ColoredImageSRC, function (value, key) {
  4329 + //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) {
  4330 + // angular.forEach($scope.ColoredImageSRC, function (value, key) {
  4331 +
  4332 + // var id;
  4333 + // var maskId;
  4334 + // if (value.haveMirror == 'true') {
  4335 + // id = 'imageCanvas' + value.bodyRegionId + '_MR';
  4336 + // maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci'
  4337 + // }
  4338 + // else {
  4339 + // id = 'imageCanvas' + value.bodyRegionId;
  4340 + // maskId = 'imageCanvas' + value.bodyRegionId + '_mci';
  4341 + // }
  4342 +
  4343 + // var canvas = document.getElementById(id);
  4344 + // if (canvas != null || canvas != undefined) {
  4345 + // document.getElementById('canvasDiv').removeChild(canvas);
  4346 + // }
  4347 +
  4348 + // var maskcanvas = document.getElementById(maskId);
  4349 + // if (maskcanvas != null || maskcanvas != undefined) {
  4350 + // document.getElementById('canvasDiv').removeChild(maskcanvas);
  4351 +
  4352 + // }
  4353 +
  4354 + // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
  4355 + // for (var i = 0; i < modestyCanvases.length; i++) {
  4356 + // modestyCanvases[i].remove();
  4357 + // }
  4358 + // });
  4359 + //}
4331 4360  
4332   - var id;
4333   - var maskId;
4334   - if (value.haveMirror == 'true') {
4335   - id = 'imageCanvas' + value.bodyRegionId + '_MR';
4336   - maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci'
4337   - }
4338   - else {
4339   - id = 'imageCanvas' + value.bodyRegionId;
4340   - maskId = 'imageCanvas' + value.bodyRegionId + '_mci';
4341   - }
  4361 + for (var i = 1; i < 7; i++) {
  4362 +
  4363 + var id;
  4364 + var maskId;
  4365 +
  4366 + id = 'imageCanvas' + i;
  4367 + maskId = 'imageCanvas' + i + '_mci';
  4368 +
  4369 + var canvas = document.getElementById(id);
  4370 + if (canvas != null || canvas!=undefined)
  4371 + document.getElementById('canvasDiv').removeChild(canvas);
  4372 +
  4373 + var maskcanvas = document.getElementById(maskId);
  4374 + if (maskcanvas != null || maskcanvas != undefined)
  4375 + document.getElementById('canvasDiv').removeChild(maskcanvas);
  4376 +
  4377 + if (i == 4 || i == 5 || i == 6) {
  4378 + id = 'imageCanvas' + i + '_MR';
  4379 + maskId = 'imageCanvas' + i + '_MR_mci';
4342 4380  
4343 4381 var canvas = document.getElementById(id);
4344   - if (canvas != null || canvas != undefined) {
4345   - document.getElementById('canvasDiv').removeChild(canvas);
4346   - }
  4382 + if (canvas != null || canvas != undefined)
  4383 + document.getElementById('canvasDiv').removeChild(canvas);
4347 4384  
4348 4385 var maskcanvas = document.getElementById(maskId);
4349   - if (maskcanvas != null || maskcanvas != undefined) {
4350   - document.getElementById('canvasDiv').removeChild(maskcanvas);
4351   -
4352   - }
  4386 + if (maskcanvas != null || maskcanvas != undefined)
  4387 + document.getElementById('canvasDiv').removeChild(maskcanvas);
  4388 + }
4353 4389  
4354   - var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
4355   - for (var i = 0; i < modestyCanvases.length; i++) {
4356   - modestyCanvases[i].remove();
  4390 + //remove modesty canavs
  4391 + var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
  4392 + if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) {
  4393 + for (var j = 0; j < modestyCanvases.length; j++) {
  4394 + modestyCanvases[j].remove();
4357 4395 }
4358   - });
  4396 + }
4359 4397 }
4360 4398 }
4361 4399  
... ... @@ -5564,37 +5602,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5564 5602 $('#layerChangeSlider').slider("option", "value", parseInt($scope.totalLayers) - parseInt($scope.layerNumber));
5565 5603  
5566 5604 //8.remove current layer canavses
5567   - for (var i = 1; i < 7; i++) {
  5605 + $scope.flushCanvas();
  5606 + //for (var i = 1; i < 7; i++) {
5568 5607  
5569   - var id;
5570   - var maskId;
  5608 + // var id;
  5609 + // var maskId;
5571 5610  
5572   - id = 'imageCanvas' + i;
5573   - maskId = 'imageCanvas' + i + '_mci';
  5611 + // id = 'imageCanvas' + i;
  5612 + // maskId = 'imageCanvas' + i + '_mci';
5574 5613  
5575   - var canvas = document.getElementById(id);
5576   - document.getElementById('canvasDiv').removeChild(canvas);
  5614 + // var canvas = document.getElementById(id);
  5615 + // document.getElementById('canvasDiv').removeChild(canvas);
5577 5616  
5578   - var maskcanvas = document.getElementById(maskId);
5579   - document.getElementById('canvasDiv').removeChild(maskcanvas);
  5617 + // var maskcanvas = document.getElementById(maskId);
  5618 + // document.getElementById('canvasDiv').removeChild(maskcanvas);
5580 5619  
5581   - if (i == 4 || i == 5 || i == 6) {
5582   - id = 'imageCanvas' + i + '_MR';
5583   - maskId = 'imageCanvas' + i + '_MR_mci';
  5620 + // if (i == 4 || i == 5 || i == 6) {
  5621 + // id = 'imageCanvas' + i + '_MR';
  5622 + // maskId = 'imageCanvas' + i + '_MR_mci';
5584 5623  
5585   - var canvas = document.getElementById(id);
5586   - document.getElementById('canvasDiv').removeChild(canvas);
  5624 + // var canvas = document.getElementById(id);
  5625 + // document.getElementById('canvasDiv').removeChild(canvas);
5587 5626  
5588   - var maskcanvas = document.getElementById(maskId);
5589   - document.getElementById('canvasDiv').removeChild(maskcanvas);
5590   - }
  5627 + // var maskcanvas = document.getElementById(maskId);
  5628 + // document.getElementById('canvasDiv').removeChild(maskcanvas);
  5629 + // }
5591 5630  
5592   - //remove modesty canavs
5593   - var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
5594   - for (var j = 0; j < modestyCanvases.length; j++) {
5595   - modestyCanvases[j].remove();
5596   - }
5597   - }
  5631 + // //remove modesty canavs
  5632 + // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
  5633 + // for (var j = 0; j < modestyCanvases.length; j++) {
  5634 + // modestyCanvases[j].remove();
  5635 + // }
  5636 + //}
5598 5637  
5599 5638 //9.
5600 5639 $timeout(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @1cfc55b
... ... @@ -49,7 +49,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
49 49  
50 50 //called on jsanel minimize
51 51 $rootScope.setState = function (state, title) {
52   - debugger;
53 52  
54 53  
55 54 var alreadyOpenThisView = new jinqJs()
... ... @@ -60,7 +59,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
60 59 if (alreadyOpenThisView != null) {
61 60 for (var i = 0; i < $rootScope.openViews.length; i++) {
62 61 k++;
63   - if ($rootScope.openViews[i].body - views == title) {
  62 + if ($rootScope.openViews[i].body-views == title) {
64 63 $rootScope.openViews.splice((k - 1), 1);
65 64  
66 65 $rootScope.openViews.push(
... ... @@ -98,8 +97,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
98 97 //annotation tool custom events
99 98 $rootScope.ShowAnnotationWindow = function () {
100 99 $rootScope.isAnnotationWindowOpen = true;
101   - $(".annotationTollbar").css("display", "block");
102   - $rootScope.$broadcast('annotationToolEvent',true);
  100 + // $(".annotationTollbar").css("display", "block");
  101 + // $rootScope.$broadcast('annotationToolEvent',true);
103 102  
104 103 }
105 104  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @1cfc55b
... ... @@ -123,22 +123,22 @@
123 123 </div>
124 124 <div class="col-sm-6 dropdown hover-tool">
125 125 <div class="custom-tooltip">Highlight Options</div>
126   - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button>
  126 + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()" ><img src="content/images/icon-highlight.png" alt="" title=""></button>
127 127 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
128 128 <li><a href="#" title="Current Structure">Current Structure</a></li>
129 129 <li role="separator" class="divider"></li>
130 130 <li><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodysystem($event)">Cardiovascular</a></li>
131   - <li><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)">Digestive</a></li>
132   - <li><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)">Endocrine</a></li>
133   - <li><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)">Immune</a></li>
134   - <li><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)">Integumentary</a></li>
135   - <li><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)">Lymphatic</a></li>
136   - <li><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)">Muscular</a></li>
137   - <li><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)">Nervous</a></li>
138   - <li><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)">Reproductive</a></li>
139   - <li><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)">Respiratory</a></li>
140   - <li><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)">Skeletal</a></li>
141   - <li><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li>
  131 + <li><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)" >Digestive</a></li>
  132 + <li><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)" >Endocrine</a></li>
  133 + <li><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)" >Immune</a></li>
  134 + <li><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)" >Integumentary</a></li>
  135 + <li><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)" >Lymphatic</a></li>
  136 + <li><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)" >Muscular</a></li>
  137 + <li><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)" >Nervous</a></li>
  138 + <li><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)" >Reproductive</a></li>
  139 + <li><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)" >Respiratory</a></li>
  140 + <li><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)" >Skeletal</a></li>
  141 + <li><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)" >Urinary</a></li>
142 142 </ul>
143 143 </div>
144 144 <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
... ... @@ -167,7 +167,7 @@
167 167 </div>
168 168 <div class="">
169 169 <p>
170   - <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()">
  170 + <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" />
171 171 </p>
172 172 <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
173 173 </div>
... ... @@ -179,8 +179,8 @@
179 179 <div class="">
180 180 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
181 181  
182   - <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-init="HideSearch()" ng-focus="ShowSearch()" ng-blur="HideSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
183   -
  182 + <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
  183 +
184 184 <div id="backdrop" ng-show="IsSearchVisible">
185 185 <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
186 186 <ul id="termlistfilter" class="form-control dropdown-menu" style="height:100px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
... ... @@ -208,8 +208,8 @@
208 208 <i class="fa fa-male"></i>
209 209 </button>
210 210  
211   - <div class="dropdown-menu active" style="min-height:119px;min-width:auto;">
212   - <div id="containment-wrapper" align="center" style="min-width:auto;height:119px;">
  211 + <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
  212 + <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
213 213 <img id="navimg" src="{{navimgsrc}}" alt=""></img>
214 214 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
215 215 </div>
... ... @@ -346,6 +346,8 @@
346 346 })
347 347 </script>
348 348 });-->
  349 +
  350 +<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
349 351 <script>
350 352 $(function () {
351 353 $("#transparencyScale").draggable();
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @1cfc55b
... ... @@ -68,41 +68,42 @@
68 68 $('[data-toggle="tooltip"]').tooltip();
69 69 })
70 70  
71   -
72   - if (window.location.pathname == "/AIA/da-view-list") {
  71 + var appPath = window.location.pathname.split("/")[1];
  72 + if (window.location.pathname == "/" + appPath + "/da-view-list") {
73 73  
74 74 $(".nav-sidebar li a").removeClass('active');
75 75 $(".nav-sidebar li:first-child a").addClass('active');
76 76  
77 77 }
78   - else if (window.location.pathname == "/AIA/3dAnatomy") {
  78 +
  79 + else if (window.location.pathname == "/" + appPath + "/3dAnatomy") {
79 80  
80 81 $(".nav-sidebar li a").removeClass('active');
81 82 $(".nav-sidebar li:nth-child(2) a").addClass('active');
82 83  
83 84 }
84   - else if (window.location.pathname == "/AIA/clinical-illustrations") {
  85 + else if (window.location.pathname == "/" + appPath + "/clinical-illustrations") {
85 86  
86 87 $(".nav-sidebar li a").removeClass('active');
87 88 $(".nav-sidebar li:nth-child(3) a").addClass('active');
88 89  
89 90  
90 91 }
91   - else if (window.location.pathname == "/AIA/clinical-animations") {
  92 + else if (window.location.pathname == "/" + appPath + "/clinical-animations") {
92 93  
93 94 $(".nav-sidebar li a").removeClass('active');
94 95 $(".nav-sidebar li:nth-child(4) a").addClass('active');
95 96  
96 97  
97 98 }
98   - else if (window.location.pathname == "/AIA/Link/encyclopedia") {
  99 + else if (window.location.pathname == "/" + appPath + "/Link/encyclopedia") {
99 100  
100 101 $(".nav-sidebar li a").removeClass('active');
101 102 $(".nav-sidebar li:nth-child(5) a").addClass('active');
102 103  
103 104  
104 105 }
105   - else if (window.location.pathname == "/AIA/curriculum-builder") {
  106 + else if (window.location.pathname == "/" + appPath + "/curriculum-builder") {
106 107  
107 108 $(".nav-sidebar li a").removeClass('active');
108 109 $(".nav-sidebar li:nth-child(6) a").addClass('active');
... ... @@ -110,7 +111,7 @@
110 111  
111 112 }
112 113  
113   - else if (window.location.pathname == "/AIA/anatomy-test") {
  114 + else if (window.location.pathname == "/" + appPath + "/anatomy-test") {
114 115  
115 116 $(".nav-sidebar li a").removeClass('active');
116 117 $(".nav-sidebar li:nth-child(7) a").addClass('active');
... ... @@ -118,56 +119,56 @@
118 119  
119 120 }
120 121  
121   - else if (window.location.pathname == "/AIA/Link/IP-10") {
  122 + else if (window.location.pathname == "/" + appPath + "/Link/IP-10") {
122 123  
123 124 $(".nav-sidebar li a").removeClass('active');
124 125 $(".nav-sidebar li:nth-child(8) a").addClass('active');
125 126  
126 127 }
127   - else if (window.location.pathname == "/AIA/lab-exercises") {
  128 + else if (window.location.pathname == "/" + appPath + "/lab-exercises") {
128 129  
129 130 $(".nav-sidebar li a").removeClass('active');
130 131 $(".nav-sidebar li:nth-child(9) a").addClass('active');
131 132  
132 133 }
133   - else if (window.location.pathname == "/AIA/Link/indepth-reports") {
  134 + else if (window.location.pathname == "/" + appPath + "/Link/indepth-reports") {
134 135  
135 136 $(".nav-sidebar li a").removeClass('active');
136 137 $(".nav-sidebar li:nth-child(10) a").addClass('active');
137 138  
138 139 }
139   - else if (window.location.pathname == "/AIA/Link/complementary-and-alternate-medicine") {
  140 + else if (window.location.pathname == "/" + appPath + "/Link/complementary-and-alternate-medicine") {
140 141  
141 142 $(".nav-sidebar li a").removeClass('active');
142 143 $(".nav-sidebar li:nth-child(11) a").addClass('active');
143 144  
144 145 }
145   - else if (window.location.pathname == "/AIA/ADAM-Images") {
  146 + else if (window.location.pathname == "/" + appPath + "/ADAM-Images") {
146 147  
147 148 $(".nav-sidebar li a").removeClass('active');
148 149 $(".nav-sidebar li:nth-child(12) a").addClass('active');
149 150  
150 151 }
151 152  
152   - else if (window.location.pathname == "/AIA/Link/bodyguide") {
  153 + else if (window.location.pathname == "/" + appPath + "/Link/bodyguide") {
153 154  
154 155 $(".nav-sidebar li a").removeClass('active');
155 156 $(".nav-sidebar li:nth-child(13) a").addClass('active');
156 157  
157 158 }
158   - else if (window.location.pathname == "/AIA/Link/symptom-navigator") {
  159 + else if (window.location.pathname == "/" + appPath + "/Link/symptom-navigator") {
159 160  
160 161 $(".nav-sidebar li a").removeClass('active');
161 162 $(".nav-sidebar li:nth-child(14) a").addClass('active');
162 163  
163 164 }
164   - else if (window.location.pathname == "/AIA/Link/wellness-tools") {
  165 + else if (window.location.pathname == "/" + appPath + "/Link/wellness-tools") {
165 166  
166 167 $(".nav-sidebar li a").removeClass('active');
167 168 $(".nav-sidebar li:nth-child(15) a").addClass('active');
168 169  
169 170 }
170   - else if (window.location.pathname == "/AIA/ADAM-on-demand") {
  171 + else if (window.location.pathname == "/"+ appPath + "/ADAM-on-demand") {
171 172  
172 173 $(".nav-sidebar li a").removeClass('active');
173 174 $(".nav-sidebar li:nth-child(16) a").addClass('active');
... ...
400-SOURCECODE/AIAHTML5.Web/body-view-wp.js
  View file @1cfc55b
... ... @@ -2,18 +2,20 @@
2 2 var bodyLayerData;
3 3 var bodyArtData;
4 4  
5   -loadBodyViewData = function (currentBodyViewId) {
  5 +loadBodyViewData = function (currentBodyViewId)
  6 +{
6 7 //1.
7 8 var bodyRegionjsonPath = '~/../content/data/json/da/da_dat_brview.json';
8 9  
9   -
  10 +
10 11  
11 12 var req = new XMLHttpRequest();
12 13 req.open("GET", bodyRegionjsonPath, true);
13 14 req.setRequestHeader("Content-type", "application/json");
14 15  
15 16 req.onreadystatechange = function () {
16   - if (req.readyState == 4 && req.status == 200) {
  17 + if (req.readyState == 4 && req.status == 200)
  18 + {
17 19 bodyRegionData = JSON.parse(req.responseText);
18 20  
19 21 console.log("bodyRegionData returned: " + bodyRegionData);
... ... @@ -30,8 +32,8 @@ loadLayerDataForCurrentBodyView = function (currentBodyViewId) {
30 32 //1.
31 33 var bgArtJsonPath = '';
32 34 var CommonViewId = 0;
33   -
34   -
  35 +
  36 +
35 37 //2.
36 38 var layerJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json';
37 39  
... ... @@ -53,7 +55,7 @@ loadLayerDataForCurrentBodyView = function (currentBodyViewId) {
53 55 }
54 56  
55 57 loadBodyArtData = function () {
56   -
  58 +
57 59 var bgArtJsonPath = '';
58 60  
59 61  
... ... @@ -81,7 +83,7 @@ loadBodyArtData = function () {
81 83 };
82 84  
83 85 self.onmessage = function (e) {
84   -
  86 +
85 87 loadBodyViewData(e.data.currentViewId);
86 88  
87 89 }
88 90 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/W/navigator_images/da_oi_37_WN.jpg renamed to 400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/W/navigator_images/da_oi_37.jpg
View file @1cfc55b

4.15 KB
400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/W/navigator_images/da_oi_38_WY.jpg renamed to 400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/5/W/navigator_images/da_oi_38.jpg
View file @1cfc55b

4.28 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/5/W/navigator_images/da_oi_37_WN.jpg deleted
View file @47c5067

4.15 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/5/W/navigator_images/da_oi_38_WY.jpg deleted
View file @47c5067

4.28 KB
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @1cfc55b
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <base href="/AIAHTML5/" />
  4 + <base href="/AIA/" />
5 5 <meta charset="utf-8">
6 6 <meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
... ... @@ -434,7 +434,7 @@
434 434 <script src="app/controllers/LinkController.js"></script>
435 435 <script src="app/services/DataService.js"></script>
436 436 <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
437   -
  437 +
438 438  
439 439 <script>
440 440 $(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/term-number-wp.js
  View file @1cfc55b
... ... @@ -3,7 +3,7 @@ var doneBRID = [];
3 3 var abc = 'hello';
4 4 previousGrayImageDataList = [];
5 5 getLocationForMatchedTermsInWholeBody = function (termList, maskCanvasData, coloredImageData, grayImageData, bodyRegionId, canvasId) {
6   - console.log('for bodyRegionId: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
  6 + console.log('for bodyRegionId in worker process: ' + bodyRegionId + ', time: ' + new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1"))
7 7 console.log(grayImageData);
8 8 var matchedRGBLocationInBodyRegion = [];
9 9 var matched;
... ...