Commit 43203ab4a5be9c5945ebd5442597ecb0df387ba1

Authored by unknown
1 parent ad26f250

Annotation Tool Bar Code

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -852,6 +852,26 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
852 852 $rootScope.switchToTransparencycanvas();
853 853 }
854 854  
  855 +
  856 + if ($location.url() == "/module-item-view") {
  857 +
  858 + var a = $("#canvas").css("z-index");
  859 + var b = $("#canvasPaint").css("z-index");
  860 +
  861 + if (parseInt(a) < parseInt(b)) {
  862 + b = parseInt(b) + 1;
  863 + $("#aaDetailViewCanvas").css("z-index", b);
  864 +
  865 + }
  866 + else
  867 + {
  868 + a = parseInt(a) + 1;
  869 + $("#aaDetailViewCanvas").css("z-index", a);
  870 + }
  871 +
  872 + }
  873 +
  874 +
855 875 }
856 876  
857 877 $rootScope.CloseAnnotationTool = function () {
... ... @@ -908,7 +928,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
908 928  
909 929 $rootScope.switchToTransparencycanvas();
910 930 }
  931 + if ($location.url() == "/module-item-view") {
  932 +
  933 + var a = $("#canvas").css("z-index");
  934 + var b = $("#canvasPaint").css("z-index");
  935 +
  936 + if (parseInt(a) < parseInt(b)) {
  937 + b = parseInt(b) + 1;
  938 + $("#aaDetailViewCanvas").css("z-index", b);
  939 +
  940 + }
  941 + else {
  942 + a = parseInt(a) + 1;
  943 + $("#aaDetailViewCanvas").css("z-index", a);
  944 + }
911 945  
  946 + }
912 947 }
913 948  
914 949 $rootScope.switchToTransparencycanvas = function () {
... ... @@ -999,6 +1034,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
999 1034 $("#annotationpaintbrushsize").removeClass("activebtncolor");
1000 1035 $("#annotationpainteraser").removeClass("activebtncolor");
1001 1036 $rootScope.isEraseToolSelected = false;
  1037 +
  1038 + if ($location.url() == "/module-item-view") {
  1039 +
  1040 + $rootScope.switchToAACanvas();
  1041 +
  1042 + }
  1043 +
1002 1044 }
1003 1045  
1004 1046 // Dissectible Anatomy > Settings should be disable if Annotation is Open.
... ... @@ -1037,6 +1079,24 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1037 1079  
1038 1080  
1039 1081 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1082 + if ($location.url() == "/module-item-view") {
  1083 +
  1084 + $rootScope.switchToAACanvas();
  1085 +
  1086 + }
  1087 + }
  1088 +
  1089 + $rootScope.switchToAACanvas = function () {
  1090 + var a = $("#aaDetailViewCanvas").css("z-index");
  1091 + var b = $("#canvasPaint").css("z-index");
  1092 + if (parseInt(a) < parseInt(b)) {
  1093 + b = parseInt(b) + 1;
  1094 + $("#canvas").css("z-index", b);
  1095 + }
  1096 + else {
  1097 + a = parseInt(a) + 1;
  1098 + $("#canvas").css("z-index", a);
  1099 + }
1040 1100 }
1041 1101  
1042 1102  
... ... @@ -1056,6 +1116,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1056 1116  
1057 1117  
1058 1118 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1119 + if ($location.url() == "/module-item-view") {
  1120 +
  1121 + $rootScope.switchToAACanvas();
  1122 +
  1123 + }
1059 1124 }
1060 1125  
1061 1126 $rootScope.Cursor = function () {
... ... @@ -1068,6 +1133,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1068 1133 $("#OnIdentify").removeClass('annotationtoolbartab');
1069 1134 $("#DrawMode").addClass('annotationtoolbartab');
1070 1135 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1136 + if ($location.url() == "/module-item-view") {
  1137 +
  1138 + $rootScope.switchToAACanvas();
  1139 +
  1140 + }
1071 1141 }
1072 1142  
1073 1143  
... ... @@ -1086,9 +1156,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1086 1156 $rootScope.shapeType = "Rectangle";
1087 1157  
1088 1158 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1159 + if ($location.url() == "/module-item-view") {
  1160 +
  1161 + $rootScope.switchToAACanvas();
  1162 +
  1163 + }
1089 1164 }
1090 1165  
1091 1166 $rootScope.paintBrush = function () {
  1167 +
1092 1168 $('.btnCursor').removeClass('activebtncolor');
1093 1169 $(".btn-annotation").removeClass("activebtncolor");
1094 1170 $(".btn-annotation-brush").addClass("activebtncolor");
... ... @@ -1144,6 +1220,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1144 1220  
1145 1221 }
1146 1222 }
  1223 +
  1224 +
1147 1225 }
1148 1226  
1149 1227 $rootScope.switchCanvasToPaintCanvas = function (e) {
... ... @@ -1223,6 +1301,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1223 1301 $rootScope.shapeType = "Circle";
1224 1302  
1225 1303 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1304 + if ($location.url() == "/module-item-view") {
  1305 +
  1306 + $rootScope.switchToAACanvas();
  1307 +
  1308 + }
1226 1309 }
1227 1310  
1228 1311 $rootScope.DrawArrow = function (e) {
... ... @@ -1240,6 +1323,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1240 1323 $rootScope.shapeType = "Arrow";
1241 1324  
1242 1325 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1326 + if ($location.url() == "/module-item-view") {
  1327 +
  1328 + $rootScope.switchToAACanvas();
  1329 +
  1330 + }
1243 1331 }
1244 1332 $rootScope.DrawText = function () {
1245 1333  
... ... @@ -1258,6 +1346,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1258 1346 $rootScope.shapeType = "TextArea";
1259 1347  
1260 1348 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1349 + if ($location.url() == "/module-item-view") {
  1350 +
  1351 + $rootScope.switchToAACanvas();
  1352 +
  1353 + }
1261 1354 }
1262 1355  
1263 1356 $rootScope.DrawPolygon = function () {
... ... @@ -1268,6 +1361,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1268 1361 $("#OnIdentify").removeClass('annotationtoolbartab');
1269 1362 $("#DrawMode").addClass('annotationtoolbartab');
1270 1363 $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1364 + if ($location.url() == "/module-item-view") {
  1365 +
  1366 + $rootScope.switchToAACanvas();
  1367 +
  1368 + }
1271 1369 }
1272 1370  
1273 1371  
... ... @@ -1368,7 +1466,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1368 1466 }
1369 1467  
1370 1468  
1371   -
1372 1469 }
1373 1470  
1374 1471 $rootScope.isShapeSyleOkBtnClicked = false;
... ... @@ -3447,7 +3544,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3447 3544 }
3448 3545  
3449 3546 $rootScope.UpdateAndCloseSetting = function (setting) {
3450   - // debugger;
  3547 +
3451 3548 $rootScope.UpdateSetting(setting);
3452 3549 $rootScope.loadSearchData();
3453 3550  
... ...