Fixed after conflict resolve

Amrita Vishnoi
2 parents 5c37396d e722dcde
Showing 2 changed files with 41 additions and 33 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -459,29 +459,34 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.setPropertiesForShapes = function (id) {
-            document.getElementById('modelbackground').style.display = "none";
-            document.getElementById('modeleditstyle').style.display = "none";
+            
+            if ((document.getElementById('fill-option').checked == false) && (document.getElementById('Outline-Option').checked == false)) {
+              //  $('#btnShapeStyle').attr('disabled', 'disabled');
+            } else {
+                //$('#btnShapeStyle').removeAttr('disabled', 'disabled');
+                document.getElementById('modelbackground').style.display = "none";
+                document.getElementById('modeleditstyle').style.display = "none";
-            $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
-            $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
-            $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
-            $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
-            $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
-            $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
-            $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
-            $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
-            var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
-            var intPart = pixelSeparation.split("p");
+                $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
+                $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
+                $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
+                $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
+                $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
+                $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
+                $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
+                $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
+                var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
+                var intPart = pixelSeparation.split("p");
-            $rootScope.shapestyleborderWidth = intPart[0];
-            $rootScope.shapestyleborderStyles = "solid";
+                $rootScope.shapestyleborderWidth = intPart[0];
+                $rootScope.shapestyleborderStyles = "solid";
-            $('#editshapestyle').modal('hide');
+                $('#editshapestyle').modal('hide');
-            //Edit Shape Style popup should open at it's default position
-            $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
-
+                //Edit Shape Style popup should open at it's default position
+                $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
+            }
         }
         $rootScope.enableAnnotationToolBar = function () {
@@ -591,7 +596,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('.btnCursor').addClass('activebtncolor');
         }
-        $rootScope.DrawRectangleOnOpenModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
+        $rootScope.DrawRectangleOnModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
             $(canvasId).addLayer({
                 layer: true,
@@ -1161,7 +1166,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 case "Rectangle":
                     $rootScope.rectNumber = $rootScope.ObjectIndex++;
-                    $rootScope.DrawRectangleOnOpenModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
+                    $rootScope.DrawRectangleOnModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
                     break;
@@ -1202,12 +1207,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             //}
         }
-
-
-
-
-
-
         ///-----
         $rootScope.saveText = function () {
@@ -1836,7 +1835,6 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $rootScope.switchCanvas();
             $("#annotationpaintbrushsize").attr("href", "#");
             console.log('ShowListManager')
-          
             $rootScope.disableAnnotationtoolOnListManager = true;
             $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled');
             $('#slider-range-min-2').slider('disable');
@@ -787,13 +787,13 @@
                                 </div>
                             </div>
                             <div class="col-sm-6 enableDisableOpacity">
-                                <div class="radio">
+                                <!--<div class="radio">
                                     <label>
                                         <input type="radio" name="filloption" id="filloption1" value="filloption1">
                                         <span class="">Texture</span>
                                         <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
                                     </label>
-                                </div>
+                                </div>-->
                                 <div class="radio">
                                     <label>
                                         <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
@@ -886,7 +886,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
+                <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
                     OK
                 </button>
                 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
@@ -1018,12 +1018,17 @@
     </div>-->
     <script>
+    
         function enableDisableFillOption() {
-
+            //debugger;
             if (document.getElementById('fill-option').checked) {
-
+                // $('#imgOpacity').attr("background-color");
+                //$('#imgOpacity').css({"background-color"})
                 //$("#filloption1").css({ "pointer-events": "auto" });
                 //$("#filloption12").css({ "pointer-events": "auto" });
+            
+                var x = $("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color');
+                $("#imgOpacity").css("background-color", x);
                 $("#edit-slider-3").css({ "pointer-events": "auto" });
                 $("#edit-slider-4").css({ "pointer-events": "auto" });
                 $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
@@ -1039,7 +1044,7 @@
             }
             else {
-
+                $('#imgOpacity').css("background-color","transparent");
                 //$("#filloption1").css({ "pointer-events": "none" });
                 //$("#filloption2").css({ "pointer-events": "none" });
                 $("#edit-slider-3").css({ "pointer-events": "none" });
@@ -1061,12 +1066,17 @@
         function enableDisableOutline() {
             if (document.getElementById('Outline-Option').checked) {
+                var x = $("#outlineColor span.minicolors-swatch-color").css('background-color');
+                $(".marginTopBtm10 div.outlinediv").css("border-color", x);
+             //   var borderWidth = $("#outlineColor span.minicolors-swatch-color").css('border-width');
+               // $("#imgOpacity").css("border-width", borderWidth);
                 $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
                 $("#outlineColor").css({ "pointer-events": "auto" });
                 $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" })
             }
             else {
+                $('.marginTopBtm10 div.outlinediv').css("border-color", "transparent");
                 $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
                 $("#outlineColor").css({ "pointer-events": "none" });
                 $(".setEnableDisableForEditShapeStyle").css({ "opacity": ".5" })