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

Timestamp:

12/17/08 15:19:02 (15 years ago)

Author:

whackl

Message:

Graph fixed (#397)

File:

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

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

@@ -134 +134 @@
         }
 
-        UpdateGraph(zGJobs, sc.JobsDone, sc.JobsAborted);
+        UpdateGraph(sc.JobsDone, sc.JobsAborted);
 
         if (sc.Status == NetworkEnumWcfConnState.Connected) {
@@ -194 +194 @@
     }
 
-    private void UpdateGraph(ZedGraphControl zgc, int jobsDone, int jobsAborted) {
+    private void UpdateGraph(int jobsDone, int jobsAborted) {
+      ZedGraphControl zgc = new ZedGraphControl();
       GraphPane myPane = zgc.GraphPane;
       myPane.GraphObjList.Clear();
-
 
       myPane.Title.IsVisible = false;  // no title
@@ -205 +205 @@
       myPane.YAxis.IsVisible = false;  // no y-axis
       myPane.Legend.IsVisible = false; // no legend
-      
+
+      myPane.Fill.Color = Color.FromKnownColor(KnownColor.Control);
+
       myPane.Chart.Fill.Type = FillType.None;
-      myPane.Fill.Type = FillType.None;
-
-      //// 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;
+      myPane.Fill.Type = FillType.Solid;
 
       double sum = (double)jobsDone + jobsAborted;
@@ -220 +215 @@
       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.AddPieSlice(perDone, Color.Green, 0.1, "");
+      myPane.AddPieSlice(perAborted, Color.Red, 0.1, "");
       
       myPane.AxisChange();
+
+      pbGraph.Image = zgc.GetImage();
     }
 
@@ -246 +243 @@
         cc.IPAdress = tbIPAdress.Text;
         cc.Port = port;
-        cccc.SetConnection(cc);
+        cccc.SetConnectionAsync(cc);
       } else {
         MessageBox.Show("IP Adress and/or Port Error", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
       }
-      
     }
 
     private void btnDisconnect_Click(object sender, EventArgs e) {
-      cccc.Disconnect();
+      cccc.DisconnectAsync();
     }