Merge branch 'Erasetoolfunctionality' into Develop

Nikita Kulshreshtha
2 parents 2ce7857f 966a7a2c
Showing 2 changed files with 55 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -6430,15 +6430,55 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
-    function OnPaintCanvasMouseMove(event) {
+    $rootScope.FreeStylePaint = function (e) {
+
+        var annotationCanvas = document.getElementById("canvas");
+        //  document.getElementById("canvasPaint").addEventListener("mouseup", OnPaintBrushCanvasMouseUp);
+
+        annotationCanvas.addEventListener('mousedown', $scope.OnPaintCanvasMouseDown, false);
+        annotationCanvas.addEventListener('mouseup', $scope.OnPaintBrushCanvasMouseUp, false);
     }
+    $scope.OnPaintCanvasMouseDown = function (event) {
+        $rootScope.isMousedownOnPaintCanvas = true;
+        $scope.isStartPointDeleted = false;
+        var annotationCanvas = document.getElementById("canvas");
+        $scope.startPageX = parseInt(event.clientX - ($("#canvas").offset().left));
+        $scope.startPageY = parseInt(event.clientY - ($("#canvas").offset().top));
+
+        annotationCanvas.addEventListener('mousemove', $scope.OnPaintCanvasMouseMove, false);
-    $rootScope.FreeStylePaint = function (e) {
     }
+    $scope.OnPaintCanvasMouseMove = function (event) {
+
+
+        $rootScope.xPage = parseInt(event.clientX - ($("#canvas").offset().left));
+        $rootScope.yPage = parseInt(event.clientY - ($("#canvas").offset().top));
+
+        var btneraseBrushSizeValue = $("#btnBrushSize").val();
+        $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
+
+        if ($rootScope.isEraseToolSelected == true && $rootScope.isMousedownOnPaintCanvas == true) {
+
+            var sktch = $('#canvasPaint').sketch();
+            $('#canvasPaint').sketch().actions = [];
+            var paintCanvas = document.getElementById("canvasPaint");
+            var paintCanvasContext = paintCanvas.getContext('2d');
+            if ($scope.isStartPointDeleted == false) {
+
+                paintCanvasContext.clearRect($scope.startPageX, $scope.startPageY, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
+
+                $scope.isStartPointDeleted = true;
+            }
+
+            paintCanvasContext.clearRect($rootScope.xPage, $rootScope.yPage, $rootScope.eraseshapeSize, $rootScope.eraseshapeSize);
+
+
+        }
+    }
     $scope.OnPaintBrushCanvasMouseDown = function (event) {
         switch ($rootScope.shapeType) {
@@ -6467,7 +6507,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
     }
     $scope.OnPaintBrushCanvasMouseUp = function (event) {
-
+        $rootScope.isMousedownOnPaintCanvas = false;
+        $rootScope.isEraseToolSelected = false;
         //   var canvasElement1 = document.getElementById("canvasPaint");
         //   var ctx1 = canvasElement1.getContext("2d");
@@ -62,7 +62,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.TextRectangleArr = [];
         $rootScope.rectDimension = [];
-
+        $rootScope.isEraseToolSelected = false;
+        $rootScope.isMousedownOnPaintCanvas = false;
         $rootScope.$on("$locationChangeSuccess", function () {
@@ -440,14 +441,16 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('#canvas').css("z-index", y);
         }
         $rootScope.EraseDrawing = function () {
-            $rootScope.switchCanvasToPaintCanvas();
-            //       $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
-            var sktch = $('#canvasPaint').sketch();
-            $('#canvasPaint').sketch().actions = [];       // this line empties the actions. 
-            var myCanvas = document.getElementById("canvasPaint");
-            var ctx = myCanvas.getContext('2d');
-            ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
             $rootScope.switchCanvas();
+            $rootScope.isEraseToolSelected = true;
+            //$rootScope.switchCanvasToPaintCanvas();
+            ////       $('#canvasPaint').sketch({ defaultColor: "yellow", defaultSize: 1 });
+            //var sktch = $('#canvasPaint').sketch();
+            //$('#canvasPaint').sketch().actions = [];       // this line empties the actions. 
+            //var myCanvas = document.getElementById("canvasPaint");
+            //var ctx = myCanvas.getContext('2d');
+            //ctx.clearRect(0, 0, myCanvas.width, myCanvas.height);
+            //$rootScope.switchCanvas();
         }