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

Merge branch 'develop'

Browse Source
This commit is contained in:
Annamaria Sassi
2026-04-30 15:19:59 +02:00
parent 832c2ee304 a2302094f1
commit 61996b4db7
14 changed files with 430 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Data/AntaDoppiaInglesine.jwd
+143 -29
View File
@@ -10,18 +10,18 @@
{
"Index": 1,
"Name": "Width",
"Value": 800.0
"Value": 1400.0
},
{
"Index": 2,
"Name": "Height",
"Value": 1200.0
"Value": 2000.0
}
],
"ElementDimensionList": [
{
"Index": 1,
"Value": 78.0
"Value": 0.0
},
{
"Index": 2,
@@ -54,7 +54,7 @@
"JointType": "FULL_H"
}
],
"Threshold": "Bottom",
"Threshold": "Threshold",
"BottomRail": false,
"BottomRailQty": 0,
"BottomRailElemDimList": [],
@@ -168,27 +168,84 @@
"AreaList": [
{
"Side": "BOTH",
"SplitShape": "HORIZONTAL",
"SplitStartVert": false,
"SplitVertList": [],
"SplitHorizList": [
"SplitShape": "GRID",
"SplitStartVert": true,
"SplitVertList": [
{
"IsRelative": true,
"Dimension": 50.0,
"MeasureType": "PERCENTAGE"
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 50.0,
"MeasureType": "PERCENTAGE"
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
}
],
"SplitHorizList": [
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
}
],
"ElementDimVertList": [
{
"Index": 1,
"Value": 35.0,
"Area": 0
},
{
"Index": 2,
"Value": 35.0,
"Area": 0
}
],
"ElementDimVertList": [],
"ElementDimHorizList": [
{
"Index": 1,
"Value": 60.0,
"Area": 0
"Value": 35.0,
"Area": 1
},
{
"Index": 2,
"Value": 35.0,
"Area": 1
},
{
"Index": 3,
"Value": 35.0,
"Area": 1
},
{
"Index": 4,
"Value": 35.0,
"Area": 1
}
],
"GroupId": 7,
@@ -206,34 +263,91 @@
"AreaList": [
{
"FillType": "GLASS",
"GroupId": 6,
"GroupId": 8,
"AreaList": [
{
"Side": "BOTH",
"SplitShape": "HORIZONTAL",
"SplitStartVert": false,
"SplitVertList": [],
"SplitHorizList": [
"Side": "EXTERNAL",
"SplitShape": "GRID",
"SplitStartVert": true,
"SplitVertList": [
{
"IsRelative": true,
"Dimension": 50.0,
"MeasureType": "PERCENTAGE"
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 50.0,
"MeasureType": "PERCENTAGE"
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
}
],
"ElementDimVertList": [],
"ElementDimHorizList": [
"SplitHorizList": [
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
},
{
"IsRelative": true,
"Dimension": 1.0,
"MeasureType": "PROPORTIONAL"
}
],
"ElementDimVertList": [
{
"Index": 1,
"Value": 60.0,
"Value": 35.0,
"Area": 0
},
{
"Index": 2,
"Value": 35.0,
"Area": 0
}
],
"GroupId": 8,
"ElementDimHorizList": [
{
"Index": 1,
"Value": 35.0,
"Area": 1
},
{
"Index": 2,
"Value": 35.0,
"Area": 1
},
{
"Index": 3,
"Value": 35.0,
"Area": 1
},
{
"Index": 4,
"Value": 35.0,
"Area": 1
}
],
"GroupId": 9,
"AreaList": [],
"AreaType": "INGLESINA"
}
WebWindowComplex/Compo/AreaSplit.razor
+5
View File
@@ -18,6 +18,11 @@
</div>
}
</div>
<div class="col d-flex justify-content-center">
<div class="input-group mb-2 justify-content-center">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => RaiseAddInglesina()">Add Inglesina</button>
</div>
</div>
</div>
</div>
</div>
WebWindowComplex/Compo/AreaSplit.razor.cs
+10
View File
@@ -60,6 +60,16 @@ namespace WebWindowComplex.Compo
return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
}
/// <summary>
/// Metodo per aggiungere prima sash
/// </summary>
/// <returns></returns>
private Task RaiseAddInglesina()
{
CurrSplitted.AddInglesina();
return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
}
#endregion Private Methods
}
}
WebWindowComplex/Compo/CardInglesina.razor.cs
+1 -1
View File
@@ -310,7 +310,7 @@ namespace WebWindowComplex.Compo
{
for (int k = 0; k < SashGroupList[j].AreaList.Count; k++)
{
if (SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina))
if (SashGroupList[j].AreaList[k].AreaList[0].AreaList.Count > 0 && SashGroupList[j].AreaList[k].AreaList[0].AreaList[0].Equals(CurrInglesina))
{
return "Sash group " + (j + 1) + " - sash " + (k + 1);
}
WebWindowComplex/Compo/CardSplit.razor.cs
+1 -1
View File
@@ -230,7 +230,7 @@ namespace WebWindowComplex.Compo
var args = new DataUpdateSplit()
{
currSplit = CurrSplit,
svgNoHw = true
svgNoHw = false
};
await EC_UpdateSplit.InvokeAsync(args);
}
WebWindowComplex/Compo/CardTree.razor
+35 -18
View File
@@ -80,7 +80,8 @@
</button>
}
@if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME &&
((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)))
((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)) &&
FrameWindow.AreaList.FirstOrDefault() != null && FrameWindow.AreaList.First()!.AreaList.Count == 0)
{
<div class="dropdown px-4">
<button class="btn btn-sm dropdown-toggle" type="button" @onclick="ToggleDropdownFrame">
@@ -98,27 +99,43 @@
</ul>
</div>
}
@if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0)
@if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL)
{
int currIndexFill = ItemTableList[i].IndexItem;
Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
@if (currSplitted != null)
if (FillList.ElementAt(currIndexFill).ParentArea is Frame)
{
@if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null)
<div class="dropdown px-4">
<button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
<i class="fa-solid fa-plus"></i>
</button>
<ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
<li><button class="dropdown-item" @onclick="() => AddInglesinaIntoFill(currIndexFill)">Add Inglesina</button></li>
</ul>
</div>
}
else if (SplittedList != null && SplittedList.Count > 0)
{
Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
@if (currSplitted != null)
{
<div class="dropdown px-4">
<button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
<i class="fa-solid fa-plus"></i>
</button>
<ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
<li><button class="dropdown-item" @onclick="() => AddSashIntoFill(currIndexFill)">Add Sash</button></li>
@for (int k = 0; k < SashGroupList.Count; k++)
{
int Index = k;
<li><button class="dropdown-item" @onclick="() => CopySashIntoFill(Index, currIndexFill)">Copy Sash @(SashGroupList.Count == 1 ? "" : (Index + 1))</button></li>
}
</ul>
</div>
@if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null
&& currSplitted.AreaList.FirstOrDefault() != null && currSplitted.AreaList.First()!.AreaList.Count == 0)
{
<div class="dropdown px-4">
<button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
<i class="fa-solid fa-plus"></i>
</button>
<ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
<li><button class="dropdown-item" @onclick="() => AddInglesinaIntoFill(currIndexFill)">Add Inglesina</button></li>
<li><button class="dropdown-item" @onclick="() => AddSashIntoFill(currIndexFill)">Add Sash</button></li>
@for (int k = 0; k < SashGroupList.Count; k++)
{
int Index = k;
<li><button class="dropdown-item" @onclick="() => CopySashIntoFill(Index, currIndexFill)">Copy Sash @(SashGroupList.Count == 1 ? "" : (Index + 1))</button></li>
}
</ul>
</div>
}
}
}
}
WebWindowComplex/Compo/CardTree.razor.cs
+28
View File
@@ -219,6 +219,34 @@ namespace WebWindowComplex.Compo
return EC_UpdateSplitted.InvokeAsync(currSplitted);
}
/// <summary>
/// Chiamata per aggiungere inglesina in un fill
/// </summary>
/// <param name="currIndexFill"> indice del fill </param>
/// <returns></returns>
private Task AddInglesinaIntoFill(int currIndexFill)
{
Splitted? currSplitted;
Frame? currFrame;
if (FillList.ElementAt(currIndexFill).ParentArea is Splitted)
{
currSplitted = (Splitted)FillList.ElementAt(currIndexFill).ParentArea;
currSplitted.AddInglesina();
return EC_UpdateSplitted.InvokeAsync(currSplitted);
}
else if(FillList.ElementAt(currIndexFill).ParentArea is Frame)
{
currFrame = (Frame)FillList.ElementAt(currIndexFill).ParentArea;
currFrame.AddInglesina();
DataUpdateFrame args = new DataUpdateFrame()
{
currFrame = currFrame
};
return EC_UpdateFrame.InvokeAsync(args);
}
return null;
}
/// <summary>
/// Chiamata per copiare sash in fill
/// </summary>
WebWindowComplex/Models/Area.cs
+1 -1
View File
@@ -339,7 +339,7 @@ namespace WebWindowComplex.Models
dimList.Add(new AreaDimension(item.dDimension, item.MeasureType, item.Parent));
if (nameDim.Equals("Width"))
{
if (s.AreaList.ElementAt(i).AreaList.First() is Sash sash && sash != null)
if (s.AreaList.ElementAt(i).AreaList.First() is Sash sash && sash != null && sash.SashList.First().ElementDimensionList.Count > 0)
dimTot = dimTot + sash.SashList.Last().ElementDimensionList.ElementAt(1).dOverlap + sash.SashList.First().ElementDimensionList.Last().dOverlap;
SearchAreaList(node.AreaList.ElementAt(i), dimTot, nameDim);
}
WebWindowComplex/Models/Inglesina.cs
+18 -16
View File
@@ -123,13 +123,10 @@ namespace WebWindowComplex.Models
if (nSplitQtyVert == 0)
{
ParentArea.AreaList.Remove(this);
Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
ParentArea.AreaList.Add(newFill);
}
else
{
ElemDimHorizList.RemoveAt(0);
ElemDimHorizList.Clear();
SetSplitShape(SplitShapes.VERTICAL);
SetSplitStartVert(true);
// Controllo quanti split orizzontali ci sono
@@ -222,18 +219,23 @@ namespace WebWindowComplex.Models
}
if (bSplitStartVert)
{
// Rimuovo da tutte le sottoaree degli element l'ultimo elemento
// Rimuovo da tutte le sottoaree gli element
for (int subArea = 1; subArea <= ElemDimHorizList.Max(x => x.nSubArea); subArea++)
{
SplitElementDimension? removeElem = ElemDimHorizList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).FirstOrDefault();
if (removeElem != null)
ElemDimHorizList.Remove(removeElem);
List<SplitElementDimension> elemDimList = ElemDimHorizList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).ToList();
for (var SplitIndex = elemDimList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimHorizList.Remove(elemDimList.ElementAt(elemDimList.Count - 1));
}
}
}
else
{
int deleteSubArea = ElemDimHorizList.Count + 1;
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
}
if (nSplitQtyVert > 0)
ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
@@ -261,13 +263,10 @@ namespace WebWindowComplex.Models
if (nSplitQtyHoriz == 0)
{
ParentArea.AreaList.Remove(this);
Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
ParentArea.AreaList.Add(newFill);
}
else
{
ElemDimVertList.RemoveAt(0);
ElemDimVertList.Clear();
SetSplitShape(SplitShapes.HORIZONTAL);
SetSplitStartVert(false);
// Controllo quanti split orizzontali ci sono
@@ -366,7 +365,10 @@ namespace WebWindowComplex.Models
if (bSplitStartVert)
{
int deleteSubArea = ElemDimVertList.Count + 1;
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
for(var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
}
if (nSplitQtyHoriz > 0)
ElemDimHorizList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
@@ -375,8 +377,8 @@ namespace WebWindowComplex.Models
// Rimuovo da tutte le sottoaree degli element l'ultimo elemento
for (int subArea = 1; subArea <= ElemDimVertList.Max(x => x.nSubArea); subArea++)
{
SplitElementDimension removeElem = ElemDimVertList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).FirstOrDefault();
ElemDimVertList.Remove(removeElem);
List<SplitElementDimension> elemDimList = ElemDimVertList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).ToList();
ElemDimVertList.Remove(elemDimList.ElementAt(elemDimList.Count - 1));
}
}
}
WebWindowComplex/Models/Sash.cs
+7 -4
View File
@@ -271,7 +271,7 @@ namespace WebWindowComplex.Models
AreaList.Add(Splitted.CreateSplitted(this));
}
// Riaggiungo i sottoalberi che avevo salvato
for (int i = 0; i < AreaList.Count - 1; i++)
for (int i = 0; i <= ContentArea.Count - 1; i++)
{
if (AreaList.Count == 2)
{
@@ -280,9 +280,12 @@ namespace WebWindowComplex.Models
AreaList[i].AreaList.Add(ContentArea[i]);
}
// Aggiungo all'ultimo Splitted l'area di vetro
Fill newFill = Fill.CreateFill(AreaList[1], FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
AreaList[AreaList.Count - 1].AreaList.Add(newFill);
for(int k = ContentArea.Count; k <= AreaList.Count - 1; k++)
{
Fill newFill = Fill.CreateFill(AreaList[k], FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
AreaList[k].AreaList.Add(newFill);
}
}
// Se tolgo anta
else
WebWindowComplex/Models/Split.cs
+8 -2
View File
@@ -206,7 +206,10 @@ namespace WebWindowComplex.Models
else
{
int deleteSubArea = ElemDimHorizList.Count + 1;
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
for (var SplitIndex = ElemDimHorizList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimHorizList.RemoveAt(ElemDimHorizList.Count - 1);
}
if(nSplitQtyVert > 0)
ElemDimVertList.RemoveAll(x => x.nSubArea == deleteSubArea);
}
@@ -371,7 +374,10 @@ namespace WebWindowComplex.Models
if (m_bSplitStartVert)
{
int deleteSubArea = ElemDimVertList.Count + 1;
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
for (var SplitIndex = ElemDimVertList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
ElemDimVertList.RemoveAt(ElemDimVertList.Count - 1);
}
if(nSplitQtyHoriz > 0)
ElemDimHorizList.RemoveAll(x=>x.nSubArea == deleteSubArea);
}
WebWindowComplex/TableComp.razor.cs
+91 -41
View File
@@ -1351,10 +1351,16 @@ namespace WebWindowComplex
for (int i = 0; i < SashGroupList.Count; i++)
{
if ((string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware)) &&
prevHardware != null && prevHardware.Count > 0 &&
SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty)
prevHardware != null && prevHardware.Count > 0)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id);
if(i >= prevHardware.Count)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.FirstOrDefault()!.Id);
}
else if(SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id);
}
}
else if (prevHardware != null &&
(!string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware) || SashGroupList.ElementAt(i).SelHardware != null || SashGroupList.ElementAt(i).SelHardware.Id != "000000"))
@@ -1537,31 +1543,72 @@ namespace WebWindowComplex
}
else if (sash.ParentArea.ParentArea is Split s && s.nSplitQtyHoriz > 0)
{
int indexAreaSplit = s.AreaList.IndexOf(sash.ParentArea);
int indexSplit = indexAreaSplit == 0 ? 0 : indexAreaSplit - 1;
int indexAreaSplit = 0;
int indexSplit = 0;
if (s.SelSplitShape is SplitShapes.HORIZONTAL || s.SelSplitShape is SplitShapes.VERTICAL)
{
indexAreaSplit = s.AreaList.IndexOf(sash.ParentArea);
indexSplit = indexAreaSplit == 0 ? 0 : indexAreaSplit - 1;
}
else
{
if (s.bSplitStartVert)
{
indexAreaSplit = s.AreaList.IndexOf(sash.ParentArea) % s.ElemDimHorizList.Count;
indexSplit = indexAreaSplit == 0 ? 0 : indexAreaSplit - 1;
}
else
{
int index = (int)Math.Floor((double)(s.AreaList.IndexOf(sash.ParentArea) / s.SplitHorizList.Count));
//indexAreaSplit = index > 0 ? index - 1 : 0;
indexAreaSplit = index;
indexSplit = indexAreaSplit == 0 ? 0 : indexAreaSplit - 1;
}
}
if (indexAreaSplit == 0)
{
overlapNameBottom = "Sash_Bottom";
overlapNameTop = "Mixed_Split_Top";
}
else if (indexAreaSplit == s.AreaList.Count() - 1)
else
{
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameBottom = "Mixed_Split_Bottom";
if(s.SelSplitShape is SplitShapes.HORIZONTAL || s.SelSplitShape is SplitShapes.VERTICAL)
{
if (indexAreaSplit == s.AreaList.Count() - 1)
{
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameBottom = "Mixed_Split_Bottom";
else
overlapNameBottom = "Sash_Horizontal_Bottom";
overlapNameTop = "Sash_Top";
}
else
{
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameBottom = "Mixed_Split_Bottom";
else
overlapNameBottom = "Sash_Horizontal_Bottom";
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameTop = "Mixed_Split_Top";
else
overlapNameTop = "Sash_Horizontal_Top";
}
}
else
overlapNameBottom = "Sash_Horizontal_Bottom";
overlapNameTop = "Sash_Top";
}
else
{
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameBottom = "Mixed_Split_Bottom";
else
overlapNameBottom = "Sash_Horizontal_Bottom";
if (s.ElemDimHorizList.ElementAt(indexSplit).sName.Contains("Mixed"))
overlapNameTop = "Mixed_Split_Top";
else
overlapNameTop = "Sash_Horizontal_Top";
{
int num = (int)Math.Floor((Double)(s.AreaList.Count() / s.SplitHorizList.Count));
int numRow = num > 0 ? num - 1 : 0;
if (indexAreaSplit == numRow)
{
overlapNameBottom = "Mixed_Split_Bottom";
overlapNameTop = "Sash_Top";
}
else
{
overlapNameBottom = "Mixed_Split_Bottom";
overlapNameTop = "Sash_Horizontal_Top";
}
}
}
if (sash.SashList.Count == 1)
{
@@ -2153,33 +2200,36 @@ namespace WebWindowComplex
{
Inglesina inglesina = (Inglesina)found;
List<SplitElementDimension> IngElemList = inglesina.searchElemFromSubArea(EntityIdSearch);
for (int i = 0; i < IngElemList.Count; i++)
if (IngElemList != null && IngElemList.Count > 0)
{
IngElemList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
IngElemList.ElementAt(i).SetMinDimension(Window.m_ParameterList.GetValueOrDefault(IngElemList.ElementAt(i).sName + "_DimMin"));
IngElemList.ElementAt(i).SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(IngElemList.ElementAt(i).sName + "_DimMax"));
if (IngElemList.ElementAt(i).dDimension > IngElemList.ElementAt(i).dMaxDim)
for (int i = 0; i < IngElemList.Count; i++)
{
IngElemList.ElementAt(i).SetDimension(IngElemList.ElementAt(i).dMaxDim);
Frame frame = inglesina.ParentWindow.AreaList.First();
if (frame != null)
IngElemList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
IngElemList.ElementAt(i).SetMinDimension(Window.m_ParameterList.GetValueOrDefault(IngElemList.ElementAt(i).sName + "_DimMin"));
IngElemList.ElementAt(i).SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(IngElemList.ElementAt(i).sName + "_DimMax"));
if (IngElemList.ElementAt(i).dDimension > IngElemList.ElementAt(i).dMaxDim)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
IngElemList.ElementAt(i).SetDimension(IngElemList.ElementAt(i).dMaxDim);
Frame frame = inglesina.ParentWindow.AreaList.First();
if (frame != null)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
}
}
}
else if (IngElemList.ElementAt(i).dDimension < IngElemList.ElementAt(i).dMinDim)
{
IngElemList.ElementAt(i).SetDimension(IngElemList.ElementAt(i).dMinDim);
Frame frame = inglesina.ParentWindow.AreaList.First();
if (frame != null)
else if (IngElemList.ElementAt(i).dDimension < IngElemList.ElementAt(i).dMinDim)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
IngElemList.ElementAt(i).SetDimension(IngElemList.ElementAt(i).dMinDim);
Frame frame = inglesina.ParentWindow.AreaList.First();
if (frame != null)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
}
}
//string overlapName = string.Join("_", IngElemList.ElementAt(i).sName.Split('_').Skip(1));
//IngElemList.ElementAt(i).SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapName + "_Overlap"));
}
//string overlapName = string.Join("_", IngElemList.ElementAt(i).sName.Split('_').Skip(1));
//IngElemList.ElementAt(i).SetOverlapElement(Window.m_ParameterList.GetValueOrDefault(overlapName + "_Overlap"));
}
break;
}
WebWindowComplex/WebWindowComplex.csproj
+48 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.4.1609</Version>
<Version>3.1.4.2916</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -133,6 +133,53 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+34 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.4.1609</Version>
<Version>3.1.4.2910</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -238,6 +238,39 @@