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

Merge branch 'Release/MpMon_05'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-18 08:15:36 +01:00
parent f64d6cb76d e57f664f24
commit f8e01399ca
13 changed files with 91 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MON.Client/Components/DetailViewMSE.razor
+3 -3
View File
@@ -4,11 +4,11 @@
}
else
{
<div class="card mb-1 border border-dark rounded rounded-3 shadow bg-dark">
<div class="card mb-1 border border-dark rounded rounded-3 shadow bg-dark @brightCss">
<div class="card-body @cssStatus(CurrRecord.Semaforo, doAnimate) bg-gradient text-white p-1">
<div class="bg-dark text-white opacity-75 px-1 rounded shadow small lh-sm py-0 my-0">
<div class="card-title text-uppercase bg-dark text-center py-0 my-0 fs-3 text-truncate">
@CurrRecord.Nome
<div class="card-title text-uppercase bg-dark text-center py-0 my-0 fs-3 text-truncate">
<span class="">@CurrRecord.Nome</span>
</div>
<div class="bg-dark text-white opacity-100 bg-gradient px-1 rounded shadow small lh-sm py-0">
@if (hasRow(1))
MP.MON.Client/Components/DetailViewMSE.razor.cs
+3
View File
@@ -35,6 +35,9 @@ namespace MP.MON.Client.Components
[Parameter]
public bool scrollText { get; set; } = false;
[Parameter]
public string brightCss { get; set; } = "";
#if false
protected override void OnParametersSet()
{
MP.MON/Components/App.razor
+2 -2
View File
@@ -18,7 +18,7 @@
<Routes />
<script src="lib/WindowSize.js"></script>
<script src="_framework/blazor.web.js"></script>
@* <script>
<script>
Blazor.start({
reconnectionOptions: {
maxRetries: 600,
@@ -32,7 +32,7 @@
}, 5000);
}
});
</script> *@
</script>
</body>
</html>
MP.MON/Components/Pages/Index.razor
+2 -2
View File
@@ -32,7 +32,7 @@ else
int mseIdx = 0;
for (int i = 0; i < mapNRow; i++)
{
<div class="row statusMap mx-1 my-1">
<div class="row statusMap mx-1 my-1" style="font-size: @charMult;">
@for (int j = 0; j < maxCol; j++)
{
var currMse = MseById(mseIdx);
@@ -43,7 +43,7 @@ else
@* <DetailMapSelector CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" useNewDisplay="@newDisplay" @rendermode="InteractiveServer"></DetailMapSelector> *@
@if (newDisplay)
{
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="true" @rendermode="InteractiveServer"></DetailViewMSE>
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="true" brightCss="@brightCss" @rendermode="InteractiveServer"></DetailViewMSE>
}
else
{
MP.MON/Components/Pages/Index.razor.cs
+17 -1
View File
@@ -232,7 +232,7 @@ namespace MP.MON.Components.Pages
MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage;
Random rnd = new Random();
cssOverlayOff = config.GetValue<string>("ServerConf:cssOverlayOff") ?? "";
maxChar4Scroll = config.GetValue<int>("ServerConf:maxChar4Scroll");
//maxChar4Scroll = config.GetValue<int>("ServerConf:maxChar4Scroll");
await Task.Delay(rnd.Next(50, 150));
StartTimer();
}
@@ -262,6 +262,15 @@ namespace MP.MON.Components.Pages
/// num max caratteri prima di abilitare scrolling testo
/// </summary>
private int maxChar4Scroll = 10;
/// <summary>
/// Moltiplicatore di base dei caratteri espresso in rem
/// </summary>
private string charMult = "1rem";
/// <summary>
/// css per impostare una luminosiità custom x andare a aumentare la brillantezza dei colori a livello di singolo blocco DetailMSE
/// </summary>
private string brightCss = "";
private Random rnd = new Random();
@@ -378,6 +387,13 @@ namespace MP.MON.Components.Pages
scrollText = rawData.ToLower() == "true";
getConfValInt("pageRefreshSec", ref slowRefreshSec);
getConfVal("sART", ref showArt);
// con luminosità, dimensione carattere e num char x andare a capo x gestione specifica in caso di "allargamento componenti"
getConfValInt("MON_maxChar4Scroll", ref maxChar4Scroll);
getConfVal("MON_CharMult", ref charMult);
getConfVal("MON_BrightCss", ref brightCss);
Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
}
MP.MON/MP.MON.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>6.16.2503.1717</Version>
<Version>6.16.2503.1808</Version>
</PropertyGroup>
<ItemGroup>
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1717</h4>
<h4>Versione: 6.16.2503.1808</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1717
6.16.2503.1808
MP.MON/Resources/manifest.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1717</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP-MON.zip</url>
<version>6.16.2503.1808</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.MON.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
MP.MON/appsettings.json
+1 -2
View File
@@ -56,7 +56,6 @@
"ServerConf": {
"BaseAppPath": "/MP/MON/",
"maxAge": "2000",
"cssOverlayOff": "bg-dark text-light bg-opacity-50",
"maxChar4Scroll": 15
"cssOverlayOff": "bg-dark text-light bg-opacity-50"
}
}
MP.MON/wwwroot/css/site.css
+26
View File
@@ -141,6 +141,32 @@ a,
content: "An error has occurred.";
}
/* Gestione specifica oggetti MON*/
/* Gestione luminosit� generale
*/
.bright50 {
filter: brightness(50%);
}
.bright75 {
filter: brightness(75%);
}
.bright90 {
filter: brightness(90%);
}
.bright110 {
filter: brightness(110%);
}
.bright125 {
filter: brightness(125%);
}
.bright150 {
filter: brightness(150%);
}
.bright175 {
filter: brightness(175%);
}
.bright200 {
filter: brightness(200%);
}
/* MAIN: gestione layout dinamico mappa... */
.fontSmall {
font-size: 0.75rem;
MP.MON/wwwroot/css/site.less
+31
View File
@@ -144,6 +144,37 @@ a, .btn-link {
content: "An error has occurred."
}
/* Gestione specifica oggetti MON*/
/* Gestione luminosità generale
*/
.bright50 {
filter: brightness(50%);
}
.bright75 {
filter: brightness(75%);
}
.bright90 {
filter: brightness(90%);
}
.bright100 {
}
.bright110 {
filter: brightness(110%);
}
.bright125 {
filter: brightness(125%);
}
.bright150 {
filter: brightness(150%);
}
.bright175 {
filter: brightness(175%);
}
.bright200 {
filter: brightness(200%);
}
/* MAIN: gestione layout dinamico mappa... */
.fontSmall {
font-size: 0.75rem;
MP.MON/wwwroot/css/site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long