@foreach (var Fill in FillList)
{
diff --git a/WebWindowConfigurator/WebWindowMaker.razor.cs b/WebWindowConfigurator/WebWindowMaker.razor.cs
index 1c9f3bc..539403e 100644
--- a/WebWindowConfigurator/WebWindowMaker.razor.cs
+++ b/WebWindowConfigurator/WebWindowMaker.razor.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System.Reflection.Metadata;
using WebWindowConfigurator.DTO;
using WebWindowConfigurator.Json;
@@ -42,6 +43,16 @@ namespace WebWindowConfigurator
}
m_CurrWindow = WindowFromJson.Deserialize();
m_CurrWindow.OnPreview += M_CurrWindow_OnPreview;
+ // recupero dimensioni Frame e Joint Frame della finestra precedente
+ if(m_PreviousWindow != null)
+ {
+ m_CurrWindow.AreaList[0].DimensionList[0] = m_PreviousWindow.AreaList[0].DimensionList[0];
+ m_CurrWindow.AreaList[0].DimensionList[1] = m_PreviousWindow.AreaList[0].DimensionList[1];
+ for (int i = 0; i < 4; i++)
+ {
+ m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i];
+ }
+ }
m_FillList = new List
();
m_SashList = new List();
m_SplitList = new List();
@@ -148,15 +159,18 @@ namespace WebWindowConfigurator
///
protected async Task changeHandle(SashDimension sashDim)
{
- foreach (SashDimension item in SashList[0].SashList)
+ if(m_SashList[0].AreaList.Count < 3)
{
- if (item.Equals(sashDim))
+ foreach (SashDimension item in SashList[0].SashList)
{
- item.bHasHandle = true;
- }
- else
- {
- item.bHasHandle = false;
+ if (item.Equals(sashDim))
+ {
+ item.bHasHandle = true;
+ }
+ else
+ {
+ item.bHasHandle = false;
+ }
}
}
await Task.Delay(1);
@@ -184,6 +198,27 @@ namespace WebWindowConfigurator
}
}
+ ///
+ /// Metodo di reset dei dati a quelli del template
+ ///
+ protected async Task DoReset()
+ {
+ JsonWindow WindowFromJson = JsonConvert.DeserializeObject(m_SelTemplate.JWD, new PolymorphicJsonConverter()) ?? new JsonWindow("");
+ if (m_CurrWindow != null)
+ {
+ m_CurrWindow.OnPreview -= M_CurrWindow_OnPreview;
+ m_CurrWindow = null;
+ }
+ m_CurrWindow = WindowFromJson.Deserialize();
+ m_CurrWindow.OnPreview += M_CurrWindow_OnPreview;
+ m_FillList = new List();
+ m_SashList = new List();
+ m_SplitList = new List();
+ // popolo le liste Fill, Sash e Split
+ CreateWindowsList(m_CurrWindow.AreaList[0]);
+ await DoPreviewSvg();
+ }
+
// Ancora da fare..
protected async Task DoSave()
{
@@ -250,6 +285,58 @@ namespace WebWindowConfigurator
}
}
+ // Utilizzo di min e max in input form (WIP)
+ private async Task OnInput(FrameDimension item, double e)
+ {
+ if (e > 4000)
+ {
+ item.dValue = 4000;
+ }
+ else if (e < 600)
+ {
+ item.dValue = 600;
+ }
+ else
+ {
+ item.dValue = e;
+ }
+ StateHasChanged();
+ await DoPreviewSvg();
+ }
+ ///
+ /// Metodo per settare tutti i Joints di Frame o Sash come ANGLED o FULL_H o FULL_V
+ ///
+ /// tipo di giunzione (ANGLED o FULL_H o FULL_V)
+ /// oggetto a cui essere applicato (Frame o Sash)
+ ///
+ private async Task AllJointsFrame(int int_type, int int_place)
+ {
+ Joints type = Joints.ANGLED;
+ if (int_type == 2)
+ {
+ type = Joints.FULL_H;
+ }
+ else if (int_type == 3)
+ {
+ type = Joints.FULL_V;
+ }
+ if(int_place == 0)
+ {
+ foreach (Joint joint in FrameWindow.JointList)
+ {
+ joint.SetSelJointType(type);
+ }
+ }
+ else if(int_place == 1)
+ {
+ foreach (Joint joint in m_SashList[0].JointList)
+ {
+ joint.SetSelJointType(type);
+ }
+ }
+ await DoPreviewSvg();
+ }
+
#endregion Protected Methods
#region Private Fields
@@ -266,10 +353,10 @@ namespace WebWindowConfigurator
private enum positionJoints
{
- BL=0,
- BR=1,
- TR,
- TL
+ BL=0, // Bottom Left
+ BR=1, // Bottom Right
+ TR, // Top Right
+ TL // Top Left
}
#endregion Private Fields
@@ -278,6 +365,8 @@ namespace WebWindowConfigurator
private Window? m_CurrWindow { get; set; } = null;
+ private Window? m_PreviousWindow { get; set; } = null;
+
private Template m_SelTemplate { get; set; } = null!;
#endregion Private Properties