Changeset 1080

Timestamp:

01/07/09 15:28:14 (16 years ago)

Author:

whackl

Message:

added new chart diagram (#397)

File:

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

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

@@ -116 +116 @@
       ListViewItem curEventLogEntry;
 
-      foreach (EventLogEntry ele in HiveClientEventLog.Entries) {
-        curEventLogEntry = GenerateEventEntry(ele);
-        lvLog.Items.Add(curEventLogEntry);
-      }
-      lvJobDetail.Sort();
+      //databinding on listview?
+      if (HiveClientEventLog != null && HiveClientEventLog.Entries != null) {
+        foreach (EventLogEntry ele in HiveClientEventLog.Entries) {
+          curEventLogEntry = GenerateEventEntry(ele);
+          lvLog.Items.Add(curEventLogEntry);
+        }
+        lvJobDetail.Sort();
+      }
     }
 
@@ -134 +137 @@
     }
 
-    private void UpdateGraph(int jobsDone, int jobsAborted) {
+    private void UpdateGraph(JobStatus[] jobs) {
       ZedGraphControl zgc = new ZedGraphControl();
       GraphPane myPane = zgc.GraphPane;
@@ -146 +149 @@
       myPane.Legend.IsVisible = false; // no legend
 
-      myPane.Fill.Color = Color.FromKnownColor(KnownColor.Control);
+      myPane.Fill.Color = this.BackColor;
 
       myPane.Chart.Fill.Type = FillType.None;
       myPane.Fill.Type = FillType.Solid;
 
-      double sum = (double)jobsDone + jobsAborted;
-      double perDone = (double)jobsDone / sum * 100;
-      double perAborted = (double)jobsAborted / sum * 100;
-
-      myPane.AddPieSlice(perDone, Color.Green, 0.1, "");
-      myPane.AddPieSlice(perAborted, Color.Red, 0.1, "");
-
+      double allProgress = 0;
+      double done = 0;
+
+      if (jobs.Length == 0) {
+        myPane.AddPieSlice(100, Color.Green, 0.1, "");
+      } else {
+        for (int i = 0; i < jobs.Length; i++) {
+          allProgress += jobs[i].Progress;         
+        }
+
+        done = allProgress / jobs.Length;
+
+        myPane.AddPieSlice(done, Color.Green, 0.1, "");
+        myPane.AddPieSlice(1-done, Color.Red, 0.1, "");
+      }
       //Hides the slice labels
       PieItem.Default.LabelType = PieLabelType.None;
@@ -216 +227 @@
         }
 
-        UpdateGraph(sc.JobsDone, sc.JobsAborted);
+        UpdateGraph(sc.Jobs);
 
         if (sc.Status == NetworkEnumWcfConnState.Connected) {