diff --git a/WebAedificaConfigurator/WebAedificaConfigurator.csproj b/WebAedificaConfigurator/WebAedificaConfigurator.csproj
index 2b08dd6..127bb1f 100644
--- a/WebAedificaConfigurator/WebAedificaConfigurator.csproj
+++ b/WebAedificaConfigurator/WebAedificaConfigurator.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 98fbdca..b947d7d 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.10.916
+ 2.7.10.917
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -147,6 +147,10 @@
+
+
+
+
diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs
index 4a664c9..d1598e9 100644
--- a/WebWindowComplex/Window.cs
+++ b/WebWindowComplex/Window.cs
@@ -1173,9 +1173,9 @@ namespace WebWindowComplex
internal void SetSelHardwareFromId(string sId)
{
if (m_HardwareList.Count == 0)
- m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.NULL, "", 0, 0);
+ m_SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
else
- m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.NULL, "", 0, 0);
+ m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (m_SelHardware == null)
m_SelHardware = m_HardwareList[0];
//SelFamilyHardware = m_SelHardware.FamilyName;
@@ -1189,7 +1189,7 @@ namespace WebWindowComplex
}
set
{
- m_SelHardware = m_HardwareList.FirstOrDefault(x => !string.IsNullOrEmpty(value) && x.Id.Equals(value)) ?? new Hardware("", "", "", Enums.OpeningTypes.NULL, "", 0, 0);
+ m_SelHardware = m_HardwareList.FirstOrDefault(x => !string.IsNullOrEmpty(value) && x.Id.Equals(value)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
}
@@ -1246,46 +1246,46 @@ namespace WebWindowComplex
case Openings.TURNONLY_LEFT:
case Openings.TURNONLY_RIGHT:
{
- return Enums.OpeningTypes.TURNONLY;
+ return Enums.OpeningTypes.TurnOnly;
}
case Openings.TILTTURN_LEFT:
case Openings.TILTTURN_RIGHT:
{
- return Enums.OpeningTypes.TILTTURN;
+ return Enums.OpeningTypes.TiltTurn;
}
case Openings.TILTONLY_TOP:
case Openings.TILTONLY_BOTTOM:
{
- return Enums.OpeningTypes.TILTONLY;
+ return Enums.OpeningTypes.TiltOnly;
}
case Openings.PIVOT:
{
- return Enums.OpeningTypes.PIVOT;
+ return Enums.OpeningTypes.Pivot;
}
case Openings.FIXED:
{
- return Enums.OpeningTypes.FIXED;
+ return Enums.OpeningTypes.Fixed;
}
case Openings.COMPLANARSLIDE_LEFT:
case Openings.COMPLANARSLIDE_RIGHT:
{
- return Enums.OpeningTypes.COMPLANARSLIDE;
+ return Enums.OpeningTypes.ComplanarSlide;
}
case Openings.LIFTSLIDE_LEFT:
case Openings.LIFTSLIDE_RIGHT:
{
- return Enums.OpeningTypes.LIFTSLIDE;
+ return Enums.OpeningTypes.LiftSlide;
}
default:
{
- return Enums.OpeningTypes.NULL;
+ return Enums.OpeningTypes.Null;
}
}
}
@@ -1356,7 +1356,7 @@ namespace WebWindowComplex
}
}
- return Enums.OpeningTypes.NULL;
+ return Enums.OpeningTypes.Null;
}
else
{
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 7d44d51..5170ef0 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.10.916
+ 2.7.10.917
Annamaria Sassi
Egalware
Componente gestione JWD per LUX
@@ -26,7 +26,7 @@
-
+
@@ -172,6 +172,13 @@
+
+
+
+
+
+
+
diff --git a/WebWindowTest/WebWindowTest.csproj b/WebWindowTest/WebWindowTest.csproj
index e2be174..d06e030 100644
--- a/WebWindowTest/WebWindowTest.csproj
+++ b/WebWindowTest/WebWindowTest.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/WebWindowTest/Window.cs b/WebWindowTest/Window.cs
index 5b88ce8..09f843d 100644
--- a/WebWindowTest/Window.cs
+++ b/WebWindowTest/Window.cs
@@ -14,68 +14,337 @@ using static WebWindowTest.ParametriOpzioni;
namespace WebWindowTest
{
-
- public class Window
+ public struct IdNameStruct
{
- public event EventHandler OnPreview = delegate { };
+ #region Public Constructors
- private string m_sProfilePath;
- public string sProfilePath
+ public IdNameStruct(int Id, string Name)
+ {
+ this = default(IdNameStruct);
+ m_Id = Id;
+ m_Name = Name;
+ }
+
+ #endregion Public Constructors
+
+ #region Public Properties
+
+ public int Id
{
get
{
- return m_sProfilePath;
+ return m_Id;
}
set
{
- m_sProfilePath = value;
+ m_Id = value;
}
}
- private string m_sMaterial;
- public string sMaterial
+ public string Name
{
get
{
- return m_sMaterial;
+ return m_Name;
}
set
{
- m_sMaterial = value;
- OnUpdatePreview(sSerialized());
+ m_Name = value;
}
}
- private string m_sColorMaterial;
- public string sColorMaterial
+ #endregion Public Properties
+
+ #region Public Methods
+
+ public static int IdFromInd(int Ind, ObservableCollection List)
+ {
+ return List[Ind].Id;
+ }
+
+ public static int IdFromInd(int Ind, List List)
+ {
+ return List[Ind].Id;
+ }
+
+ public static int IdFromInd(int Ind, ObservableCollection