diff --git a/README.md b/README.md index e908008..01aafd9 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,18 @@ Al frame sono associate le seguenti caratteristiche: - Giunti; - Quantità bottom Rail. +#### Forme Telaio + +Le forme ammesse per il telaio sono le seguenti: + - Arc + - Circle + - Custom + - FullArc + - Rectangle + - SemiArc + - SemiFullArc + - Trapezoid + ### Divisione (Split) Uno split genera sempre almeno due sottoaree contenenti ognuna un riempimento (Fill) di tipo vetro. @@ -99,6 +111,8 @@ La lista degli hardware viene aggiornata se si cambiano i seguenti parametri: Descrive il tipo di riempimento: vetro o pannello. + + ## Roadmap Mancano: diff --git a/README.pdf b/README.pdf new file mode 100644 index 0000000..e72c279 Binary files /dev/null and b/README.pdf differ diff --git a/Test.UI/Hardware/Setup.json b/Test.UI/Hardware/Setup.json index 25b20a0..69b182c 100644 --- a/Test.UI/Hardware/Setup.json +++ b/Test.UI/Hardware/Setup.json @@ -4,7 +4,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -13,7 +13,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -31,7 +31,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -58,7 +58,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -67,7 +67,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -94,7 +94,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -112,7 +112,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -130,7 +130,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4_Centrale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 2 }, @@ -139,7 +139,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TiltTurn", - "shape": "Trapezoidal", + "shape": "Trapezoid", "sashQty": 2, "sashPosition": 1 }, @@ -148,7 +148,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4_CerniereScomparsa", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -157,7 +157,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -166,7 +166,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -175,7 +175,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 4, "sashPosition": 2 }, @@ -193,7 +193,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12_Centrale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 2 }, @@ -220,7 +220,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -229,7 +229,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 4, "sashPosition": 2 }, @@ -238,7 +238,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -247,7 +247,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4_Centrale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 2 }, @@ -256,7 +256,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -265,7 +265,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12_Centrale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 2 }, @@ -292,7 +292,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -301,7 +301,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -337,7 +337,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 4, "sashPosition": 2 }, @@ -346,7 +346,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -373,7 +373,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12_Laterale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -382,7 +382,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TiltTurn", - "shape": "Trapezoidal", + "shape": "Trapezoid", "sashQty": 2, "sashPosition": 1 }, @@ -391,7 +391,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4_Laterale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -400,7 +400,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12_CernieraScomparsa", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -436,7 +436,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4_Laterale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -454,7 +454,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -463,7 +463,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -499,7 +499,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12_Laterale", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -508,7 +508,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 4, "sashPosition": 2 }, @@ -535,7 +535,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria4", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 2, "sashPosition": 1 }, @@ -553,7 +553,7 @@ "familyName": "ArTechPlana", "description": "ArTechPlana_Aria12", "openingType": "TiltTurn", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 3, "sashPosition": 1 }, @@ -562,7 +562,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TurnOnly", - "shape": "Rectangular", + "shape": "Rectangle", "sashQty": 1, "sashPosition": 1 }, @@ -580,7 +580,7 @@ "familyName": "ArTech", "description": "ArTech_Aria12", "openingType": "TiltTurn", - "shape": "Trapezoidal", + "shape": "Trapezoid", "sashQty": 1, "sashPosition": 1 }, @@ -607,7 +607,7 @@ "familyName": "ArTech", "description": "ArTech_Aria4", "openingType": "TiltTurn", - "shape": "Trapezoidal", + "shape": "Trapezoid", "sashQty": 1, "sashPosition": 1 } diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index f4c3306..eb8d2ec 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -257,7 +257,7 @@ namespace WebWindowComplex.Models /// private string FindSashShape() { - return "Rectangular"; + return "Rectangle"; } #endregion Private Methods diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 8919117..abbbe3a 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -846,7 +846,7 @@ namespace WebWindowComplex.Models private string FindSashShape() { - return "Rectangular"; + return "Rectangle"; } #endregion Private Methods diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 78293cc..e39f3fb 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -78,5 +78,6 @@ + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 4bc6a2a..3884f9d 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -151,5 +151,6 @@ + diff --git a/WebWindowTest/Window.cs b/WebWindowTest/Window.cs index bffa8bb..ef4cca0 100644 --- a/WebWindowTest/Window.cs +++ b/WebWindowTest/Window.cs @@ -1222,7 +1222,7 @@ namespace WebWindowTest } private string FindSashShape() { - return "Rectangular"; + return "Rectangle"; } internal Enums.OpeningTypes GetOpeningType(Openings OpeningType) {