From edff91caedcaafa8635504ce65b723ee92cd39ce Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 May 2023 13:30:14 +0200 Subject: [PATCH 1/4] Update homecard bezier --- .../Components/SvgComp/HomeCard.razor | 37 +++++++------------ .../Components/SvgComp/HomeCard.razor.cs | 12 +----- WebDoorCreator.UI/Pages/Index.razor | 7 +++- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor index 0668ec9..89e0bbd 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor @@ -1,27 +1,18 @@  - - -
- @foreach (var item in TextData) - { -
- @item.Key -
-
- @item.Value -
- } -
- - - - - - - - - + + + - + + +
+
+ Web Door Creator +
+
+ The new way to create doors +
+
+ diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs index 465c2e4..1d61fb1 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs @@ -27,21 +27,13 @@ namespace WebDoorCreator.UI.Components.SvgComp [Parameter] public int ObjW { get; set; } = 450; - [Parameter] - public Dictionary TextData { get; set; } = new Dictionary(); - [Parameter] public string TextStyle { get; set; } = "font-size: 1.5em; fill: #000;"; [Parameter] - public string Message1 { get; set; } = ""; + public string TitleClass { get; set; } = "fs-1"; [Parameter] - public string Message2 { get; set; } = ""; - - [Parameter] - public string LeftTextClass { get; set; } = ""; - [Parameter] - public string RightTextClass { get; set; } = ""; + public string BodyClass { get; set; } = "fs-5"; #endregion Public Properties diff --git a/WebDoorCreator.UI/Pages/Index.razor b/WebDoorCreator.UI/Pages/Index.razor index baa924b..28777a9 100644 --- a/WebDoorCreator.UI/Pages/Index.razor +++ b/WebDoorCreator.UI/Pages/Index.razor @@ -2,8 +2,11 @@ Index -
+ + + +@*
Web Door Creator
-
\ No newline at end of file +
*@ \ No newline at end of file From 2f410275c43dc14797d1d4c97af2a772feda111e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 May 2023 14:20:40 +0200 Subject: [PATCH 2/4] Completata prima review home box --- .../Components/SvgComp/DoorSvgObj.razor | 2 ++ .../Components/SvgComp/HomeCard.razor | 29 ++++++++++++------- .../Components/SvgComp/HomeCard.razor.cs | 7 ++--- WebDoorCreator.UI/Pages/Index.razor | 4 ++- WebDoorCreator.UI/temp/Conf.yaml | 28 +++++------------- 5 files changed, 34 insertions(+), 36 deletions(-) diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor index 0668ec9..afca389 100644 --- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor @@ -1,4 +1,6 @@  + +
diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor index 89e0bbd..256e1d8 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor @@ -1,18 +1,27 @@  - + + - -
-
- Web Door Creator + + + +
+
+ Web Door Creator +
+
+ The new way to create doors +
+
+ +
-
- The new way to create doors -
-
- + + diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs index 1d61fb1..46bb4bd 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs @@ -28,12 +28,9 @@ namespace WebDoorCreator.UI.Components.SvgComp public int ObjW { get; set; } = 450; [Parameter] - public string TextStyle { get; set; } = "font-size: 1.5em; fill: #000;"; - + public string TitleStyle { get; set; } = "font-size: 5em;"; [Parameter] - public string TitleClass { get; set; } = "fs-1"; - [Parameter] - public string BodyClass { get; set; } = "fs-5"; + public string BodyStyle { get; set; } = "font-size: 2em;"; #endregion Public Properties diff --git a/WebDoorCreator.UI/Pages/Index.razor b/WebDoorCreator.UI/Pages/Index.razor index 28777a9..da1fc26 100644 --- a/WebDoorCreator.UI/Pages/Index.razor +++ b/WebDoorCreator.UI/Pages/Index.razor @@ -3,7 +3,9 @@ Index - +
+ +
@*
diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml index c93667b..b62a767 100644 --- a/WebDoorCreator.UI/temp/Conf.yaml +++ b/WebDoorCreator.UI/temp/Conf.yaml @@ -15,12 +15,12 @@ order: date: 2023-05-10T00:00:00.0000000Z piece: DO_1 properties: Oak -finishing: Veneer +finishing: Varnishing size: - width: 33.81 - height: 81 + width: 33.8125 + height: 81.25 thickness: 1.75 -swing: RHRI +swing: LH secure: UP material: wood profiles: @@ -41,22 +41,10 @@ profiles: machining: ON overmaterial: 0.1 hardware: - flush_pulls: - - template: Generic\Circle - position: 35 - back_set: 6 - depth: 1 - face: secure - - template: Generic\Circle - position: 35 - back_set: 5 - depth: 1 - face: secure - - template: Generic\Circle - position: 35 - back_set: 5 - depth: 1 - face: secure + ept: + - template: Generic\StdEPT + ToptoCL: 15 + FacetoCL: 0.875 --- From 59b3a487326f0fd519c65c981cf6a71997a0a409 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 May 2023 15:02:09 +0200 Subject: [PATCH 3/4] Start parametrizzazione componente --- .../Components/SvgComp/DoorSvgObj.razor | 1 - .../Components/SvgComp/HomeCard.razor | 12 +- .../Components/SvgComp/HomeCard.razor.cs | 104 ++++++------------ WebDoorCreator.UI/Pages/Index.razor | 2 +- 4 files changed, 41 insertions(+), 78 deletions(-) diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor index afca389..c49079b 100644 --- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor +++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor @@ -1,6 +1,5 @@  -
diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor index 256e1d8..6d86d0f 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor @@ -1,24 +1,24 @@  - + - - + +
- Web Door Creator + @TitleText
- The new way to create doors + @BodyText
diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs index 46bb4bd..80a55ba 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs @@ -6,17 +6,26 @@ namespace WebDoorCreator.UI.Components.SvgComp { #region Public Properties + [Parameter] + public string BodyStyle { get; set; } = "font-size: 2em;"; + + [Parameter] + public string BodyText { get; set; } = "Body Text"; + + [Parameter] + public string ButtonText { get; set; } = "Button Text"; + [Parameter] public EventCallback EC_ExeFunct { get; set; } [Parameter] - public string ImagePath { get; set; } = "images/LogoEgw.png"; + public string ImagePath { get; set; } = "images/DOORBG.png"; [Parameter] - public string LineColor { get; set; } = "#00838F"; + public string LineColor { get; set; } = "#3989CC"; [Parameter] - public int LineWidth { get; set; } = 8; + public int LineWidth { get; set; } = 16; [Parameter] public int ObjH { get; set; } = 204; @@ -29,29 +38,34 @@ namespace WebDoorCreator.UI.Components.SvgComp [Parameter] public string TitleStyle { get; set; } = "font-size: 5em;"; + [Parameter] - public string BodyStyle { get; set; } = "font-size: 2em;"; + public string TitleText { get; set; } = "Title Text"; #endregion Public Properties #region Protected Properties - protected LineData BaseLine { get; set; } = null!; + protected List PathClip { get; set; } = null!; - protected CircleData CircleImg { get; set; } = null!; - - protected CircleData CircleLine { get; set; } = null!; - - protected int LineDist { get; set; } = 20; - - protected int TextAreaHeight + protected string PathClipData { - get => (ObjH * 96 / 100); + get + { + string path = $"{PathLineData} L1200,0 L1920,0 L1920,1080 L900,1080 Z"; + return path; + } } - protected int TextAreaWidth + protected List PathLine { get; set; } = null!; + + protected string PathLineData { - get => ObjW - (ObjH * 120 / 100); + get + { + string path = "M900,1080 Q925,680 1050,540 1175,400 1200,0"; + return path; + } } #endregion Protected Properties @@ -68,52 +82,15 @@ namespace WebDoorCreator.UI.Components.SvgComp setupGraphParams(); } + protected void setupGraphParams() + { + // calcolo i dati necessari a disegnare + } + #endregion Protected Methods #region Protected Classes - protected class CircleData - { - #region Public Constructors - - public CircleData(int px, int py, int radius) - { - cx = px; - cy = py; - rad = radius; - } - - #endregion Public Constructors - - #region Public Properties - - public int cx { get; set; } = 0; - public int cy { get; set; } = 0; - public int rad { get; set; } = 100; - - #endregion Public Properties - } - - protected class LineData - { - #region Public Constructors - - public LineData(PointData pA, PointData pB) - { - p1 = pA; - p2 = pB; - } - - #endregion Public Constructors - - #region Public Properties - - public PointData p1 { get; set; } - public PointData p2 { get; set; } - - #endregion Public Properties - } - protected class PointData { #region Public Constructors @@ -135,18 +112,5 @@ namespace WebDoorCreator.UI.Components.SvgComp } #endregion Protected Classes - - #region Private Methods - - 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); - BaseLine = new LineData(new PointData(0, ObjH - LineWidth / 2), new PointData(ObjW - LineWidth - (ObjH / 2), ObjH - LineWidth / 2)); - LineDist = ObjH / 4; - } - - #endregion Private Methods } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/Index.razor b/WebDoorCreator.UI/Pages/Index.razor index da1fc26..639aa75 100644 --- a/WebDoorCreator.UI/Pages/Index.razor +++ b/WebDoorCreator.UI/Pages/Index.razor @@ -4,7 +4,7 @@
- +
@*
From 4c5ac0ada4ac236f07541348c73def40dcadd134 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 May 2023 15:23:51 +0200 Subject: [PATCH 4/4] Versione parametrica home placard OK --- .../Components/SvgComp/HomeCard.razor.cs | 41 ++++++++++++++++++- WebDoorCreator.UI/Pages/Index.razor | 8 +--- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs index 80a55ba..79f3c92 100644 --- a/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs +++ b/WebDoorCreator.UI/Components/SvgComp/HomeCard.razor.cs @@ -36,6 +36,9 @@ namespace WebDoorCreator.UI.Components.SvgComp [Parameter] public int ObjW { get; set; } = 450; + [Parameter] + public int StartPoint { get; set; } = 220; + [Parameter] public string TitleStyle { get; set; } = "font-size: 5em;"; @@ -52,7 +55,16 @@ namespace WebDoorCreator.UI.Components.SvgComp { get { - string path = $"{PathLineData} L1200,0 L1920,0 L1920,1080 L900,1080 Z"; + //string path = $"{PathLineData} L1200,0 L1920,0 L1920,1080 L900,1080 Z"; + string path = PathLineData; + if (pathClipCloseList.Count > 0) + { + for (int i = 0; i < pathClipCloseList.Count; i++) + { + path += $" L{pathClipCloseList[i].px},{pathClipCloseList[i].py}"; + } + } + path += " Z"; return path; } } @@ -63,7 +75,15 @@ namespace WebDoorCreator.UI.Components.SvgComp { get { - string path = "M900,1080 Q925,680 1050,540 1175,400 1200,0"; + string path = ""; + if (pathPointList.Count > 0) + { + path = $"M{pathPointList[0].px},{pathPointList[0].py} Q"; + for (int i = 1; i < pathPointList.Count; i++) + { + path += $" {pathPointList[i].px},{pathPointList[i].py}"; + } + } return path; } } @@ -85,8 +105,25 @@ namespace WebDoorCreator.UI.Components.SvgComp protected void setupGraphParams() { // calcolo i dati necessari a disegnare + int deltaX = 20; + int deltaY = 400; + // inizio aggiungendo punti parametrici + pathPointList.Add(new PointData(StartPoint, ObjH)); + pathPointList.Add(new PointData(StartPoint + deltaX, ObjH - deltaY)); + pathPointList.Add(new PointData(ObjW / 2, ObjH / 2)); + pathPointList.Add(new PointData(ObjW - (StartPoint + deltaX), deltaY)); + pathPointList.Add(new PointData(ObjW - StartPoint, 0)); + // ora provvedo x la parte clip + pathClipCloseList.Add(new PointData(ObjW - StartPoint, 0)); + pathClipCloseList.Add(new PointData(ObjW, 0)); + pathClipCloseList.Add(new PointData(ObjW, ObjH)); + pathClipCloseList.Add(new PointData(StartPoint, ObjH)); + } + protected List pathPointList = new List(); + protected List pathClipCloseList = new List(); + #endregion Protected Methods #region Protected Classes diff --git a/WebDoorCreator.UI/Pages/Index.razor b/WebDoorCreator.UI/Pages/Index.razor index 639aa75..fc1637b 100644 --- a/WebDoorCreator.UI/Pages/Index.razor +++ b/WebDoorCreator.UI/Pages/Index.razor @@ -4,11 +4,5 @@
- +
- -@*
-
-
Web Door Creator
-
-
*@ \ No newline at end of file