ADAM / AIAHTML5

Commit e8cdc99bbad610a15528dc6f1bd85fe44d022db1

Authored by unknown
1 parent 8566ff1d

Annotation Toolbar > Paint tool is not working if layer is change.

Inline Side-by-side
Showing 3 changed files with 39 additions and 35 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e8cdc99
... ... @@ -554,6 +554,43 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
554 554 }
555 555  
556 556 angular.element(document).ready(function (e) {
  557 +
  558 + $("#layerChangeSlider").slider({
  559 + orientation: "vertical",
  560 + range: "max", // <--- needed...
  561 + min: 0,
  562 + // max: 100,
  563 + value: 0,
  564 + slide: function (event, ui) {
  565 + // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
  566 +
  567 + // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
  568 + },
  569 + stop: function (event, ui) {
  570 + var la;
  571 + var rootScope = angular.element(document.getElementById("bo")).scope();
  572 + rootScope.$apply(function () {
  573 + rootScope.isLoading = true;
  574 + })
  575 + var scope = angular.element(document.getElementById("daView")).scope();
  576 + scope.$apply(function () {
  577 + if (scope.isTransparencyActivated) {
  578 + rootScope.isLoading = false;
  579 + }
  580 + la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
  581 + // $('#layerChangeSlider').slider("option", "value", la - ui.value);
  582 + var slideVal = la - ui.value;
  583 + $("#txtlayerNumber").val(slideVal);
  584 + scope.layerNumber = slideVal;
  585 + scope.LayerChange();
  586 + $("#annotationpaintbrushsize").removeClass("activebtncolor");
  587 + $("#annotationpainteraser").removeClass("activebtncolor");
  588 + });
  589 + },
  590 +
  591 + });
  592 +
  593 +
557 594 $("#daImagePanel").resize(function () {
558 595 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
559 596 $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @e8cdc99
... ... @@ -420,40 +420,7 @@
420 420 return false;
421 421 }
422 422 });
423   -
424   -
425   - $("#layerChangeSlider").slider({
426   - orientation: "vertical",
427   - range: "max", // <--- needed...
428   - min: 0,
429   - // max: 100,
430   - value: 0,
431   - slide: function (event, ui) {
432   - // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
433   -
434   - // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
435   - },
436   - stop: function (event, ui) {
437   - var la;
438   - var rootScope = angular.element(document.getElementById("bo")).scope();
439   - rootScope.$apply(function () {
440   - rootScope.isLoading = true;
441   - })
442   - var scope = angular.element(document.getElementById("daView")).scope();
443   - scope.$apply(function () {
444   - if (scope.isTransparencyActivated) {
445   - rootScope.isLoading = false;
446   - }
447   - la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
448   - // $('#layerChangeSlider').slider("option", "value", la - ui.value);
449   - var slideVal = la - ui.value;
450   - $("#txtlayerNumber").val(slideVal);
451   - scope.layerNumber = slideVal;
452   - scope.LayerChange();
453   - });
454   - },
455   -
456   - })
  423 +
457 424 });
458 425  
459 426 </script>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @e8cdc99
... ... @@ -606,7 +606,7 @@
606 606 <div class="" role="group" aria-label="...">
607 607 <div>
608 608 <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>
609   - <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;
  609 + <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;
610 610 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
611 611 <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()">
612 612 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
... ...