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

UiBridge.Bridge.CloseModelessFormHandler isn't used, tank draining before a test is optional, fixes in simulations, ver. 2.18.1056

Browse Source
This commit is contained in:
Milan Hanajik
2018-11-12 16:57:28 +01:00
parent d2d571945c
commit f48a71ce12
10 changed files with 164 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Various/ManualLevelMsrmnt/ManualLevelMsrmnt.cs
+14 -16
View File
@@ -18,9 +18,9 @@ namespace TBF.BenchControl.Various.ManualLevelMsrmnt
DoubleBox levelBox;
public double WaterLevelMm;
public double WaterLevelMm;
System.Windows.Forms.Form modelessDlg;
WaterLevelForm waterLevelForm;
bool resultSaved; /// Set in Run() when results are saved
@@ -61,10 +61,11 @@ namespace TBF.BenchControl.Various.ManualLevelMsrmnt
///
void OpenWaterLevelForm(ManualLevelMsrmnt myRef)
{
myRef.modelessDlg = new WaterLevelForm();
modelessDlg.Show();
myRef.waterLevelForm = new WaterLevelForm();
waterLevelForm.Show();
}
/// <summary>Start this operation</summary>
public void Start()
{
@@ -79,20 +80,17 @@ namespace TBF.BenchControl.Various.ManualLevelMsrmnt
/// <returns>Event.ResultsPrinted</returns>
public Event Run()
{
if ((modelessDlg is IHasCompleted) && !(modelessDlg as IHasCompleted).Completed)
if ((waterLevelForm != null) && !waterLevelForm.Completed)
{
return Event.Busy; /// = Form open
}
if (!resultSaved) /// This is to save the result only once
if (!resultSaved && (currentOp == CurrentOp.EnterLevel) && (waterLevelForm != null))
{
if ((modelessDlg is WaterLevelForm) && (currentOp == CurrentOp.EnterLevel))
{
WaterLevelMm = (modelessDlg as WaterLevelForm).WaterLevelMm;
if (levelBox != null) levelBox.Val = WaterLevelMm;
resultSaved = true;
modelessDlg = null;
}
/// Save the result (only once)
WaterLevelMm = waterLevelForm.WaterLevelMm;
if (levelBox != null) levelBox.Val = WaterLevelMm;
resultSaved = true;
}
return Event.LevelDone; /// = Form closed
@@ -101,10 +99,10 @@ namespace TBF.BenchControl.Various.ManualLevelMsrmnt
/// <summary>Stop this operation</summary>
public void Stop()
{
if (modelessDlg is IHasCompleted)
if (waterLevelForm != null)
{
UiBridge.Bridge.OnCloseModelessForm(this, null);
modelessDlg = null;
waterLevelForm.OnCloseThisForm(this, null);
waterLevelForm = null;
}
currentOp = CurrentOp.None;
}