diff --git a/Jenkinsfile b/Jenkinsfile
index 7b8d8a9..25ab09e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=749']) {
+ withEnv(['NEXT_BUILD_NUMBER=750']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/SteamWareLib/HwSwInfo.cs b/SteamWareLib/HwSwInfo.cs
index 6ea40e8..3699d6d 100644
--- a/SteamWareLib/HwSwInfo.cs
+++ b/SteamWareLib/HwSwInfo.cs
@@ -131,27 +131,38 @@ namespace SteamWare
}
///
- /// Restitusice l'elenco pareto (decrescente) delle dimensioni browser registrate
+ /// Restitusice l'elenco delle dimensioni browser registrate
///
public string paretoBrowserSize
{
get
{
- StringBuilder sb = new StringBuilder();
string redHash = memLayer.ML.redHash("COUNT:wh:*");
- int numRec = memLayer.ML.redCountKey(redHash);
- var redKeys = memLayer.ML.redGetKeys(redHash);
- // riordino elenco
- sb.AppendLine(string.Format("Trovate {0} combinazioni", numRec));
- string currKey = "";
- string currVal = "";
- foreach (var item in redKeys)
- {
- currKey = item.ToString().Replace(memLayer.ML.redHash("COUNT:wh:"), "");
- currVal = memLayer.ML.getRSV(item);
- sb.AppendLine($"{currKey}: {currVal}");
- }
- return sb.ToString();
+ return getBrowserData(redHash);
+ }
+ }
+
+ ///
+ /// Restitusice l'elenco delle dimensioni SCHERMO registrate
+ ///
+ public string paretoScreenSize
+ {
+ get
+ {
+ string redHash = memLayer.ML.redHash("COUNT:scr:*");
+ return getBrowserData(redHash);
+ }
+ }
+
+ ///
+ /// Restitusice l'elenco delle dimensioni FINESTRA browser + PIXEL ratio registrate
+ ///
+ public string paretoWinPixRat
+ {
+ get
+ {
+ string redHash = memLayer.ML.redHash("COUNT:wpr:*");
+ return getBrowserData(redHash);
}
}
@@ -254,6 +265,28 @@ namespace SteamWare
#endregion Public Properties
+ #region Private Methods
+
+ private static string getBrowserData(string redHash)
+ {
+ StringBuilder sb = new StringBuilder();
+ int numRec = memLayer.ML.redCountKey(redHash);
+ var redKeys = memLayer.ML.redGetKeys(redHash);
+ // riordino elenco
+ sb.AppendLine(string.Format("Trovate {0} combinazioni", numRec));
+ string currKey = "";
+ string currVal = "";
+ foreach (var item in redKeys)
+ {
+ currKey = item.ToString().Replace(memLayer.ML.redHash("COUNT:wh:"), "");
+ currVal = memLayer.ML.getRSV(item);
+ sb.AppendLine($"{currKey}: {currVal}");
+ }
+ return sb.ToString();
+ }
+
+ #endregion Private Methods
+
#region Public Methods
///