ADAM / AIAHTML5

Commit 5c37396d8d4b3b5eb201ab1a4bda6dc71abb41b3

Authored by Amrita Vishnoi
1 parent e16a659d

Renamed the function names

Inline Side-by-side
Showing 2 changed files with 37 additions and 135 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @5c37396
@@ -65,6 +65,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -65,6 +65,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
65 $rootScope.isEraseToolSelected = false; 65 $rootScope.isEraseToolSelected = false;
66 $rootScope.isMousedownOnPaintCanvas = false; 66 $rootScope.isMousedownOnPaintCanvas = false;
67 67
  68 + //opacity code
  69 + $rootScope.shapestyleOpacity = 1;
  70 + $rootScope.shapestyleFillColor = "#fff";
  71 + $rootScope.shapestyleFillBorderColor = "black";
  72 + $rootScope.shapestyleborderWidth = 2;
  73 + $rootScope.shapestyleborderStyles = "solid";
  74 +
68 $rootScope.$on("$locationChangeSuccess", function () { 75 $rootScope.$on("$locationChangeSuccess", function () {
69 76
70 if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) { 77 if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
@@ -140,16 +147,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -140,16 +147,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
140 } 147 }
141 } 148 }
142 149
143 - // $rootScope.DrawLine = function () {  
144 - //$rootScope.isIdetifyClicked = false;  
145 - //$rootScope.isDrawingToolSelected = true;  
146 - //$rootScope.isLineDrawSelecyed = true;  
147 - // $rootScope.shapeType = "Line";  
148 - // alert($rootScope.shapeType);  
149 -  
150 -  
151 - // }  
152 -  
153 $rootScope.ClearIframe = function () { 150 $rootScope.ClearIframe = function () {
154 if ($('#daImagePanel') != null) 151 if ($('#daImagePanel') != null)
155 $('#daImagePanel').remove(); 152 $('#daImagePanel').remove();
@@ -287,14 +284,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -287,14 +284,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
287 $('#modal-settings').modal('toggle'); 284 $('#modal-settings').modal('toggle');
288 } 285 }
289 286
290 -  
291 } 287 }
292 288
293 -  
294 -  
295 //----Annotation Toolbar: Jcanvas----- 289 //----Annotation Toolbar: Jcanvas-----
296 290
297 - $rootScope.DrLine = function (e) { 291 + $rootScope.DrawLine = function (e)
  292 + {
298 $rootScope.setListManagerZindex = true; 293 $rootScope.setListManagerZindex = true;
299 $("#canvasPaint").css("display", "block"); 294 $("#canvasPaint").css("display", "block");
300 $("#canvas").css("display", "block"); 295 $("#canvas").css("display", "block");
@@ -302,7 +297,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -302,7 +297,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
302 $rootScope.switchCanvas(); 297 $rootScope.switchCanvas();
303 $rootScope.shapeType = "Line"; 298 $rootScope.shapeType = "Line";
304 299
305 -  
306 $('.btnCursor').removeClass('activebtncolor'); 300 $('.btnCursor').removeClass('activebtncolor');
307 $(".btn-annotation").removeClass("activebtncolor"); 301 $(".btn-annotation").removeClass("activebtncolor");
308 $(".btn-annotation-line").addClass("activebtncolor"); 302 $(".btn-annotation-line").addClass("activebtncolor");
@@ -311,7 +305,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -311,7 +305,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
311 } 305 }
312 306
313 307
314 - $rootScope.DrPin = function (e) { 308 + $rootScope.DrawPin = function (e) {
315 $("#canvasPaint").css("display", "block"); 309 $("#canvasPaint").css("display", "block");
316 $("#canvas").css("display", "block"); 310 $("#canvas").css("display", "block");
317 311
@@ -386,13 +380,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -386,13 +380,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
386 380
387 } 381 }
388 382
389 -  
390 - // $('#canvasPaint').sketch();  
391 -  
392 -  
393 } 383 }
394 384
395 -  
396 385
397 } 386 }
398 387
@@ -441,23 +430,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -441,23 +430,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
441 $('.btnCursor').removeClass('activebtncolor'); 430 $('.btnCursor').removeClass('activebtncolor');
442 $(".btn-annotation").removeClass("activebtncolor"); 431 $(".btn-annotation").removeClass("activebtncolor");
443 $(".btn-annotation-Text").addClass("activebtncolor"); 432 $(".btn-annotation-Text").addClass("activebtncolor");
444 - // $("#text_area").val('');  
445 - // $("#text_area").css({ " font-family": 'Verdana, sans-serif', "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });  
446 - } 433 + }
447 434
448 $rootScope.DrawPolygon = function () { 435 $rootScope.DrawPolygon = function () {
449 $rootScope.setListManagerZindex = true; 436 $rootScope.setListManagerZindex = true;
450 $("#canvasPaint").css("display", "block"); 437 $("#canvasPaint").css("display", "block");
451 $("#canvas").css("display", "block"); 438 $("#canvas").css("display", "block");
452 $rootScope.shapeType = "DrawPolygon"; 439 $rootScope.shapeType = "DrawPolygon";
453 -  
454 } 440 }
455 441
456 442
457 - $rootScope.OpacityModal = function () {  
458 -  
459 -  
460 - }  
461 $rootScope.switchCanvas = function () { 443 $rootScope.switchCanvas = function () {
462 var x = $('#canvasPaint').css("z-index"); 444 var x = $('#canvasPaint').css("z-index");
463 445
@@ -471,26 +453,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -471,26 +453,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
471 } 453 }
472 $rootScope.EraseDrawing = function () { 454 $rootScope.EraseDrawing = function () {
473 $rootScope.switchCanvas(); 455 $rootScope.switchCanvas();
474 - $rootScope.isEraseToolSelected = true;  
475 - //$rootScope.switchCanvasToPaintCanvas();  
476 - //// $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });  
477 - //var sktch = $('#canvasPaint').sketch();  
478 - //$('#canvasPaint').sketch().actions = []; // this line empties the actions.  
479 - //var myCanvas = document.getElementById("canvasPaint");  
480 - //var ctx = myCanvas.getContext('2d');  
481 - //ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);  
482 - //$rootScope.switchCanvas();  
483 - 456 + $rootScope.isEraseToolSelected = true;
484 } 457 }
485 458
486 - //opacity code  
487 - $rootScope.shapestyleOpacity = 1;  
488 - $rootScope.shapestyleFillColor = "#fff";  
489 - $rootScope.shapestyleFillBorderColor = "black";  
490 - $rootScope.shapestyleborderWidth = 2;  
491 - $rootScope.shapestyleborderStyles = "solid";  
492 - $rootScope.shapestyle = function (id) {  
493 - // debugger; 459 +
  460 + $rootScope.setPropertiesForShapes = function (id) {
  461 +
494 document.getElementById('modelbackground').style.display = "none"; 462 document.getElementById('modelbackground').style.display = "none";
495 document.getElementById('modeleditstyle').style.display = "none"; 463 document.getElementById('modeleditstyle').style.display = "none";
496 464
@@ -510,11 +478,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -510,11 +478,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
510 478
511 479
512 $('#editshapestyle').modal('hide'); 480 $('#editshapestyle').modal('hide');
513 - // name: 'Circle_' + $rootScope.resetCircle,  
514 -  
515 -  
516 - // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();  
517 - 481 +
518 //Edit Shape Style popup should open at it's default position 482 //Edit Shape Style popup should open at it's default position
519 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); 483 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
520 484
@@ -523,12 +487,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -523,12 +487,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
523 $rootScope.enableAnnotationToolBar = function () { 487 $rootScope.enableAnnotationToolBar = function () {
524 if ($rootScope.disableAnnotationTB == true) { 488 if ($rootScope.disableAnnotationTB == true) {
525 document.getElementById('modelbackground').style.display = "none"; 489 document.getElementById('modelbackground').style.display = "none";
526 - //$("#editshapestyle").modal('show');  
527 document.getElementById('modeleditstyle').style.display = "none"; 490 document.getElementById('modeleditstyle').style.display = "none";
528 } 491 }
529 else { 492 else {
530 document.getElementById('modelbackground').style.display = "block"; 493 document.getElementById('modelbackground').style.display = "block";
531 - //$("#editshapestyle").modal('show');  
532 document.getElementById('modeleditstyle').style.display = "block"; 494 document.getElementById('modeleditstyle').style.display = "block";
533 if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing 495 if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
534 var previewOpacity = $('#imgOpacity').css("opacity"); 496 var previewOpacity = $('#imgOpacity').css("opacity");
@@ -552,8 +514,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -552,8 +514,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
552 514
553 $(".custom-tooltip-annotation").css('display', 'none'); 515 $(".custom-tooltip-annotation").css('display', 'none');
554 $("#edit-block").removeClass("custom-tooltip-annotation"); 516 $("#edit-block").removeClass("custom-tooltip-annotation");
555 -  
556 -  
557 } 517 }
558 518
559 519
@@ -564,16 +524,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -564,16 +524,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
564 //Edit Shape Style popup should open at it's default position 524 //Edit Shape Style popup should open at it's default position
565 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); 525 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
566 526
567 -  
568 } 527 }
569 528
570 -  
571 -  
572 -  
573 - //----End-------------  
574 529
575 //--Common code of Annotation Toolbar for CI and DA------- 530 //--Common code of Annotation Toolbar for CI and DA-------
576 - $rootScope.LineFn = function (canvasId, LineNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y) { 531 + $rootScope.DrawLineOnModuleItem = function (canvasId, LineNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
577 $(canvasId).addLayer({ 532 $(canvasId).addLayer({
578 name: 'Line_' + LineNumber, 533 name: 'Line_' + LineNumber,
579 layer: true, 534 layer: true,
@@ -636,8 +591,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -636,8 +591,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
636 $('.btnCursor').addClass('activebtncolor'); 591 $('.btnCursor').addClass('activebtncolor');
637 } 592 }
638 593
639 - $rootScope.RectangleFn = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {  
640 - // alert("offsetX:" + offsetX1 + " offsetY:" + offsetY1 + " x:" + x + " y:" + y); 594 + $rootScope.DrawRectangleOnOpenModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
  595 +
641 $(canvasId).addLayer({ 596 $(canvasId).addLayer({
642 layer: true, 597 layer: true,
643 name: 'Rect_' + RectNumber, 598 name: 'Rect_' + RectNumber,
@@ -653,8 +608,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -653,8 +608,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
653 608
654 resizeFromCenter: true, 609 resizeFromCenter: true,
655 610
656 - dblclick: function () {  
657 - // $rootScope.backOpacity(); 611 + dblclick: function () {
658 612
659 }, 613 },
660 614
@@ -704,16 +658,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -704,16 +658,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
704 658
705 } 659 }
706 }).drawLayers(); 660 }).drawLayers();
707 -  
708 -  
709 -  
710 $('.btnCursor').trigger('click'); 661 $('.btnCursor').trigger('click');
711 $(".btn-annotation").removeClass("activebtncolor"); 662 $(".btn-annotation").removeClass("activebtncolor");
712 $('.btnCursor').addClass('activebtncolor'); 663 $('.btnCursor').addClass('activebtncolor');
713 664
714 } 665 }
715 666
716 - $rootScope.CircleFn = function (canvasId, CircleNumber, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor, offsetX1, offsetY1, x, y) { 667 + $rootScope.DrawCircleOnModuleItem = function (canvasId, CircleNumber, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor, offsetX1, offsetY1, x, y) {
717 668
718 $(canvasId).addLayer({ 669 $(canvasId).addLayer({
719 layer: true, 670 layer: true,
@@ -728,9 +679,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -728,9 +679,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
728 width: (x - offsetX1) * 2, height: (y - offsetY1) * 2, 679 width: (x - offsetX1) * 2, height: (y - offsetY1) * 2,
729 // Place a handle at each side and each corner 680 // Place a handle at each side and each corner
730 handlePlacement: 'both', 681 handlePlacement: 'both',
731 -  
732 -  
733 -  
734 click: function (layer) { 682 click: function (layer) {
735 683
736 $rootScope.canvasLayerNameCollection = []; 684 $rootScope.canvasLayerNameCollection = [];
@@ -783,7 +731,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -783,7 +731,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
783 $('.btnCursor').addClass('activebtncolor'); 731 $('.btnCursor').addClass('activebtncolor');
784 } 732 }
785 733
786 - $rootScope.ArrowFn = function (canvasId, ArrowNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y) { 734 + $rootScope.DrawArrowOnModuleItem = function (canvasId, ArrowNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
787 735
788 $('#canvas').drawLine({ 736 $('#canvas').drawLine({
789 layer: true, 737 layer: true,
@@ -851,7 +799,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -851,7 +799,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
851 $('.btnCursor').addClass('activebtncolor'); 799 $('.btnCursor').addClass('activebtncolor');
852 } 800 }
853 801
854 - $rootScope.PinFn = function (canvasId, PinNumber, offsetX1, offsetY1, x, y, PinArcNumber) { 802 + $rootScope.DrawPinOnModuleItem = function (canvasId, PinNumber, offsetX1, offsetY1, x, y, PinArcNumber) {
855 803
856 var xAxisPinDiff = offsetX1 - x; 804 var xAxisPinDiff = offsetX1 - x;
857 var yAxisPinDiff = offsetY1 - y; 805 var yAxisPinDiff = offsetY1 - y;
@@ -942,13 +890,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -942,13 +890,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
942 fillStyle: radial, 890 fillStyle: radial,
943 x: offsetX1, y: offsetY1, 891 x: offsetX1, y: offsetY1,
944 radius: 5, 892 radius: 5,
945 - //handle: {  
946 - // type: 'arc',  
947 - // fillStyle: '#fff',  
948 - // strokeStyle: '#c33',  
949 - // strokeWidth: 2,  
950 - // radius: 3  
951 - //}, 893 +
952 894
953 add: function (layer) { 895 add: function (layer) {
954 896
@@ -966,7 +908,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -966,7 +908,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
966 $('.btnCursor').addClass('activebtncolor'); 908 $('.btnCursor').addClass('activebtncolor');
967 } 909 }
968 910
969 - $rootScope.TextAreaFn = function (canvasId, TextNumber, offsetX1, offsetY1, resetTextRect, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor, x, y) { 911 + $rootScope.TextAreaOnModuleItem = function (canvasId, TextNumber, offsetX1, offsetY1, resetTextRect, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor, x, y) {
970 912
971 913
972 debugger; 914 debugger;
@@ -1213,13 +1155,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1213,13 +1155,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1213 //$rootScope.canvasLayerNameCollection = []; 1155 //$rootScope.canvasLayerNameCollection = [];
1214 $rootScope.LineNumber = $rootScope.ObjectIndex++; 1156 $rootScope.LineNumber = $rootScope.ObjectIndex++;
1215 1157
1216 - $rootScope.LineFn('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y) 1158 + $rootScope.DrawLineOnModuleItem('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
1217 1159
1218 break; 1160 break;
1219 1161
1220 case "Rectangle": 1162 case "Rectangle":
1221 $rootScope.rectNumber = $rootScope.ObjectIndex++; 1163 $rootScope.rectNumber = $rootScope.ObjectIndex++;
1222 - $rootScope.RectangleFn('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y); 1164 + $rootScope.DrawRectangleOnOpenModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1223 1165
1224 break; 1166 break;
1225 1167
@@ -1227,19 +1169,19 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1227,19 +1169,19 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1227 // alert($rootScope.shapestyleborderWidth); 1169 // alert($rootScope.shapestyleborderWidth);
1228 $rootScope.CircleNumber = $rootScope.ObjectIndex++; 1170 $rootScope.CircleNumber = $rootScope.ObjectIndex++;
1229 1171
1230 - $rootScope.CircleFn('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y); 1172 + $rootScope.DrawCircleOnModuleItem('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1231 break; 1173 break;
1232 case "Arrow": 1174 case "Arrow":
1233 $rootScope.ArrowNumber = $rootScope.ObjectIndex++; 1175 $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
1234 1176
1235 - $rootScope.ArrowFn('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y); 1177 + $rootScope.DrawArrowOnModuleItem('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1236 1178
1237 // $scope.resetRect += 1; 1179 // $scope.resetRect += 1;
1238 break; 1180 break;
1239 case "Pin": 1181 case "Pin":
1240 $rootScope.PinNumber = $rootScope.PinObjectIndex++; 1182 $rootScope.PinNumber = $rootScope.PinObjectIndex++;
1241 $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++; 1183 $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
1242 - $rootScope.PinFn('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber); 1184 + $rootScope.DrawPinOnModuleItem('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
1243 1185
1244 break; 1186 break;
1245 case "TextArea": 1187 case "TextArea":
@@ -1249,7 +1191,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1249,7 +1191,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1249 // Draw text 1191 // Draw text
1250 $rootScope.resetTextRect = $rootScope.ObjectIndex++; 1192 $rootScope.resetTextRect = $rootScope.ObjectIndex++;
1251 $rootScope.TextNumber = $rootScope.ObjectIndex++; 1193 $rootScope.TextNumber = $rootScope.ObjectIndex++;
1252 - $rootScope.TextAreaFn('#canvas', $rootScope.TextNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.resetTextRect, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.x, $rootScope.y); 1194 + $rootScope.TextAreaOnModuleItem('#canvas', $rootScope.TextNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.resetTextRect, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.x, $rootScope.y);
1253 break; 1195 break;
1254 1196
1255 case "DrawPolygon": 1197 case "DrawPolygon":
@@ -1412,14 +1354,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1412,14 +1354,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1412 CurrentFontFamily = ''; 1354 CurrentFontFamily = '';
1413 CurrentFontSize = ''; 1355 CurrentFontSize = '';
1414 1356
1415 - // $(".ActiveDefaultColorAnnotation").css({ "background-color": $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontColor + "!important" });  
1416 - // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");  
1417 -  
1418 -  
1419 - //adding text text decoration active class in text edit pop-up  
1420 -  
1421 -  
1422 -  
1423 1357
1424 if ($rootScope.TextPropertyArray[i].TextDecoration == "underline") { 1358 if ($rootScope.TextPropertyArray[i].TextDecoration == "underline") {
1425 1359
@@ -1433,14 +1367,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1433,14 +1367,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1433 1367
1434 } 1368 }
1435 1369
1436 -  
1437 -  
1438 //adding text font weight active class in text edit pop-up 1370 //adding text font weight active class in text edit pop-up
1439 1371
1440 if (fontWeightProp[0] == 700) { 1372 if (fontWeightProp[0] == 700) {
1441 1373
1442 -  
1443 -  
1444 $("#text-bold").addClass("ActiveFormattingButtonClass"); 1374 $("#text-bold").addClass("ActiveFormattingButtonClass");
1445 1375
1446 } 1376 }
@@ -1485,9 +1415,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1485,9 +1415,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1485 $("#text-left").removeClass("ActiveFormattingButtonClass"); 1415 $("#text-left").removeClass("ActiveFormattingButtonClass");
1486 1416
1487 $("#text-right").addClass("ActiveFormattingButtonClass"); 1417 $("#text-right").addClass("ActiveFormattingButtonClass");
1488 -  
1489 -  
1490 -  
1491 } 1418 }
1492 1419
1493 else if ($rootScope.TextPropertyArray[i].Align == "center") { 1420 else if ($rootScope.TextPropertyArray[i].Align == "center") {
@@ -1498,12 +1425,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1498,12 +1425,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1498 1425
1499 $("#text-center").addClass("ActiveFormattingButtonClass"); 1426 $("#text-center").addClass("ActiveFormattingButtonClass");
1500 1427
1501 -  
1502 -  
1503 } 1428 }
1504 1429
1505 -  
1506 -  
1507 } 1430 }
1508 else { 1431 else {
1509 // alert("no"); 1432 // alert("no");
@@ -1827,12 +1750,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1827,12 +1750,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1827 1750
1828 document.getElementById('modelbackground').style.display = "none"; 1751 document.getElementById('modelbackground').style.display = "none";
1829 1752
1830 - //if ($rootScope.isTextAreaClosedButtonActive == true) {  
1831 - // $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();  
1832 - // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();  
1833 -  
1834 - //}  
1835 -  
1836 } 1753 }
1837 //-- End ---------------------------- 1754 //-- End ----------------------------
1838 1755
@@ -1869,17 +1786,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1869,17 +1786,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1869 $rootScope.PaintCanvasMousedownListener = function (canvasContext, x, y) { 1786 $rootScope.PaintCanvasMousedownListener = function (canvasContext, x, y) {
1870 if ($rootScope.isLineDrawSelecyed == true) { 1787 if ($rootScope.isLineDrawSelecyed == true) {
1871 1788
1872 - canvasContext.lineWidth = 0.1;  
1873 - //$scope.paintCanvasContext.lineJoin = 'round';  
1874 - //$scope.paintCanvasContext.lineCap = 'round'; 1789 + canvasContext.lineWidth = 0.1;
1875 canvasContext.strokeStyle = 'red'; 1790 canvasContext.strokeStyle = 'red';
1876 -  
1877 -  
1878 canvasContext.beginPath(); 1791 canvasContext.beginPath();
1879 -  
1880 - //var canvasOffset = $("#myCanvas").offset();  
1881 - //var offsetX = canvasOffset.left;  
1882 - //var offsetY = canvasOffset.top;  
1883 canvasContext.moveTo(x, y); 1792 canvasContext.moveTo(x, y);
1884 } 1793 }
1885 1794
@@ -2125,14 +2034,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -2125,14 +2034,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
2125 } 2034 }
2126 2035
2127 //2. 2036 //2.
2128 - //localStorage.setItem("globalEthnicity", $rootScope.globalSetting.ethnicity);  
2129 -  
2130 - //3.  
2131 - //localStorage.setItem("globalModesty", $rootScope.globalSetting.modesty);  
2132 -  
2133 - //4.  
2134 - //$rootScope.reloadChildController();  
2135 - 2037 +
2136 var len = $rootScope.openModules.length; 2038 var len = $rootScope.openModules.length;
2137 if (len > 0) { 2039 if (len > 0) {
2138 $rootScope.reloadChildController(); 2040 $rootScope.reloadChildController();
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @5c37396
@@ -508,12 +508,12 @@ @@ -508,12 +508,12 @@
508 <div class="" role="group" align="center"> 508 <div class="" role="group" align="center">
509 <div id="cursor-block" style="display: none; font-size:13px;"></div> 509 <div id="cursor-block" style="display: none; font-size:13px;"></div>
510 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button> 510 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
511 - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button> 511 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
512 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button> 512 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
513 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button> 513 <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
514 </div> 514 </div>
515 <div class="" role="group" align="center"> 515 <div class="" role="group" align="center">
516 - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button> 516 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
517 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button> 517 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
518 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button> 518 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
519 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button> 519 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>
@@ -886,7 +886,7 @@ @@ -886,7 +886,7 @@
886 </div> 886 </div>
887 </div> 887 </div>
888 <div class="modal-footer"> 888 <div class="modal-footer">
889 - <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')"> 889 + <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
890 OK 890 OK
891 </button> 891 </button>
892 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button> 892 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
@@ -1008,7 +1008,7 @@ @@ -1008,7 +1008,7 @@
1008 </div> 1008 </div>
1009 </div> 1009 </div>
1010 <div class="modal-footer"> 1010 <div class="modal-footer">
1011 - <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')"> 1011 + <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
1012 OK 1012 OK
1013 </button> 1013 </button>
1014 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button> 1014 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>