diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index d2fa881..04c9c79 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -175,6 +175,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$(".btn-annotation-rectangle").addClass("activebtncolor");
}
$rootScope.paintBrush = function () {
+
+ $('.btnCursor').addClass('activebtncolor');
$rootScope.switchCanvasToPaintCanvas();
$rootScope.shapeType = "FreeStylePaint";
@@ -258,28 +260,36 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.shapestyleFillColor = "#fff";
$rootScope.shapestyleFillBorderColor = "black";
$rootScope.shapestyleborderWidth = 2;
-
+ $rootScope.shapestyleborderStyles = "solid";
$rootScope.shapestyle = function (id) {
+ document.getElementById('modelbackground').style.display = "none";
+
$rootScope.shapestyleOpacity = $("#" + id).css('opacity');
$rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
- $rootScope.shapestyleFillBorderColor = $("#" + id).parent().css('border');
- var a = $rootScope.shapestyleFillBorderColor;
- var b = a.split("px");
- // alert(b);
- $rootScope.shapestyleborderWidth = b[0];
-
- // alert(b[0]);
- //alert(b[1]);
- var c = b[1].split("solid");
- // alert(c[1]);
- $rootScope.shapestyleborderColor = c[1];
+ $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
+ $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
+ var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
+ var intPart = pixelSeparation.split("p");
+ $rootScope.shapestyleborderWidth = intPart[0];
+ $rootScope.shapestyleborderStyles = "solid";
- // alert($rootScope.shapestyleFillColor);
$('#editshapestyle').modal('hide');
}
+ $rootScope.enableAnnotationToolBar = function () {
+
+ document.getElementById('modelbackground').style.display = "block";
+ $("#editshapestyle").modal('show');
+
+ }
+
+ $rootScope.disableAnnotationToolBar = function () {
+
+ document.getElementById('modelbackground').style.display = "none";
+
+ }
//----End-------------
@@ -560,7 +570,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
var openViewLen = $rootScope.openViews.length;
var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
$rootScope.isSettingEventAlredayDispachted = true;
- $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId },true);
+ $rootScope.$broadcast('reloadDABodyViewEvent', { reloadDABodyViewId: currentOpenViewId }, true);
}
else {
$rootScope.$broadcast('reloadDAControllerEvent', true);