diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index f4f94ee..9518b11 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -13,27 +13,39 @@
-
-
- @if (User) - { +
+ @if (User) + { +
Shape - } - else - { - - - } -
-
- -
+
+ } + else + { +
+
Shape
+
+
+ @foreach (var i in CurrFrameWindow.ShapeList) + { +
+ +
+ @*
+ +
*@ + } +
+ }
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 7af249d..83098f0 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -66,7 +66,7 @@ namespace WebWindowComplex.Compo #region Protected Properties - private string GetImagePath(string fileName) => $"/Icone/Shape/{fileName}.png"; + private string GetImagePath(string fileName) => $"_content/Egw.Lux.WebWindowComplex/icone/shape/{fileName}.svg"; /// /// Metodo per selezionare shape @@ -74,28 +74,28 @@ namespace WebWindowComplex.Compo protected int SelShapeIndex { get => CurrFrameWindow.SelShapeIndex; - set - { - if (CurrFrameWindow.SelShapeIndex != value) - { - CurrFrameWindow.SelShapeIndex = value; - // richiesta reset dict shape, profili element e hw option - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape}); - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetHwOpt }); - foreach (var s in SashGroupList) - { - s.SelHardwareFromId = "000000"; - } - var args = new DataUpdateFrame() - { - currFrame = CurrFrameWindow, - svgNoHw = true - }; - _ = EC_ReqElement.InvokeAsync(CurrFrameWindow); - _ = EC_UpdateFrame.InvokeAsync(args); - } - } + //set + //{ + // if (CurrFrameWindow.SelShapeIndex != value) + // { + // CurrFrameWindow.SelShapeIndex = value; + // // richiesta reset dict shape, profili element e hw option + // _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape }); + // _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + // _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetHwOpt }); + // foreach (var s in SashGroupList) + // { + // s.SelHardwareFromId = "000000"; + // } + // var args = new DataUpdateFrame() + // { + // currFrame = CurrFrameWindow, + // svgNoHw = true + // }; + // _ = EC_ReqElement.InvokeAsync(CurrFrameWindow); + // _ = EC_UpdateFrame.InvokeAsync(args); + // } + //} } /// @@ -153,36 +153,38 @@ namespace WebWindowComplex.Compo } } - //protected WindowConst.Joints? ChangeAllJoints - //{ - // get - // { - // WindowConst.Joints j = CurrFrameWindow.JointList.First().SelJointType; - // foreach (Joint joint in CurrFrameWindow.JointList) - // { - // if (joint.SelJointType != j) - // return null; - // } - // return j; - // } - // set - // { - // if(value != null) - // { - // foreach (Joint joint in CurrFrameWindow.JointList) - // { - // joint.SelJointType = (WindowConst.Joints)value; - // } - // var args = new DataUpdateFrame() { currFrame = CurrFrameWindow, svgNoHw = false }; - // _= EC_UpdateFrame.InvokeAsync(args); - // } - // } - //} - #endregion Protected Properties #region Private Methods + /// + /// Metodo per selezione shape frame + /// + /// + /// + protected async Task SelShapeFrame(int newShapeIndex) + { + if (CurrFrameWindow.SelShapeIndex != newShapeIndex) + { + CurrFrameWindow.SelShapeIndex = newShapeIndex; + // richiesta reset dict shape, profili element e hw option + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetHwOpt }); + foreach (var s in SashGroupList) + { + s.SelHardwareFromId = "000000"; + } + var args = new DataUpdateFrame() + { + currFrame = CurrFrameWindow, + svgNoHw = true + }; + await EC_ReqElement.InvokeAsync(CurrFrameWindow); + await EC_UpdateFrame.InvokeAsync(args); + } + } + /// /// Metodo per aggiungere sash nel frame /// @@ -371,6 +373,19 @@ namespace WebWindowComplex.Compo return ans; } + /// + /// Metodo per la visualizzazione dei pulsanti shape + /// + /// + /// + private string ButtonShapeCss(int index) + { + string ans = ""; + if (SelShapeIndex == index) + ans = "active"; + return ans; + } + /// /// Metodo per la visualizzazione dei pulsanti joint /// diff --git a/WebWindowComplex/Compo/General.razor b/WebWindowComplex/Compo/General.razor index 7edc1f2..6533afc 100644 --- a/WebWindowComplex/Compo/General.razor +++ b/WebWindowComplex/Compo/General.razor @@ -12,9 +12,6 @@
-
- -
@if (User) diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs index 63f095e..26067be 100644 --- a/WebWindowComplex/Models/Frame.cs +++ b/WebWindowComplex/Models/Frame.cs @@ -327,7 +327,7 @@ namespace WebWindowComplex.Models Sash? SashArea = null; if(AreaList.First() is Sash) SashArea = (Sash)AreaList.First(); - else if (AreaList.First().AreaList.Last().AreaList.First() is Sash) + else if (AreaList.First().AreaList.Count > 0 && AreaList.First().AreaList.Last().AreaList.First() is Sash) SashArea = (Sash)AreaList.First().AreaList.Last().AreaList.First(); if (SashArea != null && SashArea.SashList.FirstOrDefault() != null) { diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index f9c58bf..e95b3b2 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.413 + 3.1.8.510 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -198,6 +198,21 @@ + + + + + + + + + + + + + + + diff --git a/WebWindowComplex/wwwroot/icone/shape/Arc Full.svg b/WebWindowComplex/wwwroot/icone/shape/Arc Full.svg new file mode 100644 index 0000000..4ba78da --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Arc Full.svg @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Arc.svg b/WebWindowComplex/wwwroot/icone/shape/Arc.svg new file mode 100644 index 0000000..b538fa3 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Arc.svg @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Double Arc.svg b/WebWindowComplex/wwwroot/icone/shape/Double Arc.svg new file mode 100644 index 0000000..08ada5b --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Double Arc.svg @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png b/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png deleted file mode 100644 index e299569..0000000 Binary files a/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png and /dev/null differ diff --git a/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.svg b/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.svg new file mode 100644 index 0000000..27d992f --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png b/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png deleted file mode 100644 index ab547d7..0000000 Binary files a/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png and /dev/null differ diff --git a/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.svg b/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.svg new file mode 100644 index 0000000..ffdb57d --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Rectangle.png b/WebWindowComplex/wwwroot/icone/shape/Rectangle.png deleted file mode 100644 index 18ce29d..0000000 Binary files a/WebWindowComplex/wwwroot/icone/shape/Rectangle.png and /dev/null differ diff --git a/WebWindowComplex/wwwroot/icone/shape/Rectangle.svg b/WebWindowComplex/wwwroot/icone/shape/Rectangle.svg new file mode 100644 index 0000000..da440b0 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Rectangle.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Right Chamfer.svg b/WebWindowComplex/wwwroot/icone/shape/Right Chamfer.svg new file mode 100644 index 0000000..5fd0409 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Right Chamfer.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Three Center Arc.svg b/WebWindowComplex/wwwroot/icone/shape/Three Center Arc.svg new file mode 100644 index 0000000..47a194a --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Three Center Arc.svg @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/WebWindowComplex/wwwroot/icone/shape/Triangle.svg b/WebWindowComplex/wwwroot/icone/shape/Triangle.svg new file mode 100644 index 0000000..a569d21 --- /dev/null +++ b/WebWindowComplex/wwwroot/icone/shape/Triangle.svg @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index b40a6d8..ed9b3db 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.413 + 3.1.8.510 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -298,6 +298,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +