ADAM / AIAHTML5

Commit adbef95c6251e38eb31011ddae0285dcad8ad7ae

Authored by Amrita Vishnoi
2 parents 00a807c8 9bd18a5a

Merge branch 'brushopacity' of http://52.6.196.163/ADAM/AIAHTML5 into Develop-16Jan2017

Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @adbef95
@@ -380,7 +380,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -380,7 +380,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
380 $rootScope.shapeSize = parseInt(btnBrushSizeValue); 380 $rootScope.shapeSize = parseInt(btnBrushSizeValue);
381 $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize); 381 $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize);
382 382
383 - $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleFillColor); 383 + $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleColorWithOpacity);
384 384
385 385
386 386
@@ -490,6 +490,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -490,6 +490,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
490 $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); 490 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
491 $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity); 491 $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
492 $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); 492 $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
  493 + $rootScope.shapeStyleColorRGBA = $rootScope.shapestyleFillColor.replace("rgb", "rgba");
  494 + $rootScope.shapestyleColorWithOpacity = $rootScope.shapeStyleColorRGBA.substring(0, $rootScope.shapeStyleColorRGBA.length - 1) + " " + "," + $rootScope.shapestyleOpacity + ")";
493 $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor); 495 $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
494 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); 496 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
495 // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); 497 // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);