Changeset 7857 for trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Timestamp:

05/21/12 15:12:15 (13 years ago)

Author:

jkarder

Message:

#1854:

• integrated marker attribute (IsDisposable) into the Hive components
• adjusted database scheme
• extended administration user interface

Location:

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• SlaveView.Designer.cs (modified) (13 diffs)
• SlaveView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs

@@ -65 +65 @@
       this.label3 = new System.Windows.Forms.Label();
       this.txtHbIntervall = new System.Windows.Forms.TextBox();
+      this.cbxDisposable = new System.Windows.Forms.CheckBox();
+      this.label4 = new System.Windows.Forms.Label();
       this.SuspendLayout();
       // 
       // txtSlaveState
       // 
-      this.txtSlaveState.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtSlaveState.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtSlaveState.Enabled = false;
       this.txtSlaveState.Location = new System.Drawing.Point(146, 216);
@@ -79 +81 @@
       // txtOS
       // 
-      this.txtOS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtOS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtOS.Enabled = false;
       this.txtOS.Location = new System.Drawing.Point(146, 190);
@@ -107 +109 @@
       // txtDetailsDescription
       // 
-      this.txtDetailsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtDetailsDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtDetailsDescription.Enabled = false;
       this.txtDetailsDescription.Location = new System.Drawing.Point(146, 86);
@@ -126 +128 @@
       // txtName
       // 
-      this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtName.Location = new System.Drawing.Point(146, 8);
       this.txtName.Name = "txtName";
@@ -136 +138 @@
       // txtCPU
       // 
-      this.txtCPU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtCPU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtCPU.Enabled = false;
       this.txtCPU.Location = new System.Drawing.Point(146, 112);
@@ -146 +148 @@
       // txtMemory
       // 
-      this.txtMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtMemory.Enabled = false;
       this.txtMemory.Location = new System.Drawing.Point(146, 138);
@@ -156 +158 @@
       // txtLastHeartbeat
       // 
-      this.txtLastHeartbeat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtLastHeartbeat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtLastHeartbeat.Enabled = false;
       this.txtLastHeartbeat.Location = new System.Drawing.Point(146, 242);
@@ -211 +213 @@
       // txtFreeMemory
       // 
-      this.txtFreeMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtFreeMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtFreeMemory.Enabled = false;
       this.txtFreeMemory.Location = new System.Drawing.Point(146, 164);
@@ -221 +223 @@
       // txtId
       // 
-      this.txtId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtId.Enabled = false;
       this.txtId.Location = new System.Drawing.Point(146, 60);
@@ -249 +251 @@
       // txtHbIntervall
       // 
-      this.txtHbIntervall.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtHbIntervall.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.txtHbIntervall.Location = new System.Drawing.Point(146, 34);
       this.txtHbIntervall.Name = "txtHbIntervall";
@@ -257 +259 @@
       this.txtHbIntervall.TextChanged += new System.EventHandler(this.txtHbIntervall_TextChanged);
       // 
+      // cbxDisposable
+      // 
+      this.cbxDisposable.AutoSize = true;
+      this.cbxDisposable.Location = new System.Drawing.Point(146, 268);
+      this.cbxDisposable.Name = "cbxDisposable";
+      this.cbxDisposable.Size = new System.Drawing.Size(15, 14);
+      this.cbxDisposable.TabIndex = 34;
+      this.cbxDisposable.UseVisualStyleBackColor = true;
+      this.cbxDisposable.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(3, 269);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(62, 13);
+      this.label4.TabIndex = 35;
+      this.label4.Text = "Disposable:";
+      // 
       // SlaveView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.label4);
+      this.Controls.Add(this.cbxDisposable);
       this.Controls.Add(this.txtHbIntervall);
       this.Controls.Add(this.label3);
@@ -282 +305 @@
       this.Controls.Add(this.label9);
       this.Name = "SlaveView";
-      this.Size = new System.Drawing.Size(539, 267);
+      this.Size = new System.Drawing.Size(539, 285);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -310 +333 @@
     private System.Windows.Forms.Label label3;
     private System.Windows.Forms.TextBox txtHbIntervall;
+    private System.Windows.Forms.CheckBox cbxDisposable;
+    private System.Windows.Forms.Label label4;
   }
 }

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

@@ -62 +62 @@
         txtId.Clear();
         txtHbIntervall.Clear();
+        cbxDisposable.Checked = false;
       } else {
         if (Content.GetType() == typeof(Slave)) {
@@ -68 +69 @@
           txtName.Text = ct.Name;
           txtHbIntervall.Text = ct.HbInterval.ToString();
+          cbxDisposable.Checked = ct.IsDisposable;
           txtCPU.Text = string.Format("{0} Cores @ {1} Mhz, Arch.: {2}", ct.Cores.ToString(), ct.CpuSpeed.ToString(), ct.CpuArchitecture.ToString());
           txtDetailsDescription.Text = ct.Description;
@@ -88 +90 @@
 
     private void ShowSlaveUI(bool show) {
+      label1.Visible = show;
       label2.Visible = show;
-      label1.Visible = show;
+      label4.Visible = show;
       label10.Visible = show;
       label11.Visible = show;
@@ -105 +108 @@
       txtId.Visible = show;
       txtName.Enabled = !show;
+      cbxDisposable.Visible = show;
     }
 
@@ -131 +135 @@
       }
     }
+
+    private void checkBox1_CheckedChanged(object sender, EventArgs e) {
+      if (Content != null) {
+        ((Slave)Content).IsDisposable = cbxDisposable.Checked;
+      }
+    }
   }
 }