Changeset 7317 for branches

Timestamp:

01/11/12 17:14:36 (13 years ago)

Author:

spimming

Message:

#1680:

• Use IItemLists for data
• Show CloudResourceView in HiveCloudManagerView

Location:

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3

Files:

• CloudManagerClient.cs (modified) (1 diff)
• Views/CloudResourcesView.Designer.cs (modified) (8 diffs)
• Views/CloudResourcesView.cs (modified) (1 diff)
• Views/HiveCloudManagerView.Designer.cs (modified) (5 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/CloudManagerClient.cs

@@ -19 +19 @@
 
     #region Properties
-    private ItemCollection<Subscription> subscriptions;
-    public ItemCollection<Subscription> Subscriptions {
+    private IItemList<Subscription> subscriptions;
+    public IItemList<Subscription> Subscriptions {
       get { return subscriptions; }
       set {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.Designer.cs

@@ -26 +26 @@
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CloudResourcesView));
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.label1 = new System.Windows.Forms.Label();
+      this.lblRefresh = new System.Windows.Forms.Label();
       this.btnSave = new System.Windows.Forms.Button();
       this.btnDelete = new System.Windows.Forms.Button();
@@ -45 +45 @@
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.label1);
+      this.splitContainer1.Panel1.Controls.Add(this.lblRefresh);
       this.splitContainer1.Panel1.Controls.Add(this.btnSave);
       this.splitContainer1.Panel1.Controls.Add(this.btnDelete);
@@ -55 +55 @@
       this.splitContainer1.TabIndex = 0;
       // 
-      // label1
+      // lblRefresh
       // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(127, 10);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(126, 13);
-      this.label1.TabIndex = 5;
-      this.label1.Text = "Done. 5s to  next refresh.";
+      this.lblRefresh.AutoSize = true;
+      this.lblRefresh.Location = new System.Drawing.Point(127, 10);
+      this.lblRefresh.Name = "lblRefresh";
+      this.lblRefresh.Size = new System.Drawing.Size(126, 13);
+      this.lblRefresh.TabIndex = 5;
+      this.lblRefresh.Text = "Done. 5s to  next refresh.";
       // 
       // btnSave
       // 
-      this.btnSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.btnSave.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.Image")));
       this.btnSave.Location = new System.Drawing.Point(97, 4);
       this.btnSave.Name = "btnSave";
@@ -75 +75 @@
       // btnDelete
       // 
-      this.btnDelete.Image = HeuristicLab.Common.Resources.VSImageLibrary.Delete;
+      this.btnDelete.Image = ((System.Drawing.Image)(resources.GetObject("btnDelete.Image")));
       this.btnDelete.Location = new System.Drawing.Point(66, 4);
       this.btnDelete.Name = "btnDelete";
@@ -84 +84 @@
       // btnAddSlaveService
       // 
-      this.btnAddSlaveService.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
+      this.btnAddSlaveService.Image = ((System.Drawing.Image)(resources.GetObject("btnAddSlaveService.Image")));
       this.btnAddSlaveService.Location = new System.Drawing.Point(35, 4);
       this.btnAddSlaveService.Name = "btnAddSlaveService";
@@ -93 +93 @@
       // btnAddSubscription
       // 
-      this.btnAddSubscription.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewFolder;
+      this.btnAddSubscription.Image = ((System.Drawing.Image)(resources.GetObject("btnAddSubscription.Image")));
       this.btnAddSubscription.Location = new System.Drawing.Point(4, 4);
       this.btnAddSubscription.Name = "btnAddSubscription";
@@ -102 +102 @@
       // treeCloudResources
       // 
+      this.treeCloudResources.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.treeCloudResources.Location = new System.Drawing.Point(3, 34);
       this.treeCloudResources.Name = "treeCloudResources";
@@ -130 +133 @@
     private System.Windows.Forms.Button btnDelete;
     private System.Windows.Forms.Button btnAddSlaveService;
-    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.Label lblRefresh;
   }
 }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/CloudResourcesView.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
+using System.Threading;
+using System.Timers;
 using System.Windows.Forms;
