Changeset 1002 for trunk/sources/HeuristicLab.Hive.Client.Console/HiveClientConsole.cs

Timestamp:

12/17/08 14:24:16 (15 years ago)

Author:

whackl

Message:

added new features (#397)

File:

• trunk/sources/HeuristicLab.Hive.Client.Console/HiveClientConsole.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.Hive.Client.Console/HiveClientConsole.cs

@@ -41 +41 @@
   public partial class HiveClientConsole : Form {
 
-    EventLog HiveClientEventLog;
-    ClientConsoleCommunicatorClient cccc;
-    System.Windows.Forms.Timer refreshTimer;
+    private EventLog HiveClientEventLog;
+    private ClientConsoleCommunicatorClient cccc;
+    private System.Windows.Forms.Timer refreshTimer;
+    private ListViewColumnSorterDate lvwColumnSorter;
+
 
     public HiveClientConsole() {
       InitializeComponent();
+      lvwColumnSorter = new ListViewColumnSorterDate();
+      lvLog.ListViewItemSorter = lvwColumnSorter;
+      lvwColumnSorter.SortColumn = 3;
+      lvwColumnSorter.Order = SortOrder.Descending;
       InitTimer();
       ConnectToClient();
@@ -65 +71 @@
     
     private void RefreshGui() {
-      StatusCommons sc = new StatusCommons();
-      
       try {
-        sc = cccc.GetStatusInfos();
+        cccc.GetStatusInfosAsync();
       }
       catch (Exception ex) {
@@ -76 +80 @@
           this.Close();
       }
-
-      lbGuid.Text = sc.ClientGuid.ToString();
-      lbCs.Text = sc.ConnectedSince.ToString();
-      lbConnectionStatus.Text = sc.Status.ToString();
-      lbJobdone.Text = sc.JobsDone.ToString();
-      lbJobsAborted.Text = sc.JobsAborted.ToString();
-      lbJobsFetched.Text = sc.JobsFetched.ToString();
-
-      this.Text = "Client Console (" + sc.Status.ToString() + ")";
-      lbStatus.Text = sc.Status.ToString();
-
-      ListViewItem curJobStatusItem;
-
-      if (sc.Jobs != null) {
-        lvJobDetail.Items.Clear();
-        double progress;
-        foreach (JobStatus curJob in sc.Jobs) {
-          curJobStatusItem = new ListViewItem(curJob.JobId.ToString());
-          curJobStatusItem.SubItems.Add(curJob.Since.ToString());
-          progress = curJob.Progress * 100;
-          curJobStatusItem.SubItems.Add(progress.ToString());
-          lvJobDetail.Items.Add(curJobStatusItem);
-        }
-      }
-
-      UpdateGraph(zGJobs, sc.JobsDone, sc.JobsAborted);
- 
-      if (sc.Status == NetworkEnumWcfConnState.Connected) {
-        btConnect.Enabled = false;
-        btnDisconnect.Enabled = true;
-        ConnectionContainer curConnection = cccc.GetCurrentConnection();
-        tbIPAdress.Text = curConnection.IPAdress;
-        tbPort.Text = curConnection.Port.ToString();
-      } else if (sc.Status == NetworkEnumWcfConnState.Disconnected) {
-        btConnect.Enabled = true;
-        btnDisconnect.Enabled = false;
-      } else if (sc.Status == NetworkEnumWcfConnState.Failed) {
-        btConnect.Enabled = true;
-        btnDisconnect.Enabled = false;
-      }
     }
 
@@ -121 +85 @@
       try {
         cccc = new ClientConsoleCommunicatorClient();
+        cccc.GetStatusInfosCompleted += new EventHandler<GetStatusInfosCompletedEventArgs>(cccc_GetStatusInfosCompleted);
+        cccc.GetCurrentConnectionCompleted += new EventHandler<GetCurrentConnectionCompletedEventArgs>(cccc_GetCurrentConnectionCompleted);
       }
       catch (Exception) {
@@ -127 +93 @@
         if (res == DialogResult.OK)
           this.Close();
+      }
+    }
+
+    void cccc_GetCurrentConnectionCompleted(object sender, GetCurrentConnectionCompletedEventArgs e) {
+      if (e.Error == null) {
+        ConnectionContainer curConnection = e.Result;
+        tbIPAdress.Text = curConnection.IPAdress;
+        tbPort.Text = curConnection.Port.ToString();
+      }
+    }
+
+    void cccc_GetStatusInfosCompleted(object sender, GetStatusInfosCompletedEventArgs e) {
+
+      if (e.Error == null) {
+        StatusCommons sc = e.Result;
+
+        lbGuid.Text = sc.ClientGuid.ToString();
+        lbCs.Text = sc.ConnectedSince.ToString();
+        lbConnectionStatus.Text = sc.Status.ToString();
+        lbJobdone.Text = sc.JobsDone.ToString();
+        lbJobsAborted.Text = sc.JobsAborted.ToString();
+        lbJobsFetched.Text = sc.JobsFetched.ToString();
+
+        this.Text = "Client Console (" + sc.Status.ToString() + ")";
+        lbStatus.Text = sc.Status.ToString();
+
+        ListViewItem curJobStatusItem;
+
+        if (sc.Jobs != null) {
+          lvJobDetail.Items.Clear();
+          double progress;
+          foreach (JobStatus curJob in sc.Jobs) {
+            curJobStatusItem = new ListViewItem(curJob.JobId.ToString());
+            curJobStatusItem.SubItems.Add(curJob.Since.ToString());
+            progress = curJob.Progress * 100;
+            curJobStatusItem.SubItems.Add(progress.ToString());
+            lvJobDetail.Items.Add(curJobStatusItem);
+          }
+          lvJobDetail.Sort();
+        }
+
+        UpdateGraph(zGJobs, sc.JobsDone, sc.JobsAborted);
+
+        if (sc.Status == NetworkEnumWcfConnState.Connected) {
+          btConnect.Enabled = false;
+          btnDisconnect.Enabled = true;
+          cccc.GetCurrentConnectionAsync();
+        } else if (sc.Status == NetworkEnumWcfConnState.Disconnected) {
+          btConnect.Enabled = true;
+          btnDisconnect.Enabled = false;
+        } else if (sc.Status == NetworkEnumWcfConnState.Failed) {
+          btConnect.Enabled = true;
+          btnDisconnect.Enabled = false;
+        }
       }
     }
@@ -143 +163 @@
         curEventLogEntry.SubItems.Add(eve.InstanceId.ToString());
         curEventLogEntry.SubItems.Add(eve.Message);
-        curEventLogEntry.SubItems.Add(eve.TimeGenerated.Date.ToString());
-        curEventLogEntry.SubItems.Add(eve.TimeGenerated.TimeOfDay.ToString());
+        curEventLogEntry.SubItems.Add(eve.TimeGenerated.ToString());
         lvLog.Items.Add(curEventLogEntry);
       }
+      lvJobDetail.Sort();
     }
 
