diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 9029445..d594db2 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -119,7 +119,7 @@ namespace Test.UI.Components.Pages protected override async Task OnInitializedAsync() { ConfInit(); - InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd"); + InitialJwd = File.ReadAllText("Data\\AntaSingola.jwd"); currJwd = InitialJwd; // rileggo altri dati await ReloadData(); diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 61b7b7f..daa1816 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -1,7 +1,7 @@ { "ProfilePath": "Profilo78", "Material": "Pino", - "ColorMaterial": "Nero", + "ColorMaterial": "Black", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { @@ -75,7 +75,7 @@ "JointType": "FULL_V" } ], - "Hardware": "000656", + "Hardware": "000631", "IdGroup": 2, "AreaList": [ { diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd index 30b8f1a..60f3330 100644 --- a/Test.UI/Data/AntaSingola.jwd +++ b/Test.UI/Data/AntaSingola.jwd @@ -69,7 +69,7 @@ "JointType": "FULL_H" } ], - "Hardware": "000665", + "Hardware": "000635", "IdGroup": 2, "AreaList": [ { diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd index 9311e7b..f36e5e4 100644 --- a/Test.UI/Data/FinDueAnteBottomFisso.jwd +++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd @@ -106,7 +106,7 @@ "JointType": "FULL_H" } ], - "Hardware": "000656", + "Hardware": "000631", "IdGroup": 6, "AreaList": [ { diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor index 6ac3587..7445425 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor +++ b/WebWindowComplex/Compo/CardSashGroup.razor @@ -69,7 +69,6 @@ { } -
diff --git a/WebWindowComplex/Compo/CardSplit.razor b/WebWindowComplex/Compo/CardSplit.razor index 3c266d7..f2fa5e4 100644 --- a/WebWindowComplex/Compo/CardSplit.razor +++ b/WebWindowComplex/Compo/CardSplit.razor @@ -11,7 +11,7 @@
-
+
Split
diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 94b377f..c60fe9b 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -398,15 +398,9 @@ namespace WebWindowComplex.Json } foreach (var Joint in m_JointList) newSash.JointList.Add(Joint.Deserialize((Area)ParentArea)); - newSash.SetSelHardwareFromId(Hardware); newSash.SetSelFamilyHardwareFromIndex(Hardware); newSash.RefreshHardwareList(); - //if(Hardware != null && !Hardware.Equals("")) - // newSash.SetSelHardwareFromId(Hardware); - //else - newSash.SetSelHardwareFromId(newSash.SelHardware.Id); - //if (newSash.HardwareList.Count() > 0) - // newSash.SetSelHardwareFromId(newSash.HardwareList.First().Id); + newSash.SetSelHardwareFromId(Hardware); foreach (var Area in AreaList) { var AreaDeserealized = Area.Deserialize(newSash, ParentWindow); diff --git a/WebWindowComplex/Models/Fill.cs b/WebWindowComplex/Models/Fill.cs index 2651fa4..5fe8ee1 100644 --- a/WebWindowComplex/Models/Fill.cs +++ b/WebWindowComplex/Models/Fill.cs @@ -106,7 +106,7 @@ namespace WebWindowComplex.Models private List m_FillTypeList = new List { - new IdNameStruct((int)FillTypes.GLASS, "SvgPreview"), + new IdNameStruct((int)FillTypes.GLASS, "Glass"), new IdNameStruct((int)FillTypes.WOOD, "Wood") }; diff --git a/WebWindowComplex/Models/FrameDimension.cs b/WebWindowComplex/Models/FrameDimension.cs index 6028b5d..66fa6a8 100644 --- a/WebWindowComplex/Models/FrameDimension.cs +++ b/WebWindowComplex/Models/FrameDimension.cs @@ -97,9 +97,9 @@ namespace WebWindowComplex.Models private string m_sName; - // valore massimo e minimo della dimensione del frame + // valore massimo della dimensione del frame private int MaxDim = 4000; - + // valore minimo della dimensione del frame private int MinDim = 600; #endregion Private Fields diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index c2dea74..67c8924 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -133,7 +133,7 @@ namespace WebWindowComplex.Models dLastDimension += m_SashList[SashList.Count - 1].dDimension; SashList[SashList.Count - 1].SetDimension(dLastDimension); if (value == 1) - SashList[0].SetHasHandle(true); + SashList.First().SetHasHandle(true); } else { @@ -142,11 +142,11 @@ namespace WebWindowComplex.Models } if (m_SashList.Count == 0) { - Area child = AreaList[0]; + Area child = AreaList.First(); // Se nella singola anta ho uno split if (!(child is Fill)) { - child = child.AreaList[0].AreaList[0]; + child = child.AreaList.First().AreaList.First(); } child.SetParentArea(this.ParentArea); this.ParentArea.AreaList.Remove(this); @@ -157,10 +157,10 @@ namespace WebWindowComplex.Models { // Metto come padre dell'area nello splitted l'anta stessa List ContentArea = new List(); - ContentArea.Add(AreaList[0].AreaList[0]); - ContentArea[0].SetParentArea(this); + ContentArea.Add(AreaList.First().AreaList.First()); + ContentArea.First().SetParentArea(this); AreaList.Clear(); - AreaList.Add(ContentArea[0]); + AreaList.Add(ContentArea.First()); } else { @@ -174,7 +174,7 @@ namespace WebWindowComplex.Models foreach (Area area in AreaList) { if (area is Splitted) - ContentArea.Add(area.AreaList[0]); + ContentArea.Add(area.AreaList.First()); else ContentArea.Add(area); } @@ -637,7 +637,7 @@ namespace WebWindowComplex.Models { if (m_HardwareList.Count > 0) { - m_SelHardware = m_HardwareList[0]; + m_SelHardware = m_HardwareList.First(); } } @@ -732,8 +732,8 @@ namespace WebWindowComplex.Models SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0); else SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0); - if (SelHardware == null) - SelHardware = m_HardwareList[0]; + if (SelHardware.Id == "") + SelHardware = m_HardwareList.First(); //SelFamilyHardware = m_SelHardware.FamilyName; } @@ -788,7 +788,7 @@ namespace WebWindowComplex.Models } else { - answ = GetOpeningType(m_SashList[0].OpeningType); + answ = GetOpeningType(m_SashList.First().OpeningType); } return answ; } diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index df18735..8481927 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -319,7 +319,11 @@ namespace WebWindowComplex.Models newSplit.SetIdGroup(nCounterGroup); newSplit.SetSplitStartVert(bSplitStartVert); newSplit.SetSplitQtyVert(nSplitQtyVert); + for (int i = 0; i < SplitVertList.Count; i++) + newSplit.SplitVertList.ElementAt(i).SetDimension(SplitVertList.ElementAt(i).dDimension); newSplit.SetSplitQtyHoriz(nSplitQtyHoriz); + for (int i = 0; i < SplitHorizList.Count; i++) + newSplit.SplitHorizList.ElementAt(i).SetDimension(SplitHorizList.ElementAt(i).dDimension); newSplit.SetSplitShape(SelSplitShape, true); newSplit.SetAreaType(AreaType); foreach (var item in AreaList) diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index f2f25d8..1095e49 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -26,7 +26,6 @@
Errore configurazione:
-
    @foreach (var item in listErrLink) { @@ -135,8 +134,7 @@ } else { - Split item = SplitList[currSplit]; - + } } else if (currStep == CompileStep.Sash) @@ -179,7 +177,6 @@
    Mancata corrispondenza valori:
    -
      @foreach (var item in listWarnings) { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 2e82687..f4c3382 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -279,8 +279,8 @@ namespace WebWindowComplex } case AreaTypes.FILL: { - if ((node.ParentArea.AreaList.Count > 1 && node.ParentArea.AreaList[0].Equals(node)) || - (node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1 && node.ParentArea.ParentArea.AreaList[0].AreaList[0].Equals(node))) + if ((node.ParentArea.AreaList.Count > 1 && node.ParentArea.AreaList.First().Equals(node)) || + (node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1 && node.ParentArea.ParentArea.AreaList.First().AreaList.First().Equals(node))) maxCol++; string nFill; for (int i = 0; i < FillList.Count; i++) @@ -302,7 +302,7 @@ namespace WebWindowComplex // Se il nodo ha fratelli o cugini if (node.ParentArea.AreaList.Count > 1 || (node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1)) { - if (node.ParentArea.AreaList[0].Equals(node) || node.ParentArea.ParentArea.AreaList[0].Equals(node)) + if (node.ParentArea.AreaList.First().Equals(node) || node.ParentArea.ParentArea.AreaList.First().Equals(node)) maxCol++; for (int i = 0; i < SplitList.Count; i++) { @@ -394,7 +394,7 @@ namespace WebWindowComplex } case AreaTypes.SPLITTED: { - if (node.ParentArea is Split && !IntoSash && node.AreaList[0] is Fill) + if (node.ParentArea is Split && !IntoSash && node.AreaList.First() is Fill) { m_SplittedList.Add((Splitted)node); } @@ -608,9 +608,9 @@ namespace WebWindowComplex if (m_PreviousWindow != null) { for (int i = 0; i < 2; i++) - m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i]; + m_CurrWindow.AreaList.First().DimensionList[i] = m_PreviousWindow.AreaList.First().DimensionList[i]; for (int i = 0; i < 4; i++) - m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i]; + m_CurrWindow.AreaList.First().JointList[i] = m_PreviousWindow.AreaList.First().JointList[i]; } if (m_CurrWindow != null) { @@ -633,8 +633,8 @@ namespace WebWindowComplex m_SplitList = new List(); m_SplittedList = new List(); m_ItemTableList = new List(); - CreateWindowsList((m_CurrWindow!).AreaList[0], false); - CreateElementTable(m_CurrWindow.AreaList[0], 1, 1, 1, 1); + CreateWindowsList((m_CurrWindow!).AreaList.First(), false); + CreateElementTable(m_CurrWindow.AreaList.First(), 1, 1, 1, 1); } /// diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index d03b3f8..0eec1e1 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1414 + 2.7.10.1511 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -49,4 +49,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index a6c8d1e..4a186d5 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1414 + 2.7.10.1511 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -56,6 +56,23 @@ + + + + + + + + + + + + + + + + +