+using HeuristicLab.Clients.Hive.CloudManager.Model;
+using HeuristicLab.Core;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Clients.Hive.CloudManager.Views {
-  public partial class CloudResourcesView : UserControl {
+  [View("Cloud Resources View")]
+  [Content(typeof(IItemList<Subscription>), IsDefaultView = true)]
+  public partial class CloudResourcesView : ItemView, IDisposable {
+    private System.Timers.Timer timer = new System.Timers.Timer();
+    private int updateInterval = 15000;
+    private DateTime dueTime;
+
+    public new IItemList<Subscription> Content {
+      get { return (IItemList<Subscription>)base.Content; }
+      set { base.Content = value; }
+    }
+
     public CloudResourcesView() {
       InitializeComponent();
+
+      CloudManagerClient.Instance.Refreshing += new EventHandler(Instance_Refreshing);
+      CloudManagerClient.Instance.Refreshed += new EventHandler(Instance_Refreshed);
+
+      timer.AutoReset = true;
+      timer.Interval = 1000;
+      timer.Elapsed += PerformUpdate;
+      timer.Start();
+      dueTime = DateTime.Now.AddMilliseconds(updateInterval);
+    }
+
+    public new void Dispose() {
+      CloudManagerClient.Instance.Refreshing -= new EventHandler(Instance_Refreshing);
+      CloudManagerClient.Instance.Refreshed -= new EventHandler(Instance_Refreshed);
+      timer.Dispose();
+      Debug.WriteLine("Dispose");
+    }
+
+    void Instance_Refreshing(object sender, EventArgs e) {
+      Debug.WriteLine("Instance_Refreshing");
+    }
+
+    void Instance_Refreshed(object sender, EventArgs e) {
+      Debug.WriteLine("Instance_Refreshed");
+    }
+
+    private void PerformUpdate(object sender, ElapsedEventArgs e) {
+      TimeSpan timeToRefresh = dueTime - DateTime.Now;
+
+      if (timeToRefresh.Seconds >= 0) {
+        this.Invoke((MethodInvoker)delegate { lblRefresh.Text = "Done. " + timeToRefresh.Seconds + "s to next refresh."; });
+      } else {
+        timer.Stop();
+        this.Invoke((MethodInvoker)delegate { lblRefresh.Text = "Refreshing data ..."; });
+
+        // statistics
+        Debug.WriteLine("perform update");
+        Thread.Sleep(1000);
+
+        dueTime = DateTime.Now.AddMilliseconds(updateInterval);
+        timer.Start();
+      }
     }
   }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.CloudManager/3.3/Views/HiveCloudManagerView.Designer.cs

@@ -26 +26 @@
       this.tabResources = new System.Windows.Forms.TabControl();
       this.tabResource = new System.Windows.Forms.TabPage();
+      this.cloudResourcesView = new HeuristicLab.Clients.Hive.CloudManager.Views.CloudResourcesView();
       this.tabResources.SuspendLayout();
+      this.tabResource.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -43 +45 @@
       // tabResource
       // 
+      this.tabResource.Controls.Add(this.cloudResourcesView);
       this.tabResource.Location = new System.Drawing.Point(4, 22);
       this.tabResource.Name = "tabResource";
@@ -50 +53 @@
       this.tabResource.Text = "Resources";
       this.tabResource.UseVisualStyleBackColor = true;
+      // 
+      // cloudResourcesView
+      // 
+      this.cloudResourcesView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.cloudResourcesView.Caption = "Cloud Resources View";
+      this.cloudResourcesView.Content = null;
+      this.cloudResourcesView.Location = new System.Drawing.Point(6, 3);
+      this.cloudResourcesView.Name = "cloudResourcesView";
+      this.cloudResourcesView.ReadOnly = false;
+      this.cloudResourcesView.Size = new System.Drawing.Size(719, 505);
+      this.cloudResourcesView.TabIndex = 0;
       // 
       // HiveCloudManagerView
@@ -59 +75 @@
       this.Size = new System.Drawing.Size(745, 546);
       this.tabResources.ResumeLayout(false);
+      this.tabResource.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -67 +84 @@
     private System.Windows.Forms.TabControl tabResources;
     private System.Windows.Forms.TabPage tabResource;
+    private CloudResourcesView cloudResourcesView;
   }
 }