From df44ae4bf2736b10afbde9cbdfab16c1ea48b2c7 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Thu, 5 Mar 2026 15:41:28 +0100 Subject: [PATCH] =?UTF-8?q?Modificata=20propriet=C3=A0=20SplitStartVert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test.UI/Components/Pages/BaseEdit.razor.cs | 4 +- Test.UI/Components/Pages/EditJWD.razor.cs | 4 +- Test.UI/Components/Pages/Home.razor.cs | 4 +- WebWindowComplex/Models/AGBOption.cs | 7 +- WebWindowComplex/Models/AGBOptionCombo.cs | 7 +- WebWindowComplex/Models/AGBOptionParameter.cs | 7 +- WebWindowComplex/Models/AGBOptionText.cs | 7 +- WebWindowComplex/Models/Area.cs | 4 +- WebWindowComplex/Models/AreaDimension.cs | 7 +- WebWindowComplex/Models/ElementDimension.cs | 8 +- WebWindowComplex/Models/Frame.cs | 6 - WebWindowComplex/Models/FrameDimension.cs | 8 +- WebWindowComplex/Models/Joint.cs | 7 +- WebWindowComplex/Models/ParametriOpzioni.cs | 7 +- WebWindowComplex/Models/Sash.cs | 7 - WebWindowComplex/Models/SashDimension.cs | 5 +- WebWindowComplex/Models/Split.cs | 121 ++++++++++++------ WebWindowComplex/Models/SplitDimension.cs | 8 +- .../Models/SplitElementDimension.cs | 30 +++-- WebWindowComplex/Models/Window.cs | 14 +- WebWindowComplex/TableComp.razor.cs | 63 ++------- WebWindowComplex/WebWindowComplex.csproj | 11 +- .../WebWindowConfigurator.csproj | 6 +- 23 files changed, 151 insertions(+), 201 deletions(-) diff --git a/Test.UI/Components/Pages/BaseEdit.razor.cs b/Test.UI/Components/Pages/BaseEdit.razor.cs index 846b90b..3c21b67 100644 --- a/Test.UI/Components/Pages/BaseEdit.razor.cs +++ b/Test.UI/Components/Pages/BaseEdit.razor.cs @@ -382,8 +382,8 @@ namespace Test.UI.Components.Pages private void CloseObj(DataSave reqSave) { currJwd = reqSave.currJwd; - outClose = !reqSave.open ? "Richiesto chiusura!" : ""; - outSave = reqSave.open ? "Richiesto salvataggio!" : ""; + outClose = !reqSave.Dosave ? "Richiesto chiusura!" : ""; + outSave = reqSave.Dosave ? "Richiesto salvataggio!" : ""; } private void ConfInit() diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index d1a90e2..1a3c3cd 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -426,8 +426,8 @@ namespace Test.UI.Components.Pages private void CloseObj(DataSave reqSave) { currJwd = reqSave.currJwd; - outClose = !reqSave.open ? "Richiesto chiusura!" : ""; - outSave = reqSave.open ? "Richiesto salvataggio!" : ""; + outClose = !reqSave.Dosave ? "Richiesto chiusura!" : ""; + outSave = reqSave.Dosave ? "Richiesto salvataggio!" : ""; } private void ConfInit() diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs index 2c3dfac..a2a8d55 100644 --- a/Test.UI/Components/Pages/Home.razor.cs +++ b/Test.UI/Components/Pages/Home.razor.cs @@ -167,8 +167,8 @@ namespace Test.UI.Components.Pages private void CloseObj(DataSave reqSave) { currJwd = reqSave.currJwd; - outClose = !reqSave.open ? "Richiesto chiusura!" : ""; - outSave = reqSave.open ? "Richiesto salvataggio!" : ""; + outClose = !reqSave.Dosave ? "Richiesto chiusura!" : ""; + outSave = reqSave.Dosave ? "Richiesto salvataggio!" : ""; } private void ConfInit() diff --git a/WebWindowComplex/Models/AGBOption.cs b/WebWindowComplex/Models/AGBOption.cs index f6e3f36..d2c4fbd 100644 --- a/WebWindowComplex/Models/AGBOption.cs +++ b/WebWindowComplex/Models/AGBOption.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/AGBOptionCombo.cs b/WebWindowComplex/Models/AGBOptionCombo.cs index 7d4f5ea..bfa5df4 100644 --- a/WebWindowComplex/Models/AGBOptionCombo.cs +++ b/WebWindowComplex/Models/AGBOptionCombo.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/AGBOptionParameter.cs b/WebWindowComplex/Models/AGBOptionParameter.cs index 8e90c21..efebe2c 100644 --- a/WebWindowComplex/Models/AGBOptionParameter.cs +++ b/WebWindowComplex/Models/AGBOptionParameter.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace WebWindowComplex.Models { public class AGBOptionParameter diff --git a/WebWindowComplex/Models/AGBOptionText.cs b/WebWindowComplex/Models/AGBOptionText.cs index bcfbd30..e2ef9bf 100644 --- a/WebWindowComplex/Models/AGBOptionText.cs +++ b/WebWindowComplex/Models/AGBOptionText.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 9d757c1..aa549ef 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -1,6 +1,4 @@ -using System.ComponentModel.Design; -using System.Linq; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/AreaDimension.cs b/WebWindowComplex/Models/AreaDimension.cs index aa86479..f289578 100644 --- a/WebWindowComplex/Models/AreaDimension.cs +++ b/WebWindowComplex/Models/AreaDimension.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static WebWindowComplex.Json.WindowConst; +using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models { diff --git a/WebWindowComplex/Models/ElementDimension.cs b/WebWindowComplex/Models/ElementDimension.cs index b402e69..5dc8279 100644 --- a/WebWindowComplex/Models/ElementDimension.cs +++ b/WebWindowComplex/Models/ElementDimension.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs index 5ae90f4..f2ed452 100644 --- a/WebWindowComplex/Models/Frame.cs +++ b/WebWindowComplex/Models/Frame.cs @@ -1,10 +1,4 @@ using Egw.Window.Data; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; diff --git a/WebWindowComplex/Models/FrameDimension.cs b/WebWindowComplex/Models/FrameDimension.cs index ced2f73..bf95728 100644 --- a/WebWindowComplex/Models/FrameDimension.cs +++ b/WebWindowComplex/Models/FrameDimension.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/Joint.cs b/WebWindowComplex/Models/Joint.cs index ba05570..f81cc63 100644 --- a/WebWindowComplex/Models/Joint.cs +++ b/WebWindowComplex/Models/Joint.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/ParametriOpzioni.cs b/WebWindowComplex/Models/ParametriOpzioni.cs index 4a52bef..dbb36c8 100644 --- a/WebWindowComplex/Models/ParametriOpzioni.cs +++ b/WebWindowComplex/Models/ParametriOpzioni.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace WebWindowComplex.Models { public partial class ParametriOpzioni diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index d468d76..68d5924 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -1,11 +1,4 @@ using Egw.Window.Data; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data.SqlTypes; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Serialization; using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; diff --git a/WebWindowComplex/Models/SashDimension.cs b/WebWindowComplex/Models/SashDimension.cs index b7963b2..80ef4ed 100644 --- a/WebWindowComplex/Models/SashDimension.cs +++ b/WebWindowComplex/Models/SashDimension.cs @@ -1,7 +1,4 @@ -using System; -using System.Runtime.InteropServices; -using System.Security.Principal; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index d41dc51..41b6d97 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -1,12 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel.Design; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models @@ -31,34 +23,55 @@ namespace WebWindowComplex.Models } set { - m_bSplitStartVert = value; - m_ElemDimVertList.Clear(); - m_ElemDimHorizList.Clear(); - double thickness = 78; - if (ParentArea is Sash || ParentArea.ParentArea is Sash) - thickness = 60; - if (value) + if(m_bSplitStartVert != value) { - for (int i = 0; i < nSplitQtyVert; i++) + m_bSplitStartVert = value; + List elemVertListOld = new List(m_ElemDimVertList); + List elemHorizListOld = new List(m_ElemDimHorizList); + m_ElemDimVertList.Clear(); + m_ElemDimHorizList.Clear(); + double thickness = 78; + if (ParentArea is Sash || ParentArea.ParentArea is Sash) + thickness = 60; + if (value) { - m_ElemDimVertList.Add(new SplitElementDimension(this, i + 1, thickness, 0)); + for (int i = 0; i < nSplitQtyVert; i++) + { + SplitElementDimension newVertElem= elemVertListOld.Where(x=>x.nSubArea==1 && x.nIndex==i+1).First().Copy(); + newVertElem.SetElement(i + 1, thickness, 0); + m_ElemDimVertList.Add(newVertElem); + //m_ElemDimVertList.Add(new SplitElementDimension(this, i + 1, thickness, 0)); + } + for (int subArea = 0; subArea < m_SplitVertList.Count; subArea++) + { + for (int index = 0; index < nSplitQtyHoriz; index++) + { + SplitElementDimension newHorizElem = elemHorizListOld.Where(x => x.nIndex == index+1).First().Copy(); + newHorizElem.SetElement(index + 1, thickness, subArea + 1); + m_ElemDimHorizList.Add(newHorizElem); + //m_ElemDimHorizList.Add(new SplitElementDimension(this, index + 1, thickness, subArea + 1)); + } + } } - for (int subArea = 0; subArea < m_SplitVertList.Count; subArea++) + else { - for (int index = 0; index < nSplitQtyHoriz; index++) - m_ElemDimHorizList.Add(new SplitElementDimension(this, index + 1, thickness, subArea + 1)); - } - } - else - { - for (int i = 0; i < nSplitQtyHoriz; i++) - { - m_ElemDimHorizList.Add(new SplitElementDimension(this, i + 1, thickness, 0)); - } - for (int subArea = 0; subArea < m_SplitHorizList.Count; subArea++) - { - for (int index = 0; index < nSplitQtyVert; index++) - m_ElemDimVertList.Add(new SplitElementDimension(this, index + 1, thickness, subArea + 1)); + for (int i = 0; i < nSplitQtyHoriz; i++) + { + SplitElementDimension newHorizElem = elemHorizListOld.Where(x => x.nSubArea == 1 && x.nIndex == i+1).First().Copy(); + newHorizElem.SetElement(i + 1, thickness, 0); + m_ElemDimHorizList.Add(newHorizElem); + //m_ElemDimHorizList.Add(new SplitElementDimension(this, i + 1, thickness, 0)); + } + for (int subArea = 0; subArea < m_SplitHorizList.Count; subArea++) + { + for (int index = 0; index < nSplitQtyVert; index++) + { + SplitElementDimension newVertElem = elemVertListOld.Where(x => x.nIndex == index+1).First().Copy(); + newVertElem.SetElement(index + 1, thickness, subArea + 1); + m_ElemDimVertList.Add(newVertElem); + //m_ElemDimVertList.Add(new SplitElementDimension(this, index + 1, thickness, subArea + 1)); + } + } } } } @@ -117,16 +130,27 @@ namespace WebWindowComplex.Models // aggiungo area Split di default for (var SplitIndex = m_SplitHorizList.Count; SplitIndex <= value; SplitIndex++) m_SplitHorizList.Add(new SplitDimension(dNewDimension, m_SplitHorizList[m_SplitHorizList.Count - 1].MeasureType, true, this, false)); + double thickness = 78; + if (ParentArea is Sash || ParentArea.ParentArea is Sash) + thickness = 60; if (!m_bSplitStartVert) { //Aggiungo un elemento alla sottoarea principale - ElemDimHorizList.Add(new SplitElementDimension(this, ElemDimHorizList.Max(x => x.nIndex) + 1, 78, 0)); - if(nSplitQtyVert > 0) + SplitElementDimension newElemDim = ElemDimHorizList.First().Copy(); + newElemDim.SetElement(ElemDimHorizList.Max(x => x.nIndex) + 1, thickness, 0); + ElemDimHorizList.Add(newElemDim); + //ElemDimHorizList.Add(new SplitElementDimension(this, ElemDimHorizList.Max(x => x.nIndex) + 1, 78, 0)); + if (nSplitQtyVert > 0) { // Aggiungo a tutte le sottoaree degli element int subArea = ElemDimVertList.Max(x => x.nSubArea) + 1; for (int i = 1; i <= ElemDimVertList.Max(x => x.nIndex); i++) - ElemDimVertList.Add(new SplitElementDimension(this, i, 78, subArea)); + { + newElemDim = ElemDimVertList.First().Copy(); + newElemDim.SetElement(i, thickness, subArea); + ElemDimVertList.Add(newElemDim); + //ElemDimVertList.Add(new SplitElementDimension(this, i, 78, subArea)); + } } } else @@ -135,7 +159,10 @@ namespace WebWindowComplex.Models for (int i = 1; i <= ElemDimHorizList.Max(x => x.nSubArea); i++) { int index = ElemDimHorizList.Where(x => x.nSubArea == i).Max(x => x.nIndex); - ElemDimHorizList.Insert(index * i + (i - 1), new SplitElementDimension(this, index + 1, 78, i)); + SplitElementDimension newElemDim = ElemDimVertList.First().Copy(); + newElemDim.SetElement(index + 1, thickness, i); + ElemDimHorizList.Insert(index * i + (i - 1), newElemDim); + //ElemDimHorizList.Insert(index * i + (i - 1), new SplitElementDimension(this, index + 1, thickness, i)); } } } @@ -266,16 +293,27 @@ namespace WebWindowComplex.Models // aggiungo area Split di default for (var SplitIndex = m_SplitVertList.Count; SplitIndex <= value; SplitIndex++) m_SplitVertList.Add(new SplitDimension(dNewDimension, m_SplitVertList[m_SplitVertList.Count - 1].MeasureType, true, this, true)); + double thickness = 78; + if (ParentArea is Sash || ParentArea.ParentArea is Sash) + thickness = 60; if (m_bSplitStartVert) { //Aggiungo un elemento alla sottoarea principale - ElemDimVertList.Add(new SplitElementDimension(this, ElemDimVertList.Max(x => x.nIndex) + 1, 78, 0)); + SplitElementDimension newElemDim = ElemDimVertList.First().Copy(); + newElemDim.SetElement(ElemDimVertList.Max(x => x.nIndex) + 1, thickness, 0); + ElemDimVertList.Add(newElemDim); + //ElemDimVertList.Add(new SplitElementDimension(this, ElemDimVertList.Max(x => x.nIndex) + 1, 78, 0)); if(nSplitQtyHoriz > 0) { // Aggiungo a tutte le sottoaree degli element int subArea = ElemDimHorizList.Max(x => x.nSubArea) + 1; for (int i = 1; i <= ElemDimHorizList.Max(x => x.nIndex); i++) - ElemDimHorizList.Add(new SplitElementDimension(this, i, 78, subArea)); + { + newElemDim = ElemDimHorizList.First().Copy(); + newElemDim.SetElement(i, thickness, subArea); + ElemDimHorizList.Add(newElemDim); + //ElemDimHorizList.Add(new SplitElementDimension(this, i, 78, subArea)); + } } } else @@ -284,7 +322,10 @@ namespace WebWindowComplex.Models for (int i = 1; i <= ElemDimVertList.Max(x => x.nSubArea); i++) { int index = ElemDimVertList.Where(x => x.nSubArea == i).Max(x => x.nIndex); - ElemDimVertList.Insert(index * i + (i - 1), new SplitElementDimension(this, index + 1, 78, i)); + SplitElementDimension newElemDim = ElemDimVertList.First().Copy(); + newElemDim.SetElement(index + 1, thickness, i); + ElemDimVertList.Insert(index * i + (i - 1), newElemDim); + //ElemDimVertList.Insert(index * i + (i - 1), new SplitElementDimension(this, index + 1, 78, i)); } } } diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs index c87ead2..0b61be0 100644 --- a/WebWindowComplex/Models/SplitDimension.cs +++ b/WebWindowComplex/Models/SplitDimension.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; +using WebWindowComplex.Json; using static WebWindowComplex.Json.WindowConst; namespace WebWindowComplex.Models diff --git a/WebWindowComplex/Models/SplitElementDimension.cs b/WebWindowComplex/Models/SplitElementDimension.cs index 8feb0a2..89bf969 100644 --- a/WebWindowComplex/Models/SplitElementDimension.cs +++ b/WebWindowComplex/Models/SplitElementDimension.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using WebWindowComplex.Json; -using static WebWindowComplex.Json.WindowConst; +using WebWindowComplex.Json; namespace WebWindowComplex.Models { @@ -43,9 +36,30 @@ namespace WebWindowComplex.Models m_nSubArea = nSubArea; } + public void SetElement(int index, double dimension, int subArea) + { + SetIndex(index); + SetDimension(dimension); + m_nSubArea = subArea; + } + + //public SplitElementDimension CopyAll() + //{ + // SplitElementDimension newSplitElementDimension = new SplitElementDimension(ParentArea, nIndex, dDimension, nSubArea); + // newSplitElementDimension.SetMaxDimension(dMaxDim); + // newSplitElementDimension.SetMinDimension(dMinDim); + // newSplitElementDimension.SetOverlapElement(dOverlap); + // newSplitElementDimension.SetNameElement(sName); + // return newSplitElementDimension; + //} + public override SplitElementDimension Copy() { SplitElementDimension newSplitElementDimension = new SplitElementDimension(ParentArea, nIndex, dDimension, nSubArea); + newSplitElementDimension.SetMaxDimension(dMaxDim); + newSplitElementDimension.SetMinDimension(dMinDim); + newSplitElementDimension.SetOverlapElement(dOverlap); + newSplitElementDimension.SetNameElement(sName); return newSplitElementDimension; } diff --git a/WebWindowComplex/Models/Window.cs b/WebWindowComplex/Models/Window.cs index d77d8ab..a0bdb63 100644 --- a/WebWindowComplex/Models/Window.cs +++ b/WebWindowComplex/Models/Window.cs @@ -1,17 +1,5 @@ -using Egw.Window.Data; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System.Collections; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Drawing; -using System.Runtime.Intrinsics.Arm; -using System.Security.Cryptography; -using System.Xml.Linq; -using System.Xml.Serialization; +using Newtonsoft.Json; using WebWindowComplex.Json; -using static WebWindowComplex.Json.WindowConst; -using static WebWindowComplex.Models.ParametriOpzioni; namespace WebWindowComplex.Models { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 40b7cca..5568863 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -410,7 +410,7 @@ namespace WebWindowComplex DataSave dataSave = new DataSave() { currJwd = CurrJwd, - open = false, + Dosave = false, }; return EC_OnClose.InvokeAsync(dataSave); } @@ -572,7 +572,7 @@ namespace WebWindowComplex DataSave dataSave = new DataSave() { currJwd = CurrJwd, - open = true, + Dosave = true, }; return EC_OnClose.InvokeAsync(dataSave); } @@ -661,9 +661,7 @@ namespace WebWindowComplex { checkWarnings(); if (SashList.Count > 0) - { currAntaIndex = 0; - } if (updRequested) { // se mancasse dizionario forme chiamo quello @@ -794,12 +792,12 @@ namespace WebWindowComplex if (m_CurrWindow.AreaList.First().Shape == Shapes.TRIANGLE) { for (int i = 0; i < 2; i++) - m_CurrWindow.AreaList.First().JointList[i].SetSelJointType(m_PreviousWindow.AreaList.First().JointList[i].SelJointType); + m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType; } else { for (int i = 0; i < 4; i++) - m_CurrWindow.AreaList.First().JointList[i].SetSelJointType(m_PreviousWindow.AreaList.First().JointList[i].SelJointType); + m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType; } } if (m_CurrWindow != null) @@ -900,7 +898,7 @@ namespace WebWindowComplex } /// - /// Metodo per settare i parmateri di ingresso selezionati + /// Metodo per settare i paramteri di ingresso selezionati /// protected void UpdateInputList(JsonWindow WindowFromJson) { @@ -1192,30 +1190,6 @@ namespace WebWindowComplex AdvStep(CompileStep.Tree); } - ///// - ///// Metodo per cercare un area precisa - ///// - ///// Area che si sta analizzando - ///// Id Area che si sta cercando - ///// Area che si sta cercando - ///// - //private Area SearchArea(Area currentArea, int idSearch, Area itemSearch) - //{ - // if (currentArea.GroupId == idSearch && currentArea.AreaType.Equals(itemSearch.AreaType)) - // { - // return currentArea; - // } - // foreach (Area child in currentArea.AreaList) - // { - // Area found = SearchArea(child, idSearch, itemSearch); - // if (found != null) - // { - // return found; - // } - // } - // return null; - //} - /// /// Metodo per cercare un area precisa partendo da GroupId /// @@ -1351,6 +1325,13 @@ namespace WebWindowComplex } } + /// + /// Metodo per calcolare overlap per gli elementi delle ante + /// + /// sash group + /// anta + /// indice anta + /// lista elementi private void SetOverlapSash(Sash sash, SashDimension anta, int indexAnta, List elemList) { string overlapNameBottom = ""; @@ -1802,22 +1783,6 @@ namespace WebWindowComplex m_SplittedList = new List(); CreateWindowsList((m_CurrWindow!).AreaList.First(), false); ReqListGroupId(FrameWindow, reqList); - //// richiedo update element della sash (se presenti) - //if (SashList.Count > 0) - //{ - // foreach (var item in SashList) - // { - // reqList.Add(item.GroupId); - // } - //} - //// richiedo update element degli split (se presenti) - //if (SplitList.Count > 0) - //{ - // foreach (var item in SplitList) - // { - // reqList.Add(item.GroupId); - // } - //} await DoReqElement(reqList); } } @@ -1991,7 +1956,7 @@ namespace WebWindowComplex } public class DataSave { - public string currJwd { get; set; } - public bool open { get; set; } = false; + public string currJwd { get; set; } = ""; + public bool Dosave { get; set; } = true; } } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 4367ad0..528bfa1 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.415 + 3.1.3.515 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -267,6 +267,15 @@ + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7d01064..f58d06c 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.415 + 3.1.3.515 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -225,6 +225,10 @@ + + + +