Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiornati eventi ricalcolo hw option e forma ante

Browse Source
This commit is contained in:
Annamaria Sassi
2025-10-31 14:53:18 +01:00
parent 64a2019b6d
commit 0caf3ef83b
10 changed files with 167 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Models/AGBOptionCombo.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace WebWindowComplex.Models
internal override JsonHwOption Serialize()
{
JsonHwOption JsonHwOption = new JsonHwOption(sName, m_sValue.sDescription);
JsonHwOption JsonHwOption = new JsonHwOption(sName, m_sValue.sValue);
return JsonHwOption;
}
WebWindowComplex/Models/Area.cs
+1
View File
@@ -117,6 +117,7 @@ namespace WebWindowComplex.Models
// Inserisco il riempimento precedente
AreaList[0].AreaList.Add(ContentArea[0]);
AreaList[0].AreaList[0].SetParentArea(AreaList[0]);
// Richiesta SVG con hardware di default
ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
WebWindowComplex/Models/Sash.cs
+29 -29
View File
@@ -34,8 +34,8 @@ namespace WebWindowComplex.Models
#region Public Events
public event EventHandler<OnReqShapeEventArgs> OnReqShape = delegate { };
public event EventHandler<OnReqHwOptEventArgs> OnReqHwOption = delegate { };
//public event EventHandler<OnReqShapeEventArgs> OnReqShape = delegate { };
//public event EventHandler<OnReqHwOptEventArgs> OnReqHwOption = delegate { };
#endregion Public Events
@@ -233,8 +233,8 @@ namespace WebWindowComplex.Models
#if false
// calcolo senza hw
m_ParentWindow.OnUpdatePreview(JsonConvert.SerializeObject(m_ParentWindow.Serialize(true)));
m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized(true));
#endif
m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized(true));
// continuo refresh
//ReqRefreshShape();
RefreshHardwareList();
@@ -486,7 +486,7 @@ namespace WebWindowComplex.Models
m_CurrShape = "";
// chiamata evento calcolo shape: gruppo da calcolare
OnReqShapePreview(m_ParentWindow.sSerialized(), GroupId);
m_ParentWindow.OnReqShapePreview(m_ParentWindow.sSerialized(), GroupId);
}
}
@@ -497,7 +497,7 @@ namespace WebWindowComplex.Models
{
HwOptionList.Clear();
// chiamata evento calcolo opzioni hardware
OnReqHwOptionPreview(m_ParentWindow.sSerialized(), GroupId);
m_ParentWindow.OnReqHwOptionPreview(m_ParentWindow.sSerialized(), GroupId );
}
public void SetSelFamilyHardware(string sFamilyHw)
@@ -552,7 +552,7 @@ namespace WebWindowComplex.Models
newSash.SetSashBottomRail(false);
newSash.SetSashBottomRailQty(0);
newSash.SetSelFamilyHardware(Sash.s_FamilyHardwareList.First());
newSash.ReqRefreshShape();
//newSash.ReqRefreshShape();
newSash.RefreshHardwareOptionList();
newSash.SetFirstHardware();
return newSash;
@@ -638,25 +638,25 @@ namespace WebWindowComplex.Models
}
}
internal void OnReqShapePreview(string sJwd, int groupId)
{
OnReqShapeEventArgs e = new OnReqShapeEventArgs(sJwd, groupId);
EventHandler<OnReqShapeEventArgs> handler = OnReqShape;
if (handler != null)
{
handler(this, e);
}
}
//internal void OnReqShapePreview(string sJwd, int groupId)
//{
// OnReqShapeEventArgs e = new OnReqShapeEventArgs(sJwd, groupId);
// EventHandler<OnReqShapeEventArgs> handler = OnReqShape;
// if (handler != null)
// {
// handler(this, e);
// }
//}
internal void OnReqHwOptionPreview(string sJwd, int groupId)
{
OnReqHwOptEventArgs e = new OnReqHwOptEventArgs(sJwd, groupId);
EventHandler<OnReqHwOptEventArgs> handler = OnReqHwOption;
if (handler != null)
{
handler(this, e);
}
}
//internal void OnReqHwOptionPreview(string sJwd, int groupId)
//{
// OnReqHwOptEventArgs e = new OnReqHwOptEventArgs(sJwd, groupId);
// EventHandler<OnReqHwOptEventArgs> handler = OnReqHwOption;
// if (handler != null)
// {
// handler(this, e);
// }
//}
internal void RefreshHardwareOptionList()
{
@@ -755,7 +755,7 @@ namespace WebWindowComplex.Models
case HwOptionTypes.COMBO:
{
AGBOptionCombo OptCombo = (AGBOptionCombo)HwOption;
var selValue = OptCombo.ValueList.Where(x => x.sDescription == selHwOption.Value).First();
var selValue = OptCombo.ValueList.Where(x => x.sValue == selHwOption.Value).First();
OptCombo.sValue = selValue;
break;
}
@@ -841,12 +841,12 @@ namespace WebWindowComplex.Models
internal void SetSelHardwareFromId(string sId)
{
if (m_HardwareList.Count == 0)
SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
else
SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware(CustomHwId, "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (SelHardware.Id == "")
SelHardware = m_HardwareList.First();
ReqRefreshHwOption();
m_SelHardware = m_HardwareList.First();
//ReqRefreshHwOption();
}
#endregion Internal Methods
WebWindowComplex/Models/Window.cs
+22
View File
@@ -20,6 +20,8 @@ namespace WebWindowComplex.Models
#region Public Events
public event EventHandler<OnPreviewEventArgs> OnPreview = delegate { };
public event EventHandler<OnReqShapeEventArgs> OnReqShape = delegate { };
public event EventHandler<OnReqHwOptEventArgs> OnReqHwOption = delegate { };
#endregion Public Events
@@ -103,6 +105,26 @@ namespace WebWindowComplex.Models
}
}
internal void OnReqShapePreview(string sJwd, int groupId)
{
OnReqShapeEventArgs e = new OnReqShapeEventArgs(sJwd, groupId);
EventHandler<OnReqShapeEventArgs> handler = OnReqShape;
if (handler != null)
{
handler(this, e);
}
}
internal void OnReqHwOptionPreview(string sJwd, int groupId)
{
OnReqHwOptEventArgs e = new OnReqHwOptEventArgs(sJwd, groupId);
EventHandler<OnReqHwOptEventArgs> handler = OnReqHwOption;
if (handler != null)
{
handler(this, e);
}
}
/// <summary>
/// Serializzazione dell'oggetto windows
/// </summary>