Munich specific changes.

This commit is contained in:
Milan Hanajik
2016-05-19 20:54:35 +02:00
parent 1af6a65a9f
commit 1b3fe413cb
3 changed files with 6 additions and 2 deletions
+2
View File
@@ -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)