ADAM / AIAHTML5

Commit 50cf26c4b99744e43bb088f1b835deacff2955e9

Authored by Nikita Kulshreshtha
2 parents 57214734 3152a626

Merge branch 'brushpaintsize' into Develop

Inline Side-by-side
Showing 2 changed files with 27 additions and 26 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @50cf26c
... ... @@ -345,13 +345,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
345 345 $("#canvas").css("display", "block");
346 346 $rootScope.switchCanvasToPaintCanvas();
347 347 $rootScope.shapeType = "FreeStylePaint";
348   - var a = $("#amount-2").val();
349   - $rootScope.shapeSize = parseInt(a);
  348 + var btnBrushSizeValue = $("#btnBrushSize").val();
  349 + $rootScope.shapeSize = parseInt(btnBrushSizeValue);
  350 + $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize);
350 351 if ($rootScope.shapeSize == '') {
351 352 $('#canvasPaint').sketch({ defaultSize: 1 });
352 353 }
353 354 else {
354   - $('#canvasPaint').sketch({ defaultSize: $rootScope.shapeSize });
  355 + $('#canvasPaint').sketch();
355 356  
356 357 }
357 358  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @50cf26c
... ... @@ -536,33 +536,33 @@
536 536 <div class="well well-popup">
537 537 <div class="" role="group" aria-label="...">
538 538 <div>
539   - <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" id="paintLine" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></button>
540   - <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
541   - <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
542   - <div style="width: 58px; float: left;">
543   - <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
544   - </div>
545   - <div style="width: 22px; float: left;">
546   - <div style="width: 100%; float: left; height: 16px;">
547   - <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
548   -
549   - <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
550   - </button>
  539 + <a href="#canvasPaint" data-size="1" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
  540 + <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
  541 + <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
  542 + <div style="width: 58px; float: left;">
  543 + <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
551 544 </div>
552   - <div style="width: 100%; float: left; height: 16px;">
553   - <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
554   - <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
555   - </button>
  545 + <div style="width: 22px; float: left;">
  546 + <div style="width: 100%; float: left; height: 16px;">
  547 + <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
  548 +
  549 + <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
  550 + </button>
  551 + </div>
  552 + <div style="width: 100%; float: left; height: 16px;">
  553 + <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
  554 + <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
  555 + </button>
  556 + </div>
556 557 </div>
557   - </div>
558 558  
559   - </div>
  559 + </div>
560 560  
561   - <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
562   - <div id="slider-range-min-2"></div>
563   - </div>
564   - <div class="clearfix"></div>
565   - </div>
  561 + <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
  562 + <div id="slider-range-min-2"></div>
  563 + </div>
  564 + <div class="clearfix"></div>
  565 +</div>
566 566  
567 567 </div>
568 568  
... ...