Merge branch 'PaintToolIssue' into Develop

Nikita Kulshreshtha
2 parents 8566ff1d e8cdc99b
Showing 3 changed files with 39 additions and 35 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -554,6 +554,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     angular.element(document).ready(function (e) {
+
+        $("#layerChangeSlider").slider({
+            orientation: "vertical",
+            range: "max", // <--- needed...
+            min: 0,
+            // max: 100,
+            value: 0,
+            slide: function (event, ui) {
+                // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
+
+                // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
+            },
+            stop: function (event, ui) {
+                var la;
+                var rootScope = angular.element(document.getElementById("bo")).scope();
+                rootScope.$apply(function () {
+                    rootScope.isLoading = true;
+                })
+                var scope = angular.element(document.getElementById("daView")).scope();
+                scope.$apply(function () {
+                    if (scope.isTransparencyActivated) {
+                        rootScope.isLoading = false;
+                    }
+                    la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
+                    //  $('#layerChangeSlider').slider("option", "value", la - ui.value);
+                    var slideVal = la - ui.value;
+                    $("#txtlayerNumber").val(slideVal);
+                    scope.layerNumber = slideVal;
+                    scope.LayerChange();
+                    $("#annotationpaintbrushsize").removeClass("activebtncolor");
+                    $("#annotationpainteraser").removeClass("activebtncolor");
+                });
+            },
+
+        });
+
+
          $("#daImagePanel").resize(function () {
              $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
              $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
@@ -420,40 +420,7 @@
                 return false;
             }
         });
-
-
-        $("#layerChangeSlider").slider({
-            orientation: "vertical",
-            range: "max", // <--- needed...
-            min: 0,
-            // max: 100,
-            value: 0,
-            slide: function (event, ui) {
-                // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
-
-                // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
-            },
-            stop: function (event, ui) {
-                var la;
-                var rootScope = angular.element(document.getElementById("bo")).scope();
-                rootScope.$apply(function () {
-                    rootScope.isLoading = true;
-                })
-                var scope = angular.element(document.getElementById("daView")).scope();
-                scope.$apply(function () {
-                    if (scope.isTransparencyActivated) {
-                        rootScope.isLoading = false;
-                    }
-                    la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
-                    //  $('#layerChangeSlider').slider("option", "value", la - ui.value);
-                    var slideVal = la - ui.value;
-                    $("#txtlayerNumber").val(slideVal);
-                    scope.layerNumber = slideVal;
-                    scope.LayerChange();
-                });
-            },
-
-        })
+      
     });
 </script>
@@ -606,7 +606,7 @@
                                         <div class="" role="group" aria-label="...">
                                             <div>
                                                 <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
-                                                <button type="button" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>&nbsp;
+                                                <button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>&nbsp;
                                                 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
                                                     <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()">
                                                         <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">