michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix in relative transitions UI, PumpPower with 1 decimal digit (Badger velka trat).

Browse Source
This commit is contained in:
Milan Hanajik 2016-01-26 13:34:19 +01:00
parent 69de3b038a
commit d575220aec
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config/Entities/Test.cs
View File

@ -73,6 +73,10 @@ namespace Config.Entities
ErrLimHi = 2.0f; /// [%] upper error limit
Uncertainty = 0;
TolerRed = 0; /// = Filter parameter
RelTransBefore = string.Empty;
RelTransBetween = string.Empty;
RelTransAfter = string.Empty;
TransitionAfter = string.Empty;
}
public Test(string name, int itemNr, Procedure procedure)
@ -113,6 +117,10 @@ namespace Config.Entities
result.BenchPath = BenchPath;
result.OutputPath = OutputPath;
result.MetersPath = MetersPath;
result.RelTransBefore = RelTransBefore;
result.RelTransBetween = RelTransBetween;
result.RelTransAfter = RelTransAfter;
result.TransitionAfter = TransitionAfter;
foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
return result;

4
Config/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.188.0")]
[assembly: AssemblyFileVersion("2.1.188.0")]
[assembly: AssemblyVersion("2.1.200.0")]
[assembly: AssemblyFileVersion("2.1.200.0")]

12
TestBenchFramework/ProcedureDlg.cs
View File

@ -769,7 +769,7 @@ namespace TBF
///
/// Process subitems FeedingPath, ...
///
lviParameters.SubItems.Add(test.PumpPower.ToString("F0"));
lviParameters.SubItems.Add(test.PumpPower.ToString("F1"));
parametersListViewEx.Items.Add(lviParameters);
}
@ -913,10 +913,10 @@ namespace TBF
entity.Part = part;
}
int powerPct;
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.PumpPower].Text, out powerPct) && powerPct >= 0 && powerPct <= 100)
float powerPct;
if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.PumpPower].Text, out powerPct) && powerPct >= 0 && powerPct <= 100.0f)
{
entity.PumpPower = (float)powerPct;
entity.PumpPower = powerPct;
}
}
}
@ -1105,9 +1105,9 @@ namespace TBF
}
}
int powerPct;
float powerPct;
if ((e.SubItem == (int)ParametersClmn.PumpPower) &&
(!int.TryParse(e.DisplayText, out powerPct) || powerPct < 0 || powerPct > 100))
(!Utils.TryParseUFloat(e.DisplayText, out powerPct) || powerPct < 0 || powerPct > 100.0f))
{
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
e.Cancel = true;