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

TestWizard.FlowSelection fixed, conversion to float avoided.

Browse Source
This commit is contained in:
Milan Hanajik 2023-03-29 15:44:48 +02:00
parent cf626d7b91
commit 9a5ee99a82
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
TBF/UI/Procedures/TestWizard/FlowSelection.cs
View File

@ -102,13 +102,13 @@ namespace TBF.UI.Procedures.TestWizard
case QSpec.Q_dPct:
var Q2 = Units.ConvertFrom(flowUnit, Utils.ParseUDouble(q3TextBox.Text));
var dQpct = Utils.ParseUDouble(dQpctTextBox.Text);
qFrom = (float)(Q2 * (1 - dQpct / 100.0));
qTo = (float)(Q2 * (1 + dQpct / 100.0));
qFrom = (Q2 * (1 - dQpct / 100.0));
qTo = (Q2 * (1 + dQpct / 100.0));
break;
}
test.Qfrom = (float)qFrom;
test.Qto = (float)qTo;
test.Qfrom = qFrom;
test.Qto = qTo;
test.FlowUnit = flowUnit;
if (sensorsComboBox.Items.Contains(sensorsComboBox.Text))
@ -119,23 +119,23 @@ namespace TBF.UI.Procedures.TestWizard
bool IsFormValid()
{
float dummy;
double dummy;
switch (qSpec)
{
default:
case QSpec.Qfrom_Qto:
return Utils.TryParseUFloat(qFromTextBox.Text, out dummy) &&
Utils.TryParseUFloat(qToTextBox.Text, out dummy) &&
return Utils.TryParseUDouble(qFromTextBox.Text, out dummy) &&
Utils.TryParseUDouble(qToTextBox.Text, out dummy) &&
sensorsComboBox.Items.Contains(sensorsComboBox.Text);
case QSpec.Q_dQ:
return Utils.TryParseUFloat(q2TextBox.Text, out dummy) &&
Utils.TryParseUFloat(dQTextBox.Text, out dummy) &&
return Utils.TryParseUDouble(q2TextBox.Text, out dummy) &&
Utils.TryParseUDouble(dQTextBox.Text, out dummy) &&
sensorsComboBox.Items.Contains(sensorsComboBox.Text);
case QSpec.Q_dPct:
return Utils.TryParseUFloat(q3TextBox.Text, out dummy) &&
Utils.TryParseUFloat(dQpctTextBox.Text, out dummy) &&
return Utils.TryParseUDouble(q3TextBox.Text, out dummy) &&
Utils.TryParseUDouble(dQpctTextBox.Text, out dummy) &&
sensorsComboBox.Items.Contains(sensorsComboBox.Text);
}
}
@ -173,7 +173,7 @@ namespace TBF.UI.Procedures.TestWizard
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
double Q1,Q2;
double Q1, Q2;
switch ((QSpec)tabControl1.SelectedIndex)
{