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

Pump power can be an arbitrary integer from 0 to 100, drop-down list changed

Browse Source
This commit is contained in:
Milan Hanajik
2015-01-26 16:03:11 +01:00
parent 8aa9ed9f21
commit c89549a0ae
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/ProcedureDlg.cs
+12 -4
View File
@@ -541,14 +541,19 @@ namespace TBF
};
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("0");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("20");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("30");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("40");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("50");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("60");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("70");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("75");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("80");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("85");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("90");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("92");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("94");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("96");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100");
foreach (var ctrl in parametersEditors)
@@ -772,9 +777,10 @@ namespace TBF
entity.Part = part;
}
if ((parametersEditors[(int)ParametersClmn.PumpPower] as ComboBox).Items.Contains(lvi.SubItems[(int)ParametersClmn.PumpPower].Text))
int powerPct;
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.PumpPower].Text, out powerPct) && powerPct >= 0 && powerPct <= 100)
{
entity.PumpPower = float.Parse(lvi.SubItems[(int)ParametersClmn.PumpPower].Text);
entity.PumpPower = (float)powerPct;
}
}
}
@@ -963,7 +969,9 @@ namespace TBF
}
}
if (((e.SubItem == (int)ParametersClmn.PumpPower) && !(parametersEditors[(int)ParametersClmn.PumpPower] as ComboBox).Items.Contains(e.DisplayText)))
int powerPct;
if ((e.SubItem == (int)ParametersClmn.PumpPower) &&
(!int.TryParse(e.DisplayText, out powerPct) || powerPct < 0 || powerPct > 100))
{
e.DisplayText = e.Item.SubItems[e.SubItem].Text;
e.Cancel = true;