Changeset 911

Timestamp:

12/04/08 17:32:42 (15 years ago)

Author:

whackl

Message:

bug fixed (#397)

Location:

trunk/sources/HeuristicLab.Hive.Client.Console

Files:

• HeuristicLab.Hive.Client.Console.csproj (modified) (3 diffs)
• HiveClientConsole.cs (modified) (5 diffs)
• ServerProxy.cs (added)
• ServiceLocator.cs (added)
• ZedGraph.dll (added)

trunk/sources/HeuristicLab.Hive.Client.Console/HeuristicLab.Hive.Client.Console.csproj

@@ -76 +76 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -89 +92 @@
     <Reference Include="ZedGraph, Version=5.1.4.31904, Culture=neutral, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.0\plugins\ZedGraph.dll</HintPath>
+      <HintPath>.\ZedGraph.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -140 +143 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="ServerProxy.cs" />
+    <Compile Include="ServiceLocator.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Hive.Client.Communication\HeuristicLab.Hive.Client.Communication.csproj">
+      <Project>{AEB51212-CDBA-4FC6-A2EE-02359AA53ECE}</Project>
+      <Name>HeuristicLab.Hive.Client.Communication</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
       <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>

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

@@ -31 +31 @@
 using System.Threading;
 using ZedGraph;
+using HeuristicLab.Hive.Client.Communication.ClientConsole;
 
 namespace HeuristicLab.Hive.Client.Console {
 
-  delegate void UpdateTextDelegate(EventLog ev);
+  delegate void UpdateTextDelegate(EventLogEntry ev);
 
   public partial class HiveClientConsole : Form {
@@ -44 +45 @@
       InitializeComponent();
       GetEventLog();
+
+      ClientConsoleCommunicatorClient cccc = ServiceLocator.ClientConsoleCommunicatorClient();
+      StatusCommons curClientStatus = cccc.GetStatusInfos();
     }
 
@@ -57 +61 @@
         if(eve.EntryType == EventLogEntryType.Error)
           curEventLogEntry = new ListViewItem("", 1);
-        curEventLogEntry.SubItems.Add(eve.EventID.ToString());
+        curEventLogEntry.SubItems.Add(eve.InstanceId.ToString());
         curEventLogEntry.SubItems.Add(eve.Message);
         curEventLogEntry.SubItems.Add(eve.TimeGenerated.Date.ToString());
@@ -70 +74 @@
     }
 
-    private void UpdateText(EventLog ev) {
+    private void UpdateText(EventLogEntry ev) {
       if (this.lvLog.InvokeRequired) {
         this.lvLog.Invoke(new
           UpdateTextDelegate(UpdateText), new object[] { ev });
       } else {
-        //string str = ev.Entries[numEntries].TimeWritten + " -> " + ev.Entries[numEntries].Message;
-        //numEntries++;
-        //lbEventLog.Items.Add(str);
-        //lbEventLog.SelectedIndex = lbEventLog.Items.Count - 1;
+        ListViewItem curEventLogEntry;
+        curEventLogEntry = new ListViewItem("", 0);
+        if (ev.EntryType == EventLogEntryType.Error)
+          curEventLogEntry = new ListViewItem("", 1);
+        curEventLogEntry.SubItems.Add(ev.EventID.ToString());
+        curEventLogEntry.SubItems.Add(ev.Message);
+        curEventLogEntry.SubItems.Add(ev.TimeGenerated.Date.ToString());
+        curEventLogEntry.SubItems.Add(ev.TimeGenerated.TimeOfDay.ToString());
+
 
       }
     }
 
-    //private void tsmiExit_Click(object sender, EventArgs e) {
-    //  this.Close();
-    //}
-
-    //private void btnConnect_Click(object sender, EventArgs e) {
-    //  btnConnect.Enabled = false;
-    //  btnDisconnect.Enabled = true;
-    //  tbIp.Enabled = false;
-    //  tbPort.Enabled = false;
-    //  tbUuid.Enabled = false;
-    //  lbEventLog.Items.Add(tbIp.Text);
-    //}
-
-    //private void btnDisconnect_Click(object sender, EventArgs e) {
-    //  btnDisconnect.Enabled = false;
-    //  btnConnect.Enabled = true;
-    //  tbIp.Enabled = true;
-    //  tbPort.Enabled = true;
-    //  tbUuid.Enabled = true;
-    //}
-
     public void OnEntryWritten(object source, EntryWrittenEventArgs e) {
-      UpdateText((EventLog)source);
+      UpdateText(e.Entry);
     }
 
@@ -136 +124 @@
     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);