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

Adjustment for 24 water meters, fixed a bug in trransition sequence editor, version 1.5.115.

Browse Source
This commit is contained in:
Milan Hanajik
2015-09-17 20:58:56 +02:00
parent 62cd81b5f7
commit 4a35215be9
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+13 -5
View File
@@ -22,11 +22,19 @@ namespace TBF.BenchControl.TestMethods.Adjustment
///
void OpenWMErrorsForm(AdjustmentSeq myRef)
{
#if TORUN_PT50_2015
myRef.modelessDlg = new WMErrorsForm24(Program.WMsCount);
#else
myRef.modelessDlg = new WMErrorsForm(Program.WMsCount);
#endif
#pragma warning disable 162 /// Disables 'Unreachable code detected' warning
if (Program.WMsCount > 6)
{
myRef.modelessDlg = new WMErrorsForm24(Program.WMsCount);
}
else
{
myRef.modelessDlg = new WMErrorsForm(Program.WMsCount);
}
#pragma warning restore 162 /// Disables 'Unreachable code detected' warning
modelessDlg.Show();
}
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.5.114.1")]
[assembly: AssemblyFileVersion("1.5.114.1")]
[assembly: AssemblyVersion("1.5.115.1")]
[assembly: AssemblyFileVersion("1.5.115.1")]
TestBenchFramework/UiControls/TransitionStepsCtrl.cs
+1 -1
View File
@@ -406,7 +406,7 @@ namespace TBF.UiControls
///
/// Valves
///
for (int j = 0, k = 0; j < vCount; j++)
for (int j = 0, k = 0; j < parent.Valves.Count; j++)
{
if (!(parent.Valves[j] is BenchControl.GenericDevices.IPumpFM))
{