ADAM / AIAHTML5

Commit db85f87f39cc2b0f1531a3cc7e24c76379dada1b

Authored by unknown
1 parent 57214734

commit changes for Issue : 9711

Inline Side-by-side
Showing 2 changed files with 37 additions and 26 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @db85f87
@@ -345,8 +345,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -345,8 +345,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
345 $("#canvas").css("display", "block"); 345 $("#canvas").css("display", "block");
346 $rootScope.switchCanvasToPaintCanvas(); 346 $rootScope.switchCanvasToPaintCanvas();
347 $rootScope.shapeType = "FreeStylePaint"; 347 $rootScope.shapeType = "FreeStylePaint";
348 - var a = $("#amount-2").val(); 348 + //var a = $("#amount-2").val();
  349 + //$rootScope.shapeSize = parseInt(a);
  350 +
  351 + var a = $("#btnBrushSize").val();
349 $rootScope.shapeSize = parseInt(a); 352 $rootScope.shapeSize = parseInt(a);
  353 + $("#msglist").attr("data-size", $rootScope.shapeSize);
  354 +
  355 + $("#msglist").attr("data-color", $rootScope.shapestyleFillColor);
  356 +
  357 +
350 if ($rootScope.shapeSize == '') { 358 if ($rootScope.shapeSize == '') {
351 $('#canvasPaint').sketch({ defaultSize: 1 }); 359 $('#canvasPaint').sketch({ defaultSize: 1 });
352 } 360 }
@@ -454,7 +462,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -454,7 +462,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
454 $rootScope.shapestyleborderWidth = 2; 462 $rootScope.shapestyleborderWidth = 2;
455 $rootScope.shapestyleborderStyles = "solid"; 463 $rootScope.shapestyleborderStyles = "solid";
456 $rootScope.shapestyle = function (id) { 464 $rootScope.shapestyle = function (id) {
457 - // debugger; 465 + // debugger;
458 document.getElementById('modelbackground').style.display = "none"; 466 document.getElementById('modelbackground').style.display = "none";
459 document.getElementById('modeleditstyle').style.display = "none"; 467 document.getElementById('modeleditstyle').style.display = "none";
460 468
@@ -481,7 +489,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -481,7 +489,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
481 489
482 //Edit Shape Style popup should open at it's default position 490 //Edit Shape Style popup should open at it's default position
483 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); 491 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
484 - 492 +
485 } 493 }
486 494
487 $rootScope.enableAnnotationToolBar = function () { 495 $rootScope.enableAnnotationToolBar = function () {
@@ -500,6 +508,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -500,6 +508,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
500 $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%"); 508 $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
501 509
502 }; 510 };
  511 +
503 } 512 }
504 } 513 }
505 514
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @db85f87
@@ -536,33 +536,35 @@ @@ -536,33 +536,35 @@
536 <div class="well well-popup"> 536 <div class="well well-popup">
537 <div class="" role="group" aria-label="..."> 537 <div class="" role="group" aria-label="...">
538 <div> 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="msglist" data-color="#fff">
  540 + <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>
  541 + </a>
  542 + <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;
  543 + <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
  544 + <div style="width: 58px; float: left;">
  545 + <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
551 </div> 546 </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> 547 + <div style="width: 22px; float: left;">
  548 + <div style="width: 100%; float: left; height: 16px;">
  549 + <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
  550 +
  551 + <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
  552 + </button>
  553 + </div>
  554 + <div style="width: 100%; float: left; height: 16px;">
  555 + <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
  556 + <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
  557 + </button>
  558 + </div>
556 </div> 559 </div>
557 - </div>  
558 560
559 - </div> 561 + </div>
560 562
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> 563 + <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
  564 + <div id="slider-range-min-2"></div>
  565 + </div>
  566 + <div class="clearfix"></div>
  567 +</div>
566 568
567 </div> 569 </div>
568 570