ADAM / AIAHTML5

Commit 538312a10369a408e048ec8449ffa3dabc8f4b90

Authored by Amrita Vishnoi
2 parents 5c37396d e722dcde

Fixed after conflict resolve

Inline Side-by-side
Showing 2 changed files with 41 additions and 33 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @538312a
... ... @@ -459,29 +459,34 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
459 459  
460 460 $rootScope.setPropertiesForShapes = function (id) {
461 461  
462   - document.getElementById('modelbackground').style.display = "none";
463   - document.getElementById('modeleditstyle').style.display = "none";
  462 +
  463 + if ((document.getElementById('fill-option').checked == false) && (document.getElementById('Outline-Option').checked == false)) {
  464 + // $('#btnShapeStyle').attr('disabled', 'disabled');
  465 + } else {
  466 + //$('#btnShapeStyle').removeAttr('disabled', 'disabled');
  467 + document.getElementById('modelbackground').style.display = "none";
  468 + document.getElementById('modeleditstyle').style.display = "none";
464 469  
465   - $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
466   - $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
467   - $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
468   - $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
469   - $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
470   - $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
471   - $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
472   - $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
473   - var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
474   - var intPart = pixelSeparation.split("p");
  470 + $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
  471 + $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
  472 + $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
  473 + $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
  474 + $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
  475 + $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
  476 + $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
  477 + $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
  478 + var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
  479 + var intPart = pixelSeparation.split("p");
475 480  
476   - $rootScope.shapestyleborderWidth = intPart[0];
477   - $rootScope.shapestyleborderStyles = "solid";
  481 + $rootScope.shapestyleborderWidth = intPart[0];
  482 + $rootScope.shapestyleborderStyles = "solid";
478 483  
479 484  
480   - $('#editshapestyle').modal('hide');
  485 + $('#editshapestyle').modal('hide');
481 486  
482   - //Edit Shape Style popup should open at it's default position
483   - $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
484   -
  487 + //Edit Shape Style popup should open at it's default position
  488 + $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
  489 + }
485 490 }
486 491  
487 492 $rootScope.enableAnnotationToolBar = function () {
... ... @@ -591,7 +596,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
591 596 $('.btnCursor').addClass('activebtncolor');
592 597 }
593 598  
594   - $rootScope.DrawRectangleOnOpenModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
  599 + $rootScope.DrawRectangleOnModuleItem = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
595 600  
596 601 $(canvasId).addLayer({
597 602 layer: true,
... ... @@ -1161,7 +1166,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1161 1166  
1162 1167 case "Rectangle":
1163 1168 $rootScope.rectNumber = $rootScope.ObjectIndex++;
1164   - $rootScope.DrawRectangleOnOpenModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
  1169 + $rootScope.DrawRectangleOnModuleItem('#canvas', $rootScope.rectNumber, $rootScope.shapestyleFillColor, $rootScope.shapestyleborderColor, $rootScope.shapestyleOpacity, $rootScope.shapestyleborderWidth, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y);
1165 1170  
1166 1171 break;
1167 1172  
... ... @@ -1202,12 +1207,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1202 1207 //}
1203 1208  
1204 1209 }
1205   -
1206   -
1207   -
1208   -
1209   -
1210   -
1211 1210 ///-----
1212 1211  
1213 1212 $rootScope.saveText = function () {
... ... @@ -1836,7 +1835,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1836 1835 $rootScope.switchCanvas();
1837 1836 $("#annotationpaintbrushsize").attr("href", "#");
1838 1837 console.log('ShowListManager')
1839   -
1840 1838 $rootScope.disableAnnotationtoolOnListManager = true;
1841 1839 $('#AnnotaionPopupDiv').find('a,input, textarea, button, select,img,div').attr('disabled', 'disabled');
1842 1840 $('#slider-range-min-2').slider('disable');
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @538312a
... ... @@ -787,13 +787,13 @@
787 787 </div>
788 788 </div>
789 789 <div class="col-sm-6 enableDisableOpacity">
790   - <div class="radio">
  790 + <!--<div class="radio">
791 791 <label>
792 792 <input type="radio" name="filloption" id="filloption1" value="filloption1">
793 793 <span class="">Texture</span>
794 794 <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
795 795 </label>
796   - </div>
  796 + </div>-->
797 797 <div class="radio">
798 798 <label>
799 799 <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
... ... @@ -886,7 +886,7 @@
886 886 </div>
887 887 </div>
888 888 <div class="modal-footer">
889   - <button type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
  889 + <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
890 890 OK
891 891 </button>
892 892 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
... ... @@ -1018,12 +1018,17 @@
1018 1018 </div>-->
1019 1019  
1020 1020 <script>
  1021 +
1021 1022 function enableDisableFillOption() {
1022   -
  1023 + //debugger;
1023 1024 if (document.getElementById('fill-option').checked) {
1024   -
  1025 + // $('#imgOpacity').attr("background-color");
  1026 + //$('#imgOpacity').css({"background-color"})
1025 1027 //$("#filloption1").css({ "pointer-events": "auto" });
1026 1028 //$("#filloption12").css({ "pointer-events": "auto" });
  1029 +
  1030 + var x = $("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color');
  1031 + $("#imgOpacity").css("background-color", x);
1027 1032 $("#edit-slider-3").css({ "pointer-events": "auto" });
1028 1033 $("#edit-slider-4").css({ "pointer-events": "auto" });
1029 1034 $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
... ... @@ -1039,7 +1044,7 @@
1039 1044  
1040 1045 }
1041 1046 else {
1042   -
  1047 + $('#imgOpacity').css("background-color","transparent");
1043 1048 //$("#filloption1").css({ "pointer-events": "none" });
1044 1049 //$("#filloption2").css({ "pointer-events": "none" });
1045 1050 $("#edit-slider-3").css({ "pointer-events": "none" });
... ... @@ -1061,12 +1066,17 @@
1061 1066 function enableDisableOutline() {
1062 1067  
1063 1068 if (document.getElementById('Outline-Option').checked) {
  1069 + var x = $("#outlineColor span.minicolors-swatch-color").css('background-color');
  1070 + $(".marginTopBtm10 div.outlinediv").css("border-color", x);
  1071 + // var borderWidth = $("#outlineColor span.minicolors-swatch-color").css('border-width');
  1072 + // $("#imgOpacity").css("border-width", borderWidth);
1064 1073  
1065 1074 $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
1066 1075 $("#outlineColor").css({ "pointer-events": "auto" });
1067 1076 $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" })
1068 1077 }
1069 1078 else {
  1079 + $('.marginTopBtm10 div.outlinediv').css("border-color", "transparent");
1070 1080 $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
1071 1081 $("#outlineColor").css({ "pointer-events": "none" });
1072 1082 $(".setEnableDisableForEditShapeStyle").css({ "opacity": ".5" })
... ...