@@ -162 +182 @@
         if (ev.EntryType == EventLogEntryType.Error)
           curEventLogEntry = new ListViewItem("", 1);
-        curEventLogEntry.SubItems.Add(ev.EventID.ToString());
+        curEventLogEntry.SubItems.Add(ev.InstanceId.ToString());
         curEventLogEntry.SubItems.Add(ev.Message);
-        curEventLogEntry.SubItems.Add(ev.TimeGenerated.Date.ToString());
-        curEventLogEntry.SubItems.Add(ev.TimeGenerated.TimeOfDay.ToString());
+        curEventLogEntry.SubItems.Add(ev.TimeGenerated.ToString());
         lvLog.Items.Add(curEventLogEntry);
+        lvJobDetail.Sort();
       }
     }
@@ -175 +195 @@
 
     private void UpdateGraph(ZedGraphControl zgc, int jobsDone, int jobsAborted) {
-      zgc.GraphPane.GraphObjList.Clear();
       GraphPane myPane = zgc.GraphPane;
-
-      // Set the titles and axis labels
-      myPane.Legend.IsVisible = false;
-      myPane.Title.IsVisible = false;
+      myPane.GraphObjList.Clear();
+
+
+      myPane.Title.IsVisible = false;  // no title
+      myPane.Border.IsVisible = false; // no border
+      myPane.Chart.Border.IsVisible = false; // no border around the chart
+      myPane.XAxis.IsVisible = false;  // no x-axis
+      myPane.YAxis.IsVisible = false;  // no y-axis
+      myPane.Legend.IsVisible = false; // no legend
+      
+      myPane.Chart.Fill.Type = FillType.None;
       myPane.Fill.Type = FillType.None;
 
-      double sum = jobsDone + jobsAborted;
-      double perDone = jobsDone / sum * 100;
-      double perAborted = jobsAborted / sum * 100;
-
-      myPane.AddPieSlice(perAborted, Color.Red, 0, "Jobs aborted");
+      //// Set the titles and axis labels
+      //myPane.Legend.IsVisible = false;
+      //myPane.Title.IsVisible = false;
+      ////myPane.Fill.Type = FillType.None;
+      ////myPane.Fill = new Fill();
+      ////myPane.Fill.Color = Color.Transparent;
+
+      double sum = (double)jobsDone + jobsAborted;
+      double perDone = (double)jobsDone / sum * 100;
+      double perAborted = (double)jobsAborted / sum * 100;
+
       myPane.AddPieSlice(perDone, Color.Green, 0.1, "Jobs done");
+      myPane.AddPieSlice(perAborted, Color.Red, 0.1, "Jobs aborted");
+      
       myPane.AxisChange();
     }
@@ -198 +232 @@
     private void lvLog_DoubleClick(object sender, EventArgs e) {
       ListViewItem lvi = lvLog.SelectedItems[0];
-      HiveEventEntry hee = new HiveEventEntry(lvi.SubItems[2].Text, lvi.SubItems[3].Text, lvi.SubItems[4].Text, lvi.SubItems[1].Text);
+      HiveEventEntry hee = new HiveEventEntry(lvi.SubItems[2].Text, lvi.SubItems[3].Text, lvi.SubItems[1].Text);
       
       Form EventlogDetails = new EventLogEntryForm(hee);
@@ -222 +256 @@
       cccc.Disconnect();
     }
+
+    private void lvLog_ColumnClick(object sender, ColumnClickEventArgs e) {
+      // Determine if clicked column is already the column that is being sorted.
+      if (e.Column == lvwColumnSorter.SortColumn) {
+        // Reverse the current sort direction for this column.
+        if (lvwColumnSorter.Order == SortOrder.Ascending) {
+          lvwColumnSorter.Order = SortOrder.Descending;
+        } else {
+          lvwColumnSorter.Order = SortOrder.Ascending;
+        }
+      } else {
+        // Set the column number that is to be sorted; default to ascending.
+        lvwColumnSorter.SortColumn = e.Column;
+        lvwColumnSorter.Order = SortOrder.Ascending;
+      }
+
+      // Perform the sort with these new sort options.
+      lvLog.Sort();
+    }
   }
 }