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

Corretti alcuni Warnings

Browse Source
This commit is contained in:
Annamaria Sassi
2026-01-28 11:26:54 +01:00
parent 3f96d71c30
commit ce8bd4fafc
27 changed files with 479 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/TableComp.razor.cs
+10 -10
View File
@@ -622,7 +622,7 @@ namespace WebWindowComplex
};
//FrameArcElement ae = new FrameArcElement(frame, window, 10, true, true);
JsonWindow jsonWindow = new JsonWindow("Profilo78", "Pino", "Black", "Vetro BE 2S 4T/16/4T");
JsonFrame jsonFrame = new JsonFrame(Shapes.RECTANGLE, null, false, 0, 1);
JsonFrame jsonFrame = new JsonFrame(Shapes.RECTANGLE, "Bottom", false, 0, 1);
jsonWindow.AreaList.Add(jsonFrame);
//jsonFrame.ArcElement = ae.Serialize();
foreach (var Dimension in DimensionList)
@@ -764,7 +764,7 @@ namespace WebWindowComplex
// Inserisco i profili ricevuti nei rispettivi Element
foreach (var item in LiveData.ProfElementList)
{
UpdateProfileElement(item.Profiles, item.GroupId, item.SashId);
UpdateProfileElement(item.Profiles, item.GroupId, item.SashId < 1 ? -1: item.SashId);
}
}
}
@@ -792,8 +792,8 @@ namespace WebWindowComplex
{
//Frame.m_AllThresholdList = ListPayload.Threshold;
string profile = WindowFromJson.ProfilePath;
Window.m_ParameterList = ListPayload.ProfileList.FirstOrDefault(x => x.ProfileName.Equals(profile)).ParameterDict;
Frame.m_AllThresholdList = ListPayload.ProfileList.FirstOrDefault(x => x.ProfileName.Equals(profile)).ThresholdList;
Window.m_ParameterList = ListPayload.ProfileList?.FirstOrDefault(x => x.ProfileName.Equals(profile))?.ParameterDict ?? new();
Frame.m_AllThresholdList = ListPayload.ProfileList?.FirstOrDefault(x => x.ProfileName.Equals(profile))?.ThresholdList ?? new();
Sash.m_HardwareCompleteList = ListPayload.Hardware;
Sash.s_FamilyHardwareList = ListPayload.FamilyHardware;
}
@@ -1078,7 +1078,7 @@ namespace WebWindowComplex
/// <param name="currentArea"> Area che si sta analizzando </param>
/// <param name="idSearch"> Id Area che si sta cercando </param>
/// <returns></returns>
private Area SearchAreaFromGroupId(Area currentArea, int idSearch)
private Area? SearchAreaFromGroupId(Area currentArea, int idSearch)
{
if (currentArea.GroupId == idSearch)
{
@@ -1086,7 +1086,7 @@ namespace WebWindowComplex
}
foreach (Area child in currentArea.AreaList)
{
Area found = SearchAreaFromGroupId(child, idSearch);
Area? found = SearchAreaFromGroupId(child, idSearch);
if (found != null)
{
return found;
@@ -1102,7 +1102,7 @@ namespace WebWindowComplex
/// <param name="GroupIdSearch"> Id Area che si sta cercando </param>
/// <param name="SashIdSearch"> Id dell'anta (se -1 non usare) </param>
/// <returns></returns>
private void UpdateProfileElement(List<string> profileNameList, int GroupIdSearch, int SashIdSearch = -1)
private void UpdateProfileElement(List<string> profileNameList, int GroupIdSearch, int SashIdSearch)
{
// Cerco area corrispondente al GroupId
Area found = SearchAreaFromGroupId(FrameWindow, SashIdSearch);
@@ -1266,7 +1266,7 @@ namespace WebWindowComplex
if (newFrame != null)
{
// cerco il record
var currRec = m_CurrWindow.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
var currRec = m_CurrWindow?.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
// lo aggiorno
currRec = newFrame;
if (forceSvgNoHw)
@@ -1286,7 +1286,7 @@ namespace WebWindowComplex
if (newFrame != null)
{
// cerco il record
var currRec = m_CurrWindow.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
var currRec = m_CurrWindow?.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
// lo aggiorno
currRec = newFrame;
// resetto hw lst
@@ -1312,7 +1312,7 @@ namespace WebWindowComplex
if (newFrame != null)
{
// cerco il record
var currRec = m_CurrWindow.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
var currRec = m_CurrWindow?.AreaList.FirstOrDefault(x => x.GroupId == newFrame.GroupId);
// lo aggiorno
currRec = newFrame;
// richiedo update element del frame