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

EmergencyStopModelessDlg removed.

Browse Source
This commit is contained in:
Milan Hanajik 2021-04-02 18:11:53 +02:00
parent 4fda48f7e7
commit 08c2d3b0d8
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TBF/UI/MainWnd.cs
View File

@ -32,11 +32,6 @@ namespace TBF.UI
public bool IsShutdownDisabled;
public bool IsShutdownPCAfterClosingTbf;
/// <summary>
/// This dialog is shown when emergency stop is activated
/// </summary>
Shared.EmergencyStopForm emergencyStopModelessDlg;
/// <summary>
/// This dialog is shown when TBF program is shutting down
/// </summary>
@ -240,8 +235,7 @@ namespace TBF.UI
string message = Rig.StateMachine.InitializeDevices();
form.CloseForm(null, new EventArgs());
formThread.Join();
#if !DEBUG && !MUNICH
#if !DEBUG
if (message != null)
{
MessageBox.Show(Strings.The_following_components_are_in_simulation_mode_ + Environment.NewLine + message,
@ -251,9 +245,6 @@ namespace TBF.UI
}
#endif
//emergencyStopModelessDlg = new Shared.EmergencyStopForm();
//emergencyStopModelessDlg.Show();
Bridge.ButtonsEtcHandler += delegate(object sndr, ButtonsEtcEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<ButtonsEtcEventArgs>(OnButtonsEtc), sndr, args); }
@ -849,21 +840,12 @@ namespace TBF.UI
return false;
}
/// Save emergency stop form state
bool oriEmgStopState = false;
if (emergencyStopModelessDlg != null)
{
oriEmgStopState = emergencyStopModelessDlg.Visible;
emergencyStopModelessDlg.Visible = false;
}
if ((messageLabel.ForeColor != Color.Red) && IsShutdownDisabled)
{
///
/// It is not possible to shutdown (most likely a cycle is not completed) --> Display a message and prevent shutdown now
///
MessageBox.Show(Strings.Finish_the_session_please, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
if (emergencyStopModelessDlg != null) emergencyStopModelessDlg.Visible = oriEmgStopState;
return false;
}
@ -899,8 +881,7 @@ namespace TBF.UI
}
else
{
/// User aborted the shutdown --> Restore emergency stop form state and prevent shutdown now
if (emergencyStopModelessDlg != null) emergencyStopModelessDlg.Visible = oriEmgStopState;
/// User aborted the shutdown
return false;
}
}