Changeset 5315

Timestamp:

01/17/11 20:58:36 (13 years ago)

Author:

ascheibe

Message:

#1233 added buttons to gui for slave control

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.Designer.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave/3.4/Core.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.SlaveTrayIcon/MainWindow.Designer.cs

@@ -28 +28 @@
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow));
       this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-      this.slaveView = new HeuristicLab.Clients.Hive.Slave.Views.SlaveView();
       this.contextMenuNotifyIcon = new System.Windows.Forms.ContextMenuStrip(this.components);
       this.showToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.slaveView = new HeuristicLab.Clients.Hive.Slave.Views.SlaveView();
       this.contextMenuNotifyIcon.SuspendLayout();
       this.SuspendLayout();
@@ -44 +44 @@
       this.notifyIcon.Visible = true;
       this.notifyIcon.DoubleClick += new System.EventHandler(this.notifyIcon_DoubleClick);
-      // 
-      // slaveView
-      // 
-      this.slaveView.Caption = "HeuristicLab Slave View";
-      this.slaveView.Content = null;
-      this.slaveView.Location = new System.Drawing.Point(12, 12);
-      this.slaveView.Name = "slaveView";
-      this.slaveView.ReadOnly = false;
-      this.slaveView.Size = new System.Drawing.Size(509, 343);
-      this.slaveView.TabIndex = 0;
       // 
       // contextMenuNotifyIcon
@@ -77 +67 @@
       this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
       // 
+      // slaveView
+      // 
+      this.slaveView.Caption = "HeuristicLab Slave View";
+      this.slaveView.Content = null;
+      this.slaveView.Location = new System.Drawing.Point(12, 12);
+      this.slaveView.Name = "slaveView";
+      this.slaveView.ReadOnly = false;
+      this.slaveView.Size = new System.Drawing.Size(658, 343);
+      this.slaveView.TabIndex = 0;
+      // 
       // MainWindow
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(643, 433);
+      this.ClientSize = new System.Drawing.Size(676, 433);
       this.ContextMenuStrip = this.contextMenuNotifyIcon;
       this.Controls.Add(this.slaveView);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -92 +92 @@
     }
 
+    public void SoftPauseCore() {
+      try {
+        if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
+          pipeProxy.SoftPause();
+      }
+      catch (Exception e) {
+        OnMessageLogged("Error soft pausening core: " + e.ToString());
+      }
+    }
+
+    public void HardPauseCore() {
+      try {
+        if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
+          pipeProxy.HardPause();
+      }
+      catch (Exception e) {
+        OnMessageLogged("Error hard pausening core: " + e.ToString());
+      }
+    }
+
+    public void RestartCore() {
+      try {
+        if (pipeFactory.State != CommunicationState.Faulted && pipeFactory.State != CommunicationState.Closed)
+          pipeProxy.Restart();
+      }
+      catch (Exception e) {
+        OnMessageLogged("Error restarting core: " + e.ToString());
+      }
+    }
+
     public void Close() {
       if (pipeFactory.State != CommunicationState.Closed) {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs

@@ -47 +47 @@
       this.label1 = new System.Windows.Forms.Label();
       this.txtLog = new System.Windows.Forms.TextBox();
+      this.btnSoftPause = new System.Windows.Forms.Button();
+      this.btnHardPause = new System.Windows.Forms.Button();
+      this.btnRestart = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
@@ -68 +71 @@
       this.txtLog.TabIndex = 1;
       // 
+      // btnSoftPause
+      // 
+      this.btnSoftPause.Location = new System.Drawing.Point(390, 46);
+      this.btnSoftPause.Name = "btnSoftPause";
+      this.btnSoftPause.Size = new System.Drawing.Size(111, 23);
+      this.btnSoftPause.TabIndex = 2;
+      this.btnSoftPause.Text = "Soft Pause Core";
+      this.btnSoftPause.UseVisualStyleBackColor = true;
+      this.btnSoftPause.Click += new System.EventHandler(this.btnSoftPause_Click);
+      // 
+      // btnHardPause
+      // 
+      this.btnHardPause.Location = new System.Drawing.Point(390, 87);
+      this.btnHardPause.Name = "btnHardPause";
+      this.btnHardPause.Size = new System.Drawing.Size(111, 23);
+      this.btnHardPause.TabIndex = 3;
+      this.btnHardPause.Text = "Hard Pause Core";
+      this.btnHardPause.UseVisualStyleBackColor = true;
+      this.btnHardPause.Click += new System.EventHandler(this.btnHardPause_Click);
+      // 
+      // btnRestart
+      // 
+      this.btnRestart.Location = new System.Drawing.Point(390, 127);
+      this.btnRestart.Name = "btnRestart";
+      this.btnRestart.Size = new System.Drawing.Size(111, 23);
+      this.btnRestart.TabIndex = 4;
+      this.btnRestart.Text = "Restart Core";
+      this.btnRestart.UseVisualStyleBackColor = true;
+      this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
+      // 
       // SlaveView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.btnRestart);
+      this.Controls.Add(this.btnHardPause);
+      this.Controls.Add(this.btnSoftPause);
       this.Controls.Add(this.txtLog);
       this.Controls.Add(this.label1);
@@ -85 +121 @@
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.TextBox txtLog;
+    private System.Windows.Forms.Button btnSoftPause;
+    private System.Windows.Forms.Button btnHardPause;
+    private System.Windows.Forms.Button btnRestart;
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -90 +90 @@
     }
     #endregion
+
+    private void btnSoftPause_Click(object sender, System.EventArgs e) {
+      if (Content != null)
+        Content.SoftPauseCore();
+    }
+
+    private void btnHardPause_Click(object sender, System.EventArgs e) {
+      if (Content != null)
+        Content.HardPauseCore();
+    }
+
+    private void btnRestart_Click(object sender, System.EventArgs e) {
+      if (Content != null)
+        Content.RestartCore();
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs

@@ -38 +38 @@
   /// </summary>
   public class Core : MarshalByRefObject {
+
+    //TODO: this class should be a singleton; there is only one instance, the reference is meanwhile save in TheCore
+    public static Core TheCore;
+
     public static bool abortRequested { get; set; }
     private Semaphore waitShutdownSem = new Semaphore(0, 1);
@@ -62 +66 @@
 
     public Core() {
+      TheCore = this;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/SlaveCommunicationService.cs

@@ -28 +28 @@
   public class SlaveCommunicationService : ISlaveCommunication {
     private static List<ISlaveCommunicationCallbacks> subscribers = new List<ISlaveCommunicationCallbacks>();
-    public Core SlaveCore { get; set; }
-
 
     public bool Subscribe() {
@@ -86 +84 @@
 
     public void Restart() {
-      SlaveCore.Restart();
+      Core.TheCore.Restart();
     }
     public void HardPause() {
-      SlaveCore.HardPause();
+      Core.TheCore.HardPause();
     }
 
     public void SoftPause() {
-      SlaveCore.SoftPause();
+      Core.TheCore.SoftPause();
     }
 
     public void ShutdownSlave() {
-      SlaveCore.Shutdown();
+      Core.TheCore.Shutdown();
     }
   }