diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 983a916a..d258a8ed 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
- 6.16.2507.1015
+ 6.16.2507.1610
1800a78a-6ff1-40f9-b490-87fb8bfc1394
en
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 749444df..121377d0 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2507.1015
+ Versione: 6.16.2507.1610
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index cd2bd155..4bb4f353 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2507.1015
+6.16.2507.1610
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 3c38666a..251ae54b 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2507.1015
+ 6.16.2507.1610
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index 5ddbbdd2..ec9d328d 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.2507.0818
- 6.16.2507.0818
+ 6.16.2507.1611
+ 6.16.2507.1611
true
$(NoWarn);1591
en
diff --git a/MP.Stats/Pages/TrendAnalysis.razor.cs b/MP.Stats/Pages/TrendAnalysis.razor.cs
index a9524795..7d15f0c7 100644
--- a/MP.Stats/Pages/TrendAnalysis.razor.cs
+++ b/MP.Stats/Pages/TrendAnalysis.razor.cs
@@ -109,7 +109,24 @@ namespace MP.Stats.Pages
{
SelCount = TotalCount * numSel / NumMacc;
}
- int scale = 256;
+ switch (value)
+ {
+ case ResolutionLevel.Low:
+ MaxPoints = NumPoint(SelCount, numSel , 32 , 32);
+ break;
+
+ case ResolutionLevel.Med:
+ MaxPoints = NumPoint(SelCount, numSel, 8, 128);
+ break;
+
+ case ResolutionLevel.High:
+ MaxPoints = NumPoint(SelCount, numSel, 1, 512);
+ break;
+
+ default:
+ break;
+ }
+#if false
switch (value)
{
case ResolutionLevel.Low:
@@ -126,14 +143,32 @@ namespace MP.Stats.Pages
default:
break;
- }
+ }
+#endif
}
}
+#if false
// limite minimo 256...
- MaxPoints = MaxPoints < 256 ? 256 : MaxPoints;
+ MaxPoints = MaxPoints < 256 ? 256 : MaxPoints;
+#endif
}
}
+ ///
+ /// Calcola num punti dato
+ ///
+ /// Numero totale valori
+ /// Numero partizioni (oggetti da disegnare insieme)
+ /// Fattore di scala richiesto
+ /// Fattore di scala (=valore minimo garantito)
+ ///
+ private int NumPoint(int selCount, int numSel, int factor, double scale)
+ {
+ int calcVal = (int)Math.Round((double)(selCount * scale) / numSel / factor / (double)scale);
+
+ return calcVal > scale ? calcVal : (int)scale;
+ }
+
[Inject]
protected MpStatsService StatService { get; set; }
@@ -206,7 +241,7 @@ namespace MP.Stats.Pages
#region Private Fields
private int _maxPoints = 256;
- private ResolutionLevel _reqRes = ResolutionLevel.Low;
+ private ResolutionLevel _reqRes = ResolutionLevel.Med;
private List ConfigList;
private int MaxDisplay = 10;
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 6caa5dc2..118c5a51 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 6.16.2507.0818
+ Versione: 6.16.2507.1611
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 793b86db..3ed073f0 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2507.0818
+6.16.2507.1611
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 0f4ebce3..73cc12fb 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2507.0818
+ 6.16.2507.1611
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
diff --git a/MP.TaskMan/Controllers/MpTaskController.cs b/MP.TaskMan/Controllers/MpTaskController.cs
index 3528da05..0ccb73bf 100644
--- a/MP.TaskMan/Controllers/MpTaskController.cs
+++ b/MP.TaskMan/Controllers/MpTaskController.cs
@@ -355,7 +355,7 @@ namespace MP.TaskMan.Controllers
{
otherRec = dbCtx
.DbSetTaskList
- .Where(x => x.Ordinal < currData.Ordinal)
+ .Where(x => x.Ordinal < currData.Ordinal && x.Group==currData.Group)
.OrderByDescending(x => x.Ordinal)
.FirstOrDefault();
}
@@ -363,7 +363,7 @@ namespace MP.TaskMan.Controllers
{
otherRec = dbCtx
.DbSetTaskList
- .Where(x => x.Ordinal > currData.Ordinal)
+ .Where(x => x.Ordinal > currData.Ordinal && x.Group == currData.Group)
.OrderBy(x => x.Ordinal)
.FirstOrDefault();
}
diff --git a/MP.TaskMan/Services/TaskService.cs b/MP.TaskMan/Services/TaskService.cs
index 2da2b596..0a6826ac 100644
--- a/MP.TaskMan/Services/TaskService.cs
+++ b/MP.TaskMan/Services/TaskService.cs
@@ -325,11 +325,11 @@ namespace MP.TaskMan.Services
///
///
///
- public bool TaskListReorder(int codGroup)
+ public async Task TaskListReorder(int codGroup)
{
bool dbResult = MLController.TaskListReorder(codGroup);
// svuoto cache!
- FlushCache();
+ await FlushCacheAsync();
return dbResult;
}
diff --git a/MP.TaskMan/TaskEdit.razor b/MP.TaskMan/TaskEdit.razor
index e13d4849..9311478c 100644
--- a/MP.TaskMan/TaskEdit.razor
+++ b/MP.TaskMan/TaskEdit.razor
@@ -89,10 +89,10 @@ else
-
+
-
+
diff --git a/MP.TaskMan/TaskEdit.razor.cs b/MP.TaskMan/TaskEdit.razor.cs
index ca8b68d3..cc23dbd9 100644
--- a/MP.TaskMan/TaskEdit.razor.cs
+++ b/MP.TaskMan/TaskEdit.razor.cs
@@ -48,8 +48,8 @@ namespace MP.TaskMan
// se cambiato gruppo chiamo reorg gruppo old/new...
if (CurrRecord.Group != oldGroup)
{
- TService.TaskListReorder(oldGroup);
- TService.TaskListReorder(CurrRecord.Group);
+ await TService.TaskListReorder(oldGroup);
+ await TService.TaskListReorder(CurrRecord.Group);
oldGroup = CurrRecord.Group;
}
}
@@ -59,6 +59,6 @@ namespace MP.TaskMan
#endregion Protected Methods
- private bool isProcessing= false;
+ private bool isProcessing = false;
}
}
\ No newline at end of file