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

Bugfix: Adjustment method modeless dialog was not started in UI thread, freezes

Browse Source
This commit is contained in:
Milan Hanajik 2015-01-28 19:33:02 +01:00
parent cca60e56ff
commit 94accbf58b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -9,9 +9,19 @@ using TBF.UiBridge;
namespace TBF.BenchControl.TestMethods.Adjustment
{
public class FlyingStartSeq : Sequences.SequenceBase
public class AdjustmentSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(FlyingStartSeq));
private static readonly ILog log = LogManager.GetLogger(typeof(AdjustmentSeq));
System.Windows.Forms.Form modelessDlg;
///
delegate void ErrorsFormDlgt(AdjustmentSeq myRef);
///
void OpenWMErrorsForm(AdjustmentSeq myRef)
{
myRef.modelessDlg = new WMErrorsForm(Program.WMsCount);
modelessDlg.Show();
}
/// <summary>
/// Flying start mass collection method sequence
@ -25,7 +35,6 @@ namespace TBF.BenchControl.TestMethods.Adjustment
/// </returns>
public IList<Event> Execute(Entities.Test test)
{
System.Windows.Forms.Form modelessDlg = null;
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@ -109,8 +118,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
///
/// Show the modeless dialog with error indication
///
modelessDlg = new WMErrorsForm(Program.WMsCount);
modelessDlg.Show();
Program.MainWnd.Invoke(new ErrorsFormDlgt(OpenWMErrorsForm), this);
flow_set:
loop:

2
TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
public IList<Event> Execute(Entities.Test test)
{
return (new FlyingStartSeq()).Execute(test);
return (new AdjustmentSeq()).Execute(test);
}
}
}