ADAM / AIAHTML5

Commit 832a4d510e78d479b8d945354af3c2f60fbcc466

Authored by unknown
1 parent 1bbc3fae

DA > Annotation Toolbar > Draw tools are easily to delete if annotation toolbar is closed

Inline Side-by-side
Showing 2 changed files with 121 additions and 109 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @832a4d5
... ... @@ -3704,7 +3704,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3704 3704 }
3705 3705  
3706 3706 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
3707   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
  3707 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:60000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
3708 3708 //Issue #7286 :Undefined annotation should not appear
3709 3709 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
3710 3710 var annotation = $scope.MultiLanguageAnnationArray[i];
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @832a4d5
... ... @@ -264,6 +264,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
264 264 //annotation tool custom events
265 265 $rootScope.ShowAnnotationWindow = function () {
266 266 //7904
  267 + $rootScope.isAnnotatiomToolBarPopupClosed = false;
267 268 $rootScope.isAnnotaionToolBarDrawingModeActive = false;
268 269 if ($rootScope.MenuModuleName == "DA" || $rootScope.MenuModuleName == "CI") {
269 270 if ($rootScope.disableAnnotationtoolOnListManager == true) {
... ... @@ -326,6 +327,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
326 327  
327 328 $rootScope.CloseAnnotationTool = function () {
328 329 console.log('close');
  330 + $rootScope.isAnnotatiomToolBarPopupClosed = true;
329 331 $("#OnIdentify").removeClass("annotationtoolbartab");
330 332 $("#DrawMode").removeClass("annotationtoolbartab");
331 333 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -340,6 +342,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
340 342 $('.btnCursor').removeClass('activebtncolor');
341 343 $(".btn-annotation").removeClass("activebtncolor");
342 344 $rootScope.isAnnotaionToolBarDrawingModeActive = false;
  345 +
343 346 $rootScope.switchCanvas();
344 347 }
345 348 $rootScope.CIAnotationIdentifyModeOff = false;
... ... @@ -1390,25 +1393,27 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1390 1393 $rootScope.lastX; $rootScope.lastY;
1391 1394 var ctx;
1392 1395 $rootScope.OnPaintCanvasMouseDown = function (event) {
1393   -
1394   - var canvasElement = document.getElementById("canvas");
1395   - var ctx = canvasElement.getContext("2d");
1396   -
1397   - // var x = event.clientX;
1398   - // var y = event.clientY;
1399   - $rootScope.offsetX1 = 0;
1400   - $rootScope.offsetY1 = 0;
1401   - //alert($location.path());
1402   -
1403   - var canvasDiv = document.getElementById('canvasDiv');
1404   - var verticalScrollPosition = canvasDiv.scrollTop;
1405   - var horizontlScrollPosition = canvasDiv.scrollLeft;
1406   - $rootScope.offsetX1 = event.offsetX;
1407   - $rootScope.offsetY1 = event.offsetY;
1408   - ctx.clearRect(0, 0, 2277, 3248);
1409   - $rootScope.clicked = true;
1410   - // alert("x:"+$rootScope.offsetX1 + " y:" + $rootScope.offsetY1);
1411   - canvasElement.addEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
  1396 + if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
  1397 + var canvasElement = document.getElementById("canvas");
  1398 + var ctx = canvasElement.getContext("2d");
  1399 +
  1400 + // var x = event.clientX;
  1401 + // var y = event.clientY;
  1402 + $rootScope.offsetX1 = 0;
  1403 + $rootScope.offsetY1 = 0;
  1404 + //alert($location.path());
  1405 +
  1406 + var canvasDiv = document.getElementById('canvasDiv');
  1407 + var verticalScrollPosition = canvasDiv.scrollTop;
  1408 + var horizontlScrollPosition = canvasDiv.scrollLeft;
  1409 + $rootScope.offsetX1 = event.offsetX;
  1410 + $rootScope.offsetY1 = event.offsetY;
  1411 + ctx.clearRect(0, 0, 2277, 3248);
  1412 + $rootScope.clicked = true;
  1413 + // alert("x:"+$rootScope.offsetX1 + " y:" + $rootScope.offsetY1);
  1414 + canvasElement.addEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
  1415 + }
  1416 +
1412 1417 }
1413 1418 $rootScope.rectNumber = 0;
1414 1419 $rootScope.LineNumber = 0;
... ... @@ -1428,83 +1433,85 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1428 1433 var storeLine = '';
1429 1434  
1430 1435 $rootScope.OnPaintCanvasMouseUp = function (event) {
1431   -
  1436 +
1432 1437 if (!$rootScope.clicked) {
1433 1438 return;
1434 1439 }
1435   - var AnnotationCanvas = document.getElementById('canvas');
1436   - AnnotationCanvas.removeEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
1437   -
1438   - $(".line").remove();
1439   - $(".arrow").remove();
1440   - $(".pin").remove();
1441   - $(".circle").remove();
1442   - $(".rectangle").remove();
1443   - $(".textarea").remove();
1444   - $rootScope.clicked = false;
1445   - $rootScope.x = 0;
1446   - $rootScope.y = 0;
1447   - var canvasDiv = document.getElementById('canvasDiv');
1448   - var verticalScrollPosition = canvasDiv.scrollTop;
1449   - var horizontlScrollPosition = canvasDiv.scrollLeft;
1450   - $rootScope.x = event.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left;
1451   - $rootScope.y = event.pageY + verticalScrollPosition - $('#canvasDiv').offset().top;
1452   - var canvasElement = document.getElementById("canvas");
1453   - var ctx = canvasElement.getContext("2d");
1454   - var canvasPaintElement = document.getElementById("canvasPaint");
1455   - var PaintCanvasctx = canvasPaintElement.getContext("2d");
1456   - switch ($rootScope.shapeType) {
1457   - case "cursor":
1458   - ctx.beginPath();
1459   - PaintCanvasctx.beginPath();
1460   - break;
1461   - case "Line":
1462   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1463   - $rootScope.LineNumber = $rootScope.ObjectIndex++;
1464   - // $rootScope.isLinePreviewCompleted = true;
1465   - $rootScope.DrawLineOnModuleItem('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
1466   - break;
1467   - case "Rectangle":
1468   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1469   - $rootScope.rectNumber = $rootScope.ObjectIndex++;
1470   - // $rootScope.isRectanglePreviewCompleted = true;
1471   - $rootScope.DrawRectangleOnModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1472   -
1473   - break;
1474   - case "Circle":
1475   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1476   - $rootScope.CircleNumber = $rootScope.ObjectIndex++;
1477   - // $rootScope.isCirclePreviewCompleted = true;
1478   - $rootScope.DrawCircleOnModuleItem('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1479   - break;
1480   - case "Arrow":
1481   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1482   - $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
1483   - //$rootScope.isArrowPreviewCompleted = true;
1484   - $rootScope.DrawArrowOnModuleItem('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1485   - break;
1486   - case "Pin":
1487   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1488   - $rootScope.PinNumber = $rootScope.PinObjectIndex++;
1489   - $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
1490   -
1491   - //$rootScope.isPinPreviewCompleted = true;
1492   -
1493   - $rootScope.DrawPinOnModuleItem('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
1494   - break;
1495   - case "TextArea":
1496   - $rootScope.isAnnotaionToolBarDrawingModeActive = true;
1497   - $rootScope.IsTextAlreadySave = false;
1498   - $("#text_area").val('');
1499   - // Draw text
1500   - $rootScope.resetTextRect = $rootScope.ObjectIndex++;
1501   - $rootScope.TextNumber = $rootScope.ObjectIndex++;
1502   - // $rootScope.isTextAreaPreviewCompleted = true;
1503   - $rootScope.TextEditorFunctionality('#canvas', $rootScope.TextNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.resetTextRect, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.x, $rootScope.y);
1504   - break;
1505   - case "DrawPolygon":
1506   - break;
  1440 + if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
  1441 + var AnnotationCanvas = document.getElementById('canvas');
  1442 + AnnotationCanvas.removeEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
  1443 +
  1444 + $(".line").remove();
  1445 + $(".arrow").remove();
  1446 + $(".pin").remove();
  1447 + $(".circle").remove();
  1448 + $(".rectangle").remove();
  1449 + $(".textarea").remove();
  1450 + $rootScope.clicked = false;
  1451 + $rootScope.x = 0;
  1452 + $rootScope.y = 0;
  1453 + var canvasDiv = document.getElementById('canvasDiv');
  1454 + var verticalScrollPosition = canvasDiv.scrollTop;
  1455 + var horizontlScrollPosition = canvasDiv.scrollLeft;
  1456 + $rootScope.x = event.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left;
  1457 + $rootScope.y = event.pageY + verticalScrollPosition - $('#canvasDiv').offset().top;
  1458 + var canvasElement = document.getElementById("canvas");
  1459 + var ctx = canvasElement.getContext("2d");
  1460 + var canvasPaintElement = document.getElementById("canvasPaint");
  1461 + var PaintCanvasctx = canvasPaintElement.getContext("2d");
  1462 + switch ($rootScope.shapeType) {
  1463 + case "cursor":
  1464 + ctx.beginPath();
  1465 + PaintCanvasctx.beginPath();
  1466 + break;
  1467 + case "Line":
  1468 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1469 + $rootScope.LineNumber = $rootScope.ObjectIndex++;
  1470 + // $rootScope.isLinePreviewCompleted = true;
  1471 + $rootScope.DrawLineOnModuleItem('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
  1472 + break;
  1473 + case "Rectangle":
  1474 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1475 + $rootScope.rectNumber = $rootScope.ObjectIndex++;
  1476 + // $rootScope.isRectanglePreviewCompleted = true;
  1477 + $rootScope.DrawRectangleOnModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
  1478 +
  1479 + break;
  1480 + case "Circle":
  1481 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1482 + $rootScope.CircleNumber = $rootScope.ObjectIndex++;
  1483 + // $rootScope.isCirclePreviewCompleted = true;
  1484 + $rootScope.DrawCircleOnModuleItem('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
  1485 + break;
  1486 + case "Arrow":
  1487 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1488 + $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
  1489 + //$rootScope.isArrowPreviewCompleted = true;
  1490 + $rootScope.DrawArrowOnModuleItem('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
  1491 + break;
  1492 + case "Pin":
  1493 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1494 + $rootScope.PinNumber = $rootScope.PinObjectIndex++;
  1495 + $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
  1496 +
  1497 + //$rootScope.isPinPreviewCompleted = true;
  1498 +
  1499 + $rootScope.DrawPinOnModuleItem('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
  1500 + break;
  1501 + case "TextArea":
  1502 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
  1503 + $rootScope.IsTextAlreadySave = false;
  1504 + $("#text_area").val('');
  1505 + // Draw text
  1506 + $rootScope.resetTextRect = $rootScope.ObjectIndex++;
  1507 + $rootScope.TextNumber = $rootScope.ObjectIndex++;
  1508 + // $rootScope.isTextAreaPreviewCompleted = true;
  1509 + $rootScope.TextEditorFunctionality('#canvas', $rootScope.TextNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.resetTextRect, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.x, $rootScope.y);
  1510 + break;
  1511 + case "DrawPolygon":
  1512 + break;
1507 1513  
  1514 + }
1508 1515 }
1509 1516 //}
1510 1517  
... ... @@ -2112,15 +2119,18 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2112 2119 //----
2113 2120  
2114 2121 $rootScope.onDrawingCanvasClick = function (event) {
2115   -
  2122 +
2116 2123 $rootScope.clicked = true;
2117 2124 // OnPaintCanvasMouseDown(event);
2118 2125  
2119 2126 var annotationCanvas = document.getElementById('canvas');
2120 2127 if (annotationCanvas != null || annotationCanvas != undefined) {
2121   - annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintCanvasMouseDown, false);
2122   - annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp, false);
  2128 +
  2129 + annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintCanvasMouseDown, false);
  2130 + annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp, false);
  2131 +
2123 2132 }
  2133 +
2124 2134 // alert("doclick");
2125 2135 // annotation history
2126 2136 if (event != undefined) {
... ... @@ -2519,10 +2529,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2519 2529 annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintBrushCanvasMouseDown, false);
2520 2530 annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintBrushCanvasMouseUp, false);
2521 2531 // document.getElementById("canvasPaint").addEventListener("mouseup", OnPaintBrushCanvasMouseUp);
2522   - //alert($rootScope.isAnnotaionToolBarDrawingModeActive);
  2532 +
2523 2533 //if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
2524 2534  
2525   - // alert($rootScope.isAnnotaionToolBarDrawingModeActive);
  2535 +
2526 2536 // $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(e);
2527 2537  
2528 2538 //}
... ... @@ -2540,14 +2550,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2540 2550  
2541 2551  
2542 2552 $rootScope.OnPaintBrushCanvasMouseDown = function (event) {
2543   - $rootScope.isMousedownOnPaintCanvas = true;
2544   - $rootScope.isStartPointDeleted = false;
2545   - var annotationCanvas = document.getElementById("canvas");
2546   - $rootScope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
2547   - $rootScope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
2548   -
2549   - annotationCanvas.addEventListener('mousemove', $rootScope.OnPaintBrushCanvasMouseMove, false);
  2553 + if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
  2554 + $rootScope.isMousedownOnPaintCanvas = true;
  2555 + $rootScope.isStartPointDeleted = false;
  2556 + var annotationCanvas = document.getElementById("canvas");
  2557 + $rootScope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
  2558 + $rootScope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
2550 2559  
  2560 + annotationCanvas.addEventListener('mousemove', $rootScope.OnPaintBrushCanvasMouseMove, false);
  2561 + }
2551 2562 }
2552 2563 $rootScope.OnPaintBrushCanvasMouseMove = function (event) {
2553 2564  
... ... @@ -2576,10 +2587,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2576 2587 }
2577 2588 }
2578 2589 $rootScope.OnPaintBrushCanvasMouseUp = function (event) {
2579   - $rootScope.isMousedownOnPaintCanvas = false;
2580   - $rootScope.isEraseToolSelected = false;
2581   - $(".btn-annotation-erase").removeClass("activebtncolor");
2582   -
  2590 + if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
  2591 + $rootScope.isMousedownOnPaintCanvas = false;
  2592 + $rootScope.isEraseToolSelected = false;
  2593 + $(".btn-annotation-erase").removeClass("activebtncolor");
  2594 + }
2583 2595 }
2584 2596  
2585 2597  
... ...