diff --git a/WebWindowComplex/Compo/CardInglesina.razor.cs b/WebWindowComplex/Compo/CardInglesina.razor.cs index eeee1ee..57070fd 100644 --- a/WebWindowComplex/Compo/CardInglesina.razor.cs +++ b/WebWindowComplex/Compo/CardInglesina.razor.cs @@ -310,7 +310,7 @@ namespace WebWindowComplex.Compo { for (int k = 0; k < SashGroupList[j].AreaList.Count; k++) { - if (SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina)) + if (SashGroupList[j].AreaList[k].AreaList[0].AreaList.Count > 0 && SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina)) { return "Sash group " + (j + 1) + " - sash " + (k + 1); } diff --git a/WebWindowComplex/Models/Inglesina.cs b/WebWindowComplex/Models/Inglesina.cs index fd22d9c..39fa8bf 100644 --- a/WebWindowComplex/Models/Inglesina.cs +++ b/WebWindowComplex/Models/Inglesina.cs @@ -233,7 +233,10 @@ namespace WebWindowComplex.Models else { int deleteSubArea = ElemDimHorizList.Count + 1; - ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1); + for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1) + { + ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1); + } if (nSplitQtyVert > 0) ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea); } @@ -366,7 +369,10 @@ namespace WebWindowComplex.Models if (bSplitStartVert) { int deleteSubArea = ElemDimVertList.Count + 1; - ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1); + for(var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1) + { + ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1); + } if (nSplitQtyHoriz > 0) ElemDimHorizList.RemoveAll(x => x.nSubArea == deleteSubArea); } diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index b2a8131..237410a 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -271,7 +271,7 @@ namespace WebWindowComplex.Models AreaList.Add(Splitted.CreateSplitted(this)); } // Riaggiungo i sottoalberi che avevo salvato - for (int i = 0; i < AreaList.Count - 1; i++) + for (int i = 0; i <= ContentArea.Count - 1; i++) { if (AreaList.Count == 2) { @@ -280,9 +280,12 @@ namespace WebWindowComplex.Models AreaList[i].AreaList.Add(ContentArea[i]); } // Aggiungo all'ultimo Splitted l'area di vetro - Fill newFill = Fill.CreateFill(AreaList[1], FillTypes.GLASS); - newFill.SetAreaType(AreaTypes.FILL); - AreaList[AreaList.Count - 1].AreaList.Add(newFill); + for(int k = ContentArea.Count; k <= AreaList.Count - 1; k++) + { + Fill newFill = Fill.CreateFill(AreaList[k], FillTypes.GLASS); + newFill.SetAreaType(AreaTypes.FILL); + AreaList[k].AreaList.Add(newFill); + } } // Se tolgo anta else diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index 845d29c..54224c6 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -206,7 +206,10 @@ namespace WebWindowComplex.Models else { int deleteSubArea = ElemDimHorizList.Count + 1; - ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1); + for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1) + { + ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1); + } if(nSplitQtyVert > 0) ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea); } @@ -371,7 +374,10 @@ namespace WebWindowComplex.Models if (m_bSplitStartVert) { int deleteSubArea = ElemDimVertList.Count + 1; - ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1); + for (var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1) + { + ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1); + } if(nSplitQtyHoriz > 0) ElemDimHorizList.RemoveAll(x=>x.nSubArea == deleteSubArea); } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index f8442c5..467d0a6 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.4.1609 + 3.1.4.1617 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -137,6 +137,21 @@ + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 79693b6..97dd0d1 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.4.1609 + 3.1.4.1617 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -242,6 +242,21 @@ + + + + + + + + + + + + + + +