diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index 433c145..b88394c 100644 --- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj +++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2303.3112 + 1.2.2303.3114 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 2a7c25e..f9dfae7 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2303.3112 + Version: 1.2.2303.3114 Release Note: diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index be2a2bf..124a9da 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2303.3112 +1.2.2303.3114 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index 252e63d..91c4715 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2303.3112 + 1.2.2303.3114 http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj index f233458..6bd0283 100644 --- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj +++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2303.3112 + 1.2.2303.3114 diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs index 7ad2525..e9bf6d1 100644 --- a/MP.MONO.DECODER/Program.cs +++ b/MP.MONO.DECODER/Program.cs @@ -1612,15 +1612,15 @@ void CounterRecvPipe_EA_NewMessage(object? sender, EventArgs e) { foreach (var item in incrSet) { - // verifico i valori > soglia 1 minuto... - if (item.Value > 1) + // verifico i valori > soglia 5 minuti... + if (item.Value > 5) { // salvo var countRec = countStatus.Where(x => x.CCode == item.Key || x.CodAlias == item.Key).FirstOrDefault(); if (countRec != null) { // attenzione valori in ore, incrementi in minuti! - countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 3); + countRec.ActualVal = Math.Round(countRec.ActualVal + item.Value/60, 6); // resetto counterMan.resetAccum(item.Key); } diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 2a7c25e..f9dfae7 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2303.3112 + Version: 1.2.2303.3114 Release Note: diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index be2a2bf..124a9da 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2303.3112 +1.2.2303.3114 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index a8dd62f..f45dd23 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2303.3112 + 1.2.2303.3114 http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index 5a5e267..ea49adc 100644 --- a/MP.MONO.SIM/MP.MONO.SIM.csproj +++ b/MP.MONO.SIM/MP.MONO.SIM.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2303.3112 + 1.2.2303.3114 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 2a7c25e..f9dfae7 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2303.3112 + Version: 1.2.2303.3114 Release Note: diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index be2a2bf..124a9da 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2303.3112 +1.2.2303.3114 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index d03f3d4..9b3a8fa 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2303.3112 + 1.2.2303.3114 http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.UI/Components/ProgBar.razor b/MP.MONO.UI/Components/ProgBar.razor index 9d62c7b..8b1f617 100644 --- a/MP.MONO.UI/Components/ProgBar.razor +++ b/MP.MONO.UI/Components/ProgBar.razor @@ -1,17 +1,24 @@ @if (singleLine) { - @($"{currVal:N0} h | {percWidth}%") + @($"{currVal:N0} h | {percWidthNum}%") } else { - @currVal.ToString("N0") + @currVal.ToString("N0") (@($"{maxVal:N0}")) - @(percWidth)% + + @if (percWidthNum > yelLim || percWidthNum <= 0) + { + @(percWidthNum)% + } + + @if (percWidthNum <= yelLim && percWidthNum > 0) + { + @(percWidthNum)% + } -} - - +} \ No newline at end of file diff --git a/MP.MONO.UI/Components/ProgBar.razor.cs b/MP.MONO.UI/Components/ProgBar.razor.cs index bee0f2e..82ad751 100644 --- a/MP.MONO.UI/Components/ProgBar.razor.cs +++ b/MP.MONO.UI/Components/ProgBar.razor.cs @@ -53,7 +53,23 @@ namespace MP.MONO.UI.Components } } - private int percWidth { get => (int)(100 * currVal / maxVal); } + private int percWidthNum { get => (int)(100 * currVal / maxVal); } + private int percWidh + { + get + { + int answ = percWidthNum; + if (answ <= 0) + { + answ = 100; + } + //else if (answ <= redLim) + //{ + // answ = redLim; + //} + return answ; + } + } private string textStyle { diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index 52d8c92..3924bb6 100644 --- a/MP.MONO.UI/MP.MONO.UI.csproj +++ b/MP.MONO.UI/MP.MONO.UI.csproj @@ -5,7 +5,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2303.3112 + 1.2.2303.3114 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 2a7c25e..f9dfae7 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO - Version: 1.2.2303.3112 + Version: 1.2.2303.3114 Release Note: diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index be2a2bf..124a9da 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.2.2303.3112 +1.2.2303.3114 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 458abbd..460eb7f 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.2.2303.3112 + 1.2.2303.3114 http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html false