Resolved line issue, pin issue and replicated a code for annotation toolbar in different views.

unknown
1 parent 2ea0d8bf
Showing 3 changed files with 35 additions and 31 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -724,6 +724,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //calculate coordinates for body region images
     $scope.CalculateImageCordinates = function (viewOrientationId) {
+        // annotation toolbar canvas
+        if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
+
+            $("#canvasDiv").append('<canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
+            $scope.doClick();
+            $rootScope.FreeStylePaint();
+
+        }
+
         $scope.terminateCurrentlyRunningWPs();
         var drawnBodyRegionCount = [];
@@ -1421,14 +1430,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             context.drawImage(img, 0, 0);
             context.restore();
-
-            if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
-            
-                    $("#canvasDiv").append('<canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
-                    $scope.doClick();
-                    $rootScope.FreeStylePaint();
-                        
-            }
             if (isMaskImage == 'N') {
@@ -1754,14 +1755,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             context.drawImage(img, 0, 0);
-            if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
-
-                $("#canvasDiv").append('<canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas><canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>');
-                $scope.doClick();
-                $rootScope.FreeStylePaint();
-
-            }
-
             if (isMaskImage == 'N') {
                 if (bodyRegionId == 'modestyImg3' || bodyRegionId == 'modestyImg2') {
@@ -2559,6 +2552,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
             $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition)
+         
             if ( $rootScope.isHighlightBodyByBodySystem) {
                 $timeout(function () { $scope.DisableProgressBar() }, 20000);
             }
@@ -6034,6 +6028,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $rootScope.resetText = 0;
     $rootScope.resetTextSave = 0;
     $rootScope.ObjectIndexSave = 0;
+   
     var arrayRect = {};
@@ -6081,7 +6076,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 break;
             case "Line":
-
+               
                 $rootScope.resetLine = $rootScope.ObjectIndex++;
                 $('#canvas').addLayer({
                     name: 'Line_' + $rootScope.resetLine,
@@ -6093,7 +6088,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     rounded: true,
                     x1: $scope.offsetX1, y1: $scope.offsetY1,
                     x2: $scope.x, y2: $scope.y,
-
+                    
                     click: function (layer) {
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
@@ -6242,7 +6237,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     click: function (layer) {
-                          //  alert(layer.name);
+                        
                         $rootScope.canvasLayerNameCollection = [];
                         $rootScope.canvasLayerNameCollection.push(layer.name);
                         $('#canvas').setLayer(layer.name, {
@@ -6570,6 +6565,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
+
+
     //-- TextArea functionality of Annotation toolbar
     $rootScope.fontSizes;
@@ -89,15 +89,15 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             }
         }
-        $rootScope.DrawLine = function () {
+      //  $rootScope.DrawLine = function () {
             //$rootScope.isIdetifyClicked = false;
             //$rootScope.isDrawingToolSelected = true;
             //$rootScope.isLineDrawSelecyed = true;
-            $rootScope.shapeType = "Line";
+         //   $rootScope.shapeType = "Line";
             //  alert($rootScope.shapeType);
-        }
+      //  }
         $rootScope.ClearIframe = function () {
             if ($('#daImagePanel') != null)
@@ -159,20 +159,26 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //----Annotation Toolbar: Jcanvas-----
-        $rootScope.DrawLine = function (e) {
+        $rootScope.DrLine = function (e) {
+          
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
+        
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Line";
-
-
+         
             $('.btnCursor').removeClass('activebtncolor');
-            $(".btn-annotation").removeClass("activebtncolor");
-            $(".btn-annotation-line").addClass("activebtncolor");
-
+           $(".btn-annotation").removeClass("activebtncolor");
+           $(".btn-annotation-line").addClass("activebtncolor");
         }
-        $rootScope.DrawPin = function (e) {
+        $rootScope.DrPin = function (e) {
+            $("#canvasPaint").css("display", "block");
+            $("#canvas").css("display", "block");
+
+            $rootScope.switchCanvas();
             $rootScope.switchCanvas();
             $rootScope.shapeType = "Pin";
@@ -191,6 +197,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.DrawRectangle = function (e) {
+          
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
             $rootScope.switchCanvas();
@@ -431,12 +431,12 @@
                                 <div class="" role="" aria-label="...">
                                     <div class="" role="group" align="center">
                                         <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" data-toggle="tooltip" data-placement="top" title="Select Shapes(S)" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
-                                        <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" data-toggle="tooltip" data-placement="top" title="Draw Pin" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
+                                        <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" data-toggle="tooltip" data-placement="top" title="Draw Pin" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
                                         <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" data-toggle="tooltip" data-placement="top" title="Draw Arrow" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
                                         <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" data-toggle="tooltip" data-placement="top" title="Draw Text" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
                                     </div>
                                     <div class="" role="group" align="center">
-                                        <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" data-toggle="tooltip" data-placement="top" title="Draw Line" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
+                                        <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" data-toggle="tooltip" data-placement="top" title="Draw Line" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
                                         <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" data-toggle="tooltip" data-placement="top" title="Draw Rectangle" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
                                         <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" data-toggle="tooltip" data-placement="top" title="Draw Circle" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
                                         <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" data-toggle="tooltip" data-placement="top" title="Draw Polygon" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>