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

iPerlCommunicationForm resized depending on the number of iPerl-s, gray color, ver.2.5.273

Browse Source
This commit is contained in:
Milan Hanajik 2016-04-23 14:32:15 +02:00
parent 7f3d1bb199
commit 291bb72cf5
5 changed files with 1731 additions and 1712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
View File

@ -1016,6 +1016,12 @@ namespace TBF.BenchControl.Sequences
return TestAndLogUiCmdStop(null, e);
}
/// <summary>
/// Returns true and makes a log when 'e' contains Event.UiCmdStop
/// </summary>
/// <param name="test"></param>
/// <param name="e"></param>
/// <returns></returns>
protected bool TestAndLogUiCmdStop(Test test, IList<Event> e)
{
if (!e.Contains(Event.UiCmdStop)) return false;

2
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -357,7 +357,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
do
{
e = StateMachine.WaitRunDevsRunOps();
if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; }
if (TestAndLogUiCmdStop(test, e)) { if (retVal == Event.Done) retVal = Event.UiCmdStop; break; }
}
while (!e.Contains(Event.PreviousStopped));

15
TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -510,10 +510,23 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
}
textBoxesCount = wmsCount;
}
///
/// Resize the dialog to fit the enabled controls
///
int xMax = 0;
int yMax = 0;
for (int i = 0; i < textBoxesCount; i++)
{
if (messages[i].Left + messages[i].Width > xMax) xMax = messages[i].Left + messages[i].Width;
if (messages[i].Top + messages[i].Height > yMax) yMax = messages[i].Top + messages[i].Height;
}
Width = xMax + 30;
Height = yMax + 50;
}
void Localize()
void Localize()
{
Text = Strings.Water_Meter_States;
for (int i = 0; i < textBoxesCount; i++)

3416
TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.272.1")]
[assembly: AssemblyFileVersion("2.5.272.1")]
[assembly: AssemblyVersion("2.5.273.1")]
[assembly: AssemblyFileVersion("2.5.273.1")]