From 6ca217d76ea2dd8a67eb4b5cf9e4b2d2f26f7a67 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 11 Mar 2025 17:39:29 +0100 Subject: [PATCH] Inizio update MON --- MP.Mon/MP.Mon.csproj | 2 +- MP.Mon/Pages/Index.razor | 34 +++++++++++++--- MP.Mon/Pages/Index.razor.cs | 49 +++++++++++++++++++++--- MP.Mon/Resources/ChangeLog.html | 2 +- MP.Mon/Resources/VersNum.txt | 2 +- MP.Mon/Resources/manifest.xml | 2 +- MP.Stats/Components/ChartTrends.razor.cs | 4 +- MP.Stats/MP.Stats.csproj | 4 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 11 files changed, 83 insertions(+), 22 deletions(-) diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index 3f659728..e8b9ccba 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2411.1209 + 6.16.2503.1117 diff --git a/MP.Mon/Pages/Index.razor b/MP.Mon/Pages/Index.razor index 29bdbd95..d6508259 100644 --- a/MP.Mon/Pages/Index.razor +++ b/MP.Mon/Pages/Index.razor @@ -5,13 +5,13 @@ MP MON
- @if (listMSE == null) + @if (ListMSE == null) {
} - else if (listMSE.Count == 0) + else if (ListMSE.Count == 0) {
@@ -21,22 +21,46 @@ } else { + int mseIdx = 0; + for (int i = 0; i < mapNRow; i++) + { +
+ @for (int j = 0; j < mapNCol; j++) + { + var currMse = MseById(mseIdx); + mseIdx++; + if (currMse != null) + { + + } + else + { +
 
+ } + } +
+ } + +
+ int currIdx = 0; - foreach (var recordIob in listMSE) + foreach (var recordIob in ListMSE) { currIdx++; if (currIdx >= maxCol) { currIdx = 0; - @((MarkupString)"
"); + @((MarkupString)"
") + ; } } // controllo se devo "chiudere riga... int currNum = (currIdx % maxCol); while (currNum < (maxCol)) { - @((MarkupString)"
 
"); + @((MarkupString)"
 
") + ; currNum++; } diff --git a/MP.Mon/Pages/Index.razor.cs b/MP.Mon/Pages/Index.razor.cs index af3b1c78..bb1b1402 100644 --- a/MP.Mon/Pages/Index.razor.cs +++ b/MP.Mon/Pages/Index.razor.cs @@ -24,7 +24,7 @@ namespace MP.Mon.Pages public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e) { - listMSE = null; + ListMSE = null; await Task.Delay(10); Log.Info("Elapsed Slow Timer --> full page reload"); // dispongo i vari timers... @@ -181,12 +181,49 @@ namespace MP.Mon.Pages private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000); private List? CurrConfig = null; private bool doBlink = false; - private List? listMSE = null; + private List? ListMSE = null; private List listMacchine = new List(); private Random rnd = new Random(); #endregion Private Fields + /// + /// Numero righe mappa: calcolato da num elementi e numMax x riga... + /// + protected int mapNRow + { + get + { + int answ = 1; + int numElems = ListMSE != null ? ListMSE.Count : 1; + answ = (int)Math.Ceiling((double)numElems / mapNCol); + return answ; + } + } + + /// + /// restituisce MSE dato indice + /// + /// Indice MSE richiesto + /// + protected MappaStatoExpl? MseById(int mseIdx) + { + MappaStatoExpl? answ = null; + if (ListMSE != null && ListMSE.Count > mseIdx) + { + answ = ListMSE[mseIdx]; + } + return answ; + } + + /// + /// Numero colonne mappa: calcolato larghezza riga... + /// + protected int mapNCol + { + get => maxCol; + } + #region Private Methods /// @@ -249,16 +286,16 @@ namespace MP.Mon.Pages dataList = listaFilt; } -#if DEBUG +#if DEBUG && false // hack: legge 3 volte i dati x stressare sistema var singleData = dataList; - listMSE = new List(); + ListMSE = new List(); for (int i = 0; i < 3; i++) { - listMSE.AddRange(singleData); + ListMSE.AddRange(singleData); } #else - listMSE = dataList; + ListMSE = dataList; #endif } } diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index 8c06e1df..869437af 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2411.1209

+

Versione: 6.16.2503.1117


Note di rilascio:
  • diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt index b33ab69a..99a76fa9 100644 --- a/MP.Mon/Resources/VersNum.txt +++ b/MP.Mon/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2411.1209 +6.16.2503.1117 diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml index e1ea8be7..71077bb5 100644 --- a/MP.Mon/Resources/manifest.xml +++ b/MP.Mon/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2411.1209 + 6.16.2503.1117 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false diff --git a/MP.Stats/Components/ChartTrends.razor.cs b/MP.Stats/Components/ChartTrends.razor.cs index 451e8e9f..db2bfb6f 100644 --- a/MP.Stats/Components/ChartTrends.razor.cs +++ b/MP.Stats/Components/ChartTrends.razor.cs @@ -386,10 +386,10 @@ namespace MP.Stats.Components private string CssBtn(PeriodoSel reqMode) { - string answ = "btn-outline-dark"; + string answ = "btn-outline-primary"; if (reqMode == pSel) { - answ = "btn-dark text-light"; + answ = "btn-primary text-light"; } return answ; } diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index f4201016..d64f6818 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2503.1019 - 6.16.2503.1019 + 6.16.2503.1116 + 6.16.2503.1116 true $(NoWarn);1591 en diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index bd38fc2e..c83e58b2 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

    Versione: 6.16.2503.1019

    +

    Versione: 6.16.2503.1116


    Note di rilascio:
      diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 502b1e44..fc6ae71e 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.1019 +6.16.2503.1116 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index a89a1b90..00d77763 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.1019 + 6.16.2503.1116 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false