Merge branch 'MerginIssueResolved' into Develop

Amrita Vishnoi
2 parents 532e67d4 c105cbda
Showing 2 changed files with 19 additions and 16 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -563,7 +563,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               theme: 'success',
                               currentController: 'CIController',
                               parentSlug: 'clinical-illustrations',
-                              content: '<div class="row"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas></div>  <canvas id="canvasPaint" ng-click="FreeStylePaint($event)"  width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas>' +
+                              content: '<div class="row" id="canvasDiv"><div style="align:left;width:100%;height:100%"><canvas id="canvas" ng-click="BindCanvasDrawingListners($event)" width="1369" height="325" class="canvas-annotationStyle" style="position: absolute; background-color: transparent;z-index:1 "></canvas></div>  <canvas id="canvasPaint" ng-click="FreeStylePaint($event)"  width="1369" height="325" class="canvas-annotationStyle1" style="position: absolute;z-index:0;"></canvas>' +
                               '<div class="col-sm-12 img-thumbnail" align="center">' +
                               '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well">' +
                               '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
@@ -457,7 +457,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.EraseDrawing = function () {
             $rootScope.switchCanvas();
-            $rootScope.isEraseToolSelected = true;     
+            $rootScope.isEraseToolSelected = true;
+            //$rootScope.switchCanvasToPaintCanvas();
         }
@@ -1120,6 +1121,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             //   var y = event.clientY;
             $rootScope.offsetX1 = 0;
             $rootScope.offsetY1 = 0;
+            //alert($location.path());
+
             var canvasDiv = document.getElementById('canvasDiv');
             var verticalScrollPosition = canvasDiv.scrollTop;
             var horizontlScrollPosition = canvasDiv.scrollLeft;
@@ -1180,30 +1183,30 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     break;
                 case "Line":
                     $rootScope.LineNumber = $rootScope.ObjectIndex++;
-                    $rootScope.isLinePreviewCompleted = true;
+                  //  $rootScope.isLinePreviewCompleted = true;
                     $rootScope.DrawLineOnModuleItem('#canvas', $rootScope.LineNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y)
                     break;
                 case "Rectangle":
                     $rootScope.rectNumber = $rootScope.ObjectIndex++;
-                    $rootScope.isRectanglePreviewCompleted = true;
+                   // $rootScope.isRectanglePreviewCompleted = true;
                     $rootScope.DrawRectangleOnModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
                     break;
                 case "Circle":
                     $rootScope.CircleNumber = $rootScope.ObjectIndex++;
-                    $rootScope.isCirclePreviewCompleted = true;
+                   // $rootScope.isCirclePreviewCompleted = true;
                     $rootScope.DrawCircleOnModuleItem('#canvas', $rootScope.CircleNumber, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
                     break;
                 case "Arrow":
                     $rootScope.ArrowNumber = $rootScope.ObjectIndex++;
-                    $rootScope.isArrowPreviewCompleted = true;
+                    //$rootScope.isArrowPreviewCompleted = true;
                     $rootScope.DrawArrowOnModuleItem('#canvas', $rootScope.ArrowNumber, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
                     break;
                 case "Pin":
                     $rootScope.PinNumber = $rootScope.PinObjectIndex++;
                     $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
-                    $rootScope.isPinPreviewCompleted = true;
+                    //$rootScope.isPinPreviewCompleted = true;
                     $rootScope.DrawPinOnModuleItem('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
                     break;
@@ -1213,7 +1216,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     // Draw text
                     $rootScope.resetTextRect = $rootScope.ObjectIndex++;
                     $rootScope.TextNumber = $rootScope.ObjectIndex++;
-                    $rootScope.isTextAreaPreviewCompleted = true;
+                 //   $rootScope.isTextAreaPreviewCompleted = true;
                     $rootScope.TextEditorFunctionality('#canvas', $rootScope.TextNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.resetTextRect, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderColor, $rootScope.shapestyleborderWidth, $rootScope.shapestyleFillColor, $rootScope.x, $rootScope.y);
                     break;
                 case "DrawPolygon":
@@ -1232,35 +1235,35 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             switch ($rootScope.shapeType) {
                 case "Line":
                     $(".line").remove();
-
+                    $rootScope.isLinePreviewCompleted = true;
                     $("#canvasDiv").append("<div class='line' style='border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;'></div>");
                     $rootScope.Annotationangle();
                     break;
                 case "Arrow":
                     $(".arrow").remove();
-
+                    $rootScope.isArrowPreviewCompleted = true;
                     $("#canvasDiv").append("<div class='arrow' style='border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='border-bottom: 9px solid transparent;border-right: 12px dashed #ccc;border-top: 7px solid transparent;height: 0;left: -6px;position: absolute;top: -8px;width: 0;'></div></div>");
                     $rootScope.Annotationangle();
                     break;
                 case "Pin":
                     $(".pin").remove();
-                   
+                    $rootScope.isPinPreviewCompleted = true;
                     $("#canvasDiv").append("<div class='pin' style='border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='background-color:#fff;left: -8px;position: absolute;top: -6px;width: 10;height:12px;width:12px;border:2px dashed #808080;border-radius:50%;'></div></div>");
                     $rootScope.Annotationangle();
                     break;
                 case "Circle":
                     $(".circle").remove();
-                   
+                    $rootScope.isCirclePreviewCompleted = true;
                     $("#canvasDiv").append("<div class='circle' style='border-radius:50%;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                     break;
                 case "Rectangle":
                     $(".rectangle").remove();
-                   
+                    $rootScope.isRectanglePreviewCompleted = true;
                     $("#canvasDiv").append("<div class='rectangle' style='border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                     break;
                 case "TextArea":
                     $(".textarea").remove();
-                   
+                    $rootScope.isTextAreaPreviewCompleted = true;
                     $("#canvasDiv").append("<div class='textarea' style='border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                     break;
             }
@@ -2160,10 +2163,10 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $rootScope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
             $rootScope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
-            annotationCanvas.addEventListener('mousemove', $rootScope.OnPaintCanvasMouseMove, false);
+            annotationCanvas.addEventListener('mousemove', $rootScope.OnPaintBrushCanvasMouseMove, false);
         }
-        $rootScope.OnPaintCanvasMouseMove = function (event) {
+        $rootScope.OnPaintBrushCanvasMouseMove = function (event) {
             $rootScope.xPage = parseInt(event.clientX - ($("#canvas").offset().left));
             $rootScope.yPage = parseInt(event.clientY - ($("#canvas").offset().top));