Munich specific changes.
This commit is contained in:
@@ -154,11 +154,13 @@ namespace TBF
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
string message = BenchControl.StateMachine.InitializeDevices();
|
string message = BenchControl.StateMachine.InitializeDevices();
|
||||||
|
#if !MUNICH
|
||||||
if (message != null)
|
if (message != null)
|
||||||
{
|
{
|
||||||
MessageBox.Show("The following components are in simulation mode: \r\n" + message,
|
MessageBox.Show("The following components are in simulation mode: \r\n" + message,
|
||||||
"Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
"Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
//emergencyStopModelessDlg = new TBF.Forms.EmergencyStopForm();
|
//emergencyStopModelessDlg = new TBF.Forms.EmergencyStopForm();
|
||||||
//emergencyStopModelessDlg.Show();
|
//emergencyStopModelessDlg.Show();
|
||||||
|
|||||||
@@ -77,14 +77,12 @@ namespace TBF.Screens
|
|||||||
//
|
//
|
||||||
// previousResultsButton
|
// previousResultsButton
|
||||||
//
|
//
|
||||||
this.previousResultsButton.Enabled = false;
|
|
||||||
this.previousResultsButton.Location = new System.Drawing.Point(252, 10);
|
this.previousResultsButton.Location = new System.Drawing.Point(252, 10);
|
||||||
this.previousResultsButton.Name = "previousResultsButton";
|
this.previousResultsButton.Name = "previousResultsButton";
|
||||||
this.previousResultsButton.Size = new System.Drawing.Size(100, 30);
|
this.previousResultsButton.Size = new System.Drawing.Size(100, 30);
|
||||||
this.previousResultsButton.TabIndex = 2;
|
this.previousResultsButton.TabIndex = 2;
|
||||||
this.previousResultsButton.Text = "Previous results";
|
this.previousResultsButton.Text = "Previous results";
|
||||||
this.previousResultsButton.UseVisualStyleBackColor = true;
|
this.previousResultsButton.UseVisualStyleBackColor = true;
|
||||||
this.previousResultsButton.Visible = false;
|
|
||||||
this.previousResultsButton.Click += new System.EventHandler(this.previousResultsButton_Click);
|
this.previousResultsButton.Click += new System.EventHandler(this.previousResultsButton_Click);
|
||||||
//
|
//
|
||||||
// configureButton
|
// configureButton
|
||||||
|
|||||||
@@ -45,6 +45,10 @@ namespace TBF.Screens
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
|
#if MUNICH
|
||||||
|
previousResultsButton.Visible = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
Bridge.ProcedureSelectedHandler += delegate(object sender, ProcedureSelectedEventArgs args)
|
Bridge.ProcedureSelectedHandler += delegate(object sender, ProcedureSelectedEventArgs args)
|
||||||
{
|
{
|
||||||
if (InvokeRequired)
|
if (InvokeRequired)
|
||||||
|
|||||||
Reference in New Issue
Block a user