Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release/AddGcCollect01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-01-26 10:00:16 +01:00
parent 424f3f3e9d f84671fee8
commit 7d76b7b5f7
8 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/MseSampler.razor.cs
+1
View File
@@ -31,6 +31,7 @@ namespace MP_TAB3.Components
aTimer.Dispose();
Log.Info("MseSampler Timer Disposed!");
}
GC.Collect();
}
#endregion Public Methods
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2401.1911</Version>
<Version>6.16.2401.2609</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Pages/StatusMap.razor
+26 -26
View File
@@ -2,35 +2,35 @@
<MseSampler SampleMult="1.5" E_Updated="SaveData"></MseSampler>
<div class="pe-2">
<div class="row mb-2">
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
{
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
}
else
{
int maxBlocks = calcMaxBlock();
int currIdx = 0;
@foreach (var item in ListMSE)
<div class="row mb-2">
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize)
{
currIdx++;
<div class="col px-1">
<MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" showCard="@ShowCard"></MachineBlock>
</div>
@if (currIdx >= maxBlocks)
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
}
else
{
int maxBlocks = calcMaxBlock();
int currIdx = 0;
@foreach (var item in ListMSE)
{
currIdx = 0;
@((MarkupString)"</div>")
@((MarkupString)"<div class=\"row mb-2\">")
currIdx++;
<div class="col px-1">
<MachineBlock RecMSE="@item" FullMode="true" Width="@Width" Height="@Height" showCard="@ShowCard"></MachineBlock>
</div>
@if (currIdx >= maxBlocks)
{
currIdx = 0;
@((MarkupString)"</div>")
@((MarkupString)"<div class=\"row mb-2\">")
}
}
// controllo se devo "chiudere riga...
int currNum = (currIdx % maxBlocks);
while (currNum < (maxBlocks))
{
@((MarkupString)"<div class=\"col px-1 bloccoMacc\">&nbsp;</div>")
currNum++;
}
}
// controllo se devo "chiudere riga...
int currNum = (currIdx % maxBlocks);
while (currNum < (maxBlocks))
{
@((MarkupString)"<div class=\"col px-1 bloccoMacc\">&nbsp;</div>")
currNum++;
}
}
</div>
</div>
MP-TAB3/Pages/StatusMap.razor.cs
+7 -1
View File
@@ -9,7 +9,7 @@ using System.Runtime.ExceptionServices;
namespace MP_TAB3.Pages
{
public partial class StatusMap
public partial class StatusMap: IDisposable
{
#region Public Classes
@@ -23,6 +23,12 @@ namespace MP_TAB3.Pages
#endregion Public Properties
}
public void Dispose()
{
ListMSE = null;
GC.Collect();
}
#endregion Public Classes
#region Protected Fields
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2401.1911</h4>
<h4>Versione: 6.16.2401.2609</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2401.1911
6.16.2401.2609
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2401.1911</version>
<version>6.16.2401.2609</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP-TAB3/Shared/NavMenu.razor
+1 -1
View File
@@ -61,6 +61,6 @@
await MsgServ.IdxMaccSet("");
}
await MsgServ.LastOpenedPageSet(tgtUrl);
navManager.NavigateTo(tgtUrl);
navManager.NavigateTo(tgtUrl, true);
}
}