diff --git a/WebWindowComplex/Compo/CardTree.razor b/WebWindowComplex/Compo/CardTree.razor index d1a7a68..702c019 100644 --- a/WebWindowComplex/Compo/CardTree.razor +++ b/WebWindowComplex/Compo/CardTree.razor @@ -1,138 +1,140 @@ @using static WebWindowComplex.LayoutConst - - - @for (int i = 0; i < maxCol; i++) - { - - } - - - @for (int i = 0; i < ItemTableList.Count; i++) - { - - @for (int j = 0; j < maxCol; j++) - { - var index = RowCollapsedDict.Keys.Order().Where(k => k <= i).LastOrDefault(); - @if ((RowCollapsedDict.ContainsValue(true) && RowCollapsedDict.GetValueOrDefault(index)) - && i - 1 > 0 && ItemTableList.ElementAt(i).Col > ItemTableList.ElementAt(index-1).Col){ - continue; - } - else +
+
+ + @for (int i = 0; i < maxCol; i++) + { + + } + + + @for (int i = 0; i < ItemTableList.Count; i++) + { + + @for (int j = 0; j < maxCol; j++) { - CompileStep cs = CompileStep.Frame; - int row = i; - int ind = -1; - string s = "Vai a step "; - @if (j + 1 == ItemTableList[i].Col) - { - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME) - { - cs = CompileStep.Frame; - s = s + cs.ToString(); - } - else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT) - { - cs = CompileStep.Split; - ind = ItemTableList[i].IndexItem; - s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1): ""); - } - else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH) - { - cs = CompileStep.Sash; - ind = ItemTableList[i].IndexItem; - s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : ""); - } - else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL) - { - cs = CompileStep.Fill; - ind = ItemTableList[i].IndexItem; - s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : ""); - } - + var index = RowCollapsedDict.Keys.Order().Where(k => k <= i).LastOrDefault(); + @if ((RowCollapsedDict.ContainsValue(true) && RowCollapsedDict.GetValueOrDefault(index)) + && i - 1 > 0 && ItemTableList.ElementAt(i).Col > ItemTableList.ElementAt(index-1).Col){ + continue; } else { - @* *@ - + CompileStep cs = CompileStep.Frame; + int row = i; + int ind = -1; + string s = "Vai a step "; + @if (j + 1 == ItemTableList[i].Col) + { + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME) + { + cs = CompileStep.Frame; + s = s + cs.ToString(); + } + else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT) + { + cs = CompileStep.Split; + ind = ItemTableList[i].IndexItem; + s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1): ""); + } + else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH) + { + cs = CompileStep.Sash; + ind = ItemTableList[i].IndexItem; + s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : ""); + } + else if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL) + { + cs = CompileStep.Fill; + ind = ItemTableList[i].IndexItem; + s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : ""); + } + + } + else + { + @* *@ + + } } } - } - - } - -
- @*
*@ -
-
- - @if (ItemTableList[row].NumChild > 4) - { - - } - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH || - ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT) - { - - } - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME && - ((SashList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split))) - { - - } - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0) - { - int currIndexFill = ItemTableList[i].IndexItem; - Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault(); - @if (currSplitted != null) - { - @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null) - { - - } - } - } -
-
- @*
- -
*@ - @*
*@ -
@FillTable(i, j) + @*
*@ +
+
+ + @if (ItemTableList[row].NumChild > 4) + { + + } + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH || + ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT) + { + + } + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME && + ((SashList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split))) + { + + } + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0) + { + int currIndexFill = ItemTableList[i].IndexItem; + Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault(); + @if (currSplitted != null) + { + @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null) + { + + } + } + } +
+
+ @*
+ +
*@ + @*
*@ +
@FillTable(i, j)
\ No newline at end of file + + } + + + \ No newline at end of file diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 4af769d..13fbe28 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -156,10 +156,10 @@ namespace WebWindowComplex.Models } SashList.Add(addSashDim); } - if (frame != null && (frame.SelShapeIndex == (int)Shapes.ARC - || frame.SelShapeIndex == (int)Shapes.DOUBLEARC - || frame.SelShapeIndex == (int)Shapes.ARC_FULL - || frame.SelShapeIndex == (int)Shapes.THREECENTERARC)) + if (m_CurrShape == "FullArc" || + m_CurrShape == "Arc" || + m_CurrShape == "SemiFullArc" || + m_CurrShape == "SemiArc") { if (SashList.ElementAt(value - 2) != null) SashList.ElementAt(value - 2)!.JointList.ElementAt(2).SelJointTypeIndex = (int)Joints.FULL_V; @@ -215,10 +215,10 @@ namespace WebWindowComplex.Models { SashList.RemoveAt(0); } - if (frame != null && (frame.SelShapeIndex == (int)Shapes.ARC - || frame.SelShapeIndex == (int)Shapes.DOUBLEARC - || frame.SelShapeIndex == (int)Shapes.ARC_FULL - || frame.SelShapeIndex == (int)Shapes.THREECENTERARC)) + if (m_CurrShape == "FullArc" || + m_CurrShape == "Arc" || + m_CurrShape == "SemiFullArc" || + m_CurrShape == "SemiArc") { if (SashList.LastOrDefault() != null) { diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 1582d67..c3f7949 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -96,7 +96,7 @@
-
+
@if (currStep == CompileStep.Tree) { } *@
-
+
@outSvg
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 5e47747..86390ec 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.1218 + 3.1.3.1309 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -331,6 +331,9 @@ + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index e34c3b1..084d2b9 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.1218 + 3.1.3.1309 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -371,6 +371,23 @@ + + + + + + + + + + + + + + + + +