diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index d5aad2e..64eac4b 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -145,19 +145,19 @@ namespace WebWindowComplex.Models List newSplittedList = new List(); for (int i = 0; i < 2; i++) newSplittedList.Add(Splitted.CreateSplitted(SplitArea)); - // Inserisco nelle aree Splitted il Fill salvato e un Fill uguale (e setto ParentArea del fill) - ContentArea[0].SetParentArea(newSplittedList[0]); - newSplittedList[0].AreaList.Add(ContentArea[0]); + // Inserisco nelle aree Splitted Fill e la struttura precedente (e setto ParentArea del fill) + ContentArea[0].SetParentArea(newSplittedList[1]); + newSplittedList[1].AreaList.Add(ContentArea[0]); if (ContentArea[0] is Fill) { Fill fill1 = (Fill)ContentArea[0]; - Fill fill2 = Fill.CreateFill(newSplittedList[1], fill1.FillType); - newSplittedList[1].AreaList.Add(fill2); + Fill fill2 = Fill.CreateFill(newSplittedList[0], fill1.FillType); + newSplittedList[0].AreaList.Add(fill2); } else { - Fill fill2 = Fill.CreateFill(newSplittedList[1], FillTypes.GLASS); - newSplittedList[1].AreaList.Add(fill2); + Fill fill2 = Fill.CreateFill(newSplittedList[0], FillTypes.GLASS); + newSplittedList[0].AreaList.Add(fill2); } // All'area Split aggiunto le due aree Splitted for (int i = 0; i < 2; i++) diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index e2d031b..20afcfd 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -19,7 +19,7 @@ namespace WebWindowComplex.Models // Lista hardware completa passata dal chiamante del componente public static List m_HardwareCompleteList = new List(); - // Lista hardware completa passata dal chiamante del componente + // Lista famiglia hardware completa passata dal chiamante del componente public static List s_FamilyHardwareList = new List(); #endregion Public Fields diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 9ef7e71..2bcca47 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2316 + 2.7.12.2317 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -443,6 +443,9 @@ + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 1a4ce21..f25bc18 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.12.2316 + 2.7.12.2317 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -568,6 +568,10 @@ + + + +