Changeset 6734 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator

Timestamp:

09/11/11 21:54:39 (13 years ago)

Author:

ascheibe

Message:

#1233 some minor improvements in the Slave UI and Administrator UI

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3

Files:

• HiveAdministratorClient.cs (modified) (3 diffs)
• Views/Common/UpdateControl.cs (modified) (1 diff)
• Views/HiveAdministratorView.Designer.cs (modified) (1 diff)
• Views/HiveAdministratorView.cs (modified) (2 diffs)
• Views/ResourcesView.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HiveAdministratorClient.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +26 @@
   [Item("Hive Administrator", "Hive Administrator")]
   public class HiveAdministratorClient : Item {
-    public List<SlaveGroup> SlaveGroups;
-    public List<Slave> Slaves;
-
 
     public HiveAdministratorClient() {
-      UpdateSlaveGroups();
     }
 
@@ -42 +37 @@
       return new HiveAdministratorClient(this, cloner);
     }
-
-    public void UpdateSlaveGroups() {
-      ServiceLocator.Instance.CallHiveService(service => {
-        SlaveGroups = new List<SlaveGroup>(service.GetSlaveGroups());
-        Slaves = new List<Slave>(service.GetSlaves());
-      });
-    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Common/UpdateControl.cs

@@ -32 +32 @@
     public Action UpdateAction { get; set; }
 
+    public void Update() {
+      btnRefresh_Click(this, null);
+    }
+
     private void PrivUpdateAction() {
       UpdateAction();
-      imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = false));
+      if (imgBoxProgress.InvokeRequired) {
+        imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = false));
+      } else {
+        imgBoxProgress.Visible = false;
+      }
     }
 
     private void btnRefresh_Click(object sender, EventArgs e) {
       if (UpdateAction != null) {
-        imgBoxProgress.Visible = true;
+        if (imgBoxProgress.InvokeRequired) {
+          imgBoxProgress.Invoke(new MethodInvoker(() => imgBoxProgress.Visible = true));
+        } else {
+          imgBoxProgress.Visible = true;
+        }
+
         Action action = new Action(PrivUpdateAction);
         TS.Task task = new TS.Task(action);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs

@@ -85 +85 @@
       this.Name = "HiveAdministrationView";
       this.Size = new System.Drawing.Size(745, 546);
-      this.Load += new System.EventHandler(this.HiveAdministrationView_Load);
       this.tabAdmin.ResumeLayout(false);
       this.tabSlaves.ResumeLayout(false);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

@@ -21 +21 @@
 
 using System.Windows.Forms;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -40 +39 @@
     #region Register Content Events
     protected override void DeregisterContentEvents() {
-      // TODO: Deregister your event handlers on the Content here
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      // TODO: Register your event handlers on the Content here
     }
     #endregion
 
-    private void UpdateResources() {
-      IItemList<Resource> resources = new ItemList<Resource>();
-
-      foreach (SlaveGroup g in Content.SlaveGroups) {
-        resources.Add(g);
-      }
-      foreach (Slave g in Content.Slaves) {
-        resources.Add(g);
-      }
-      resourcesView.Content = resources;
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        resourcesView.Content = null;
-
-      } else {
-        //updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);  //??
-        UpdateResources();
-      }
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
     }
-
-    private void HiveAdministrationView_Load(object sender, System.EventArgs e) {
-      if (Content != null) {
-
-      }
-    }
-
-    #region Event Handlers
-    // TODO: Put event handlers here
-    #endregion
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -49 +49 @@
       updateScheduleControl.UpdateAction = new Action(UpdateSchedule);
       updateSlaveGroup.UpdateAction = new Action(UpdateSlaveGroups);
-    }
+
+      updateSlaveGroup.Update();
+    }
+
 
     #region Register Content Events
@@ -131 +134 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      // TODO: Put code here to enable or disable controls based on whether the Content is/not null or the view is ReadOnly
     }
 
@@ -293 +295 @@
     void ResetView() {
       treeSlaveGroup.Nodes.Clear();
+
       if (slaveView.Content != null && slaveView.Content is SlaveGroup) {
         slaveView.Content.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
@@ -301 +304 @@
 
     private void UpdateSlaveGroups() {
-      this.Invoke(new Action(ResetView));
-      Content.Clear();
+      if (this.InvokeRequired) {
+        this.Invoke(new Action(ResetView));
+      } else {
+        ResetView();
+      }
+
       IItemList<Resource> resources = new ItemList<Resource>();