diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor index ce25c5a..41c6098 100644 --- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor @@ -26,27 +26,26 @@ - @if (ShowPlusMinus) - { - - - } - else if (ShowClone) + @*@if (ShowClone) { - } + }*@ @if (ShowPlusMinus) { - - - - - - - + + @* + *@ + + + + + + + + - + } else if (ShowClone) { diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.cs b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.cs index e0d8dc0..6e3d87a 100644 --- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.cs @@ -12,7 +12,6 @@ namespace WebDoorCreator.UI.Components.SvgComp DuplicateCurr, Minus, Plus, - RecallTemplate, SaveTemplate, Select } @@ -50,9 +49,9 @@ namespace WebDoorCreator.UI.Components.SvgComp [Parameter] - public string PlusColor { get; set; } = "green"; + public string PlusColor { get; set; } = "#69EF69"; [Parameter] - public string MinusColor { get; set; } = "red"; + public string MinusColor { get; set; } = "#EF6969"; [Parameter] public int ObjH { get; set; } = 204; @@ -88,6 +87,9 @@ namespace WebDoorCreator.UI.Components.SvgComp protected CircleData CircleImg { get; set; } = null!; protected CircleData CircleLine { get; set; } = null!; + protected CircleData CirclePlus { get; set; } = null!; + protected CircleData CircleMinus { get; set; } = null!; + protected CircleData CircleOpt { get; set; } = null!; protected int LineDist { get; set; } = 20; @@ -201,12 +203,18 @@ namespace WebDoorCreator.UI.Components.SvgComp private void setupGraphParams() { - // calcolo i dati del cerchi... - CircleLine = new CircleData(ObjW - LineWidth - (ObjH / 2), ObjH / 2, (ObjH - LineWidth) / 2); - CircleImg = new CircleData(ObjW - LineWidth - (ObjH / 2), ObjH / 2, (ObjH - 2 * LineWidth) / 2); + // calcolo dati lineari BaseLine = new LineData(new PointData(0, ObjH - LineWidth / 2), new PointData(ObjW - LineWidth - (ObjH / 2), ObjH - LineWidth / 2)); ClickArea = new LineData(new PointData(ObjW - LineWidth - ObjH, 0), new PointData(ObjW, 0)); LineDist = ObjH / 4; + // calcolo i dati del cerchi... + CircleLine = new CircleData(ObjW - LineWidth - (ObjH / 2), ObjH / 2, (ObjH - LineWidth) / 2); + CircleImg = new CircleData(ObjW - LineWidth - (ObjH / 2), ObjH / 2, (ObjH - 2 * LineWidth) / 2); + int dCX = CircleLine.rad * 3 / 4; + int dCY = CircleLine.rad * 4 / 6; + CirclePlus = new CircleData(CircleLine.cx + dCX, CircleLine.cy - dCY, CircleLine.rad / 3); + CircleMinus = new CircleData(CircleLine.cx + dCX, CircleLine.cy + dCY, CircleLine.rad / 3); + CircleOpt = new CircleData(CircleLine.cx - dCX, CircleLine.cy - dCY, CircleLine.rad / 3); } #endregion Private Methods diff --git a/WebDoorCreator.UI/Pages/TestPage.razor b/WebDoorCreator.UI/Pages/TestPage.razor index 09c2aa8..ed3d895 100644 --- a/WebDoorCreator.UI/Pages/TestPage.razor +++ b/WebDoorCreator.UI/Pages/TestPage.razor @@ -18,12 +18,13 @@ }
- @*
-
*@ -
- +
+
-
+
+ +
+