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

It is not possible anymore to configure the same FileWriter or ResultsPrinter twice (Torino50 bug fix)

Browse Source
This commit is contained in:
Milan Hanajik 2017-06-01 12:38:52 +02:00
parent 8b195bd6a9
commit f13529b339
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/WaterMeters/iPerl/ProcParams.cs
View File

@ -217,9 +217,8 @@ namespace TBF.BenchControl.WaterMeters.iPerl
message = string.Empty;
float dummy;
#if ORACLE_DB
int iDummy;
#endif
switch (i)
{
case 0: /// ProductName

11
TestBenchFramework/ProcedureDlg.cs
View File

@ -469,7 +469,7 @@ namespace TBF
if (printer1ComboBox.Items.Contains(printer1ComboBox.Text) && printer2ComboBox.Items.Contains(printer2ComboBox.Text))
{
bool pr = !printer1ComboBox.Text.Equals("---");
bool pr2 = !printer2ComboBox.Text.Equals("---");
bool pr2 = !printer2ComboBox.Text.Equals("---") && !printer2ComboBox.Text.Equals(printer1ComboBox.Text);
if (!pr && !pr2) LoadedProcedure.ResultsPrinter = string.Empty;
else if (pr && !pr2) LoadedProcedure.ResultsPrinter = printer1ComboBox.Text;
@ -489,19 +489,22 @@ namespace TBF
sb.Append(fileWriter1ComboBox.Text);
first = false;
}
if (!fileWriter2ComboBox.Text.Equals("---"))
if (!fileWriter2ComboBox.Text.Equals("---") && !fileWriter2ComboBox.Text.Equals(fileWriter1ComboBox.Text))
{
if (!first) sb.Append("~");
sb.Append(fileWriter2ComboBox.Text);
first = false;
}
if (!fileWriter3ComboBox.Text.Equals("---"))
if (!fileWriter3ComboBox.Text.Equals("---") && !fileWriter3ComboBox.Text.Equals(fileWriter1ComboBox.Text)
&& !fileWriter3ComboBox.Text.Equals(fileWriter2ComboBox.Text))
{
if (!first) sb.Append("~"); first = false;
sb.Append(fileWriter3ComboBox.Text);
first = false;
}
if (!fileWriter4ComboBox.Text.Equals("---"))
if (!fileWriter4ComboBox.Text.Equals("---") && !fileWriter4ComboBox.Text.Equals(fileWriter1ComboBox.Text)
&& !fileWriter4ComboBox.Text.Equals(fileWriter2ComboBox.Text)
&& !fileWriter4ComboBox.Text.Equals(fileWriter3ComboBox.Text))
{
if (!first) sb.Append("~");
sb.Append(fileWriter4ComboBox.Text);