Changeset 553

Timestamp:

09/11/08 21:11:24 (16 years ago)

Author:

gkronber

Message:

added a results-tab in the cedma console which contains a data chart that can be used to display histograms and scatter plots for any result value.

Location:

trunk/sources/HeuristicLab.CEDMA.Core

Files:

• Console.cs (modified) (4 diffs)
• ConsoleEditor.cs (modified) (6 diffs)
• HeuristicLab.CEDMA.Core.csproj (modified) (5 diffs)
• Histogram.cs (added)
• ResultList.cs (added)
• ResultListView.Designer.cs (added)
• ResultListView.cs (added)
• ResultListView.resx (added)

trunk/sources/HeuristicLab.CEDMA.Core/Console.cs

@@ -33 +33 @@
   public class Console : ItemBase, IEditable {
     private AgentList agentList;
+    private ResultList resultsList;
     private DatabaseOperatorLibrary operatorLibary;
     private ChannelFactory<IDatabase> factory;
@@ -45 +46 @@
     }
 
+    public ResultList ResultsList {
+      get { return resultsList; }
+    }
+
     public IOperatorLibrary OperatorLibrary {
       get { return operatorLibary; }
@@ -52 +57 @@
       : base() {
       agentList = new AgentList();
+      resultsList = new ResultList();
       operatorLibary = new DatabaseOperatorLibrary();
     }
@@ -89 +95 @@
       agentList.Database = database;
       operatorLibary.Database = database;
+
+      ChannelFactory<IStore> storeFactory = new ChannelFactory<IStore>(binding);
+      IStore store = storeFactory.CreateChannel(new EndpointAddress(serverUri + "/RdfStore"));
+      resultsList.Store = store;
     }
     #endregion

trunk/sources/HeuristicLab.CEDMA.Core/ConsoleEditor.cs

@@ -28 +28 @@
 using System.ServiceModel;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Charting;
+using System.Drawing;
+using HeuristicLab.CEDMA.DB.Interfaces;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -39 +42 @@
     private Label projectLabel;
     private Button newButton;
-    private System.ComponentModel.IContainer components;
     private Button opLibButton;
     private Label label1;
+    private TabPage resultsTabPage;
     private Console console;
 
@@ -54 +57 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.agentsPage = new System.Windows.Forms.TabPage();
+      this.resultsTabPage = new System.Windows.Forms.TabPage();
       this.connectButton = new System.Windows.Forms.Button();
       this.comboBox1 = new System.Windows.Forms.ComboBox();
@@ -85 +89 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.agentsPage);
+      this.tabControl.Controls.Add(this.resultsTabPage);
       this.tabControl.Enabled = false;
       this.tabControl.Location = new System.Drawing.Point(6, 85);
@@ -101 +106 @@
       this.agentsPage.Text = "Agents";
       this.agentsPage.UseVisualStyleBackColor = true;
+      // 
+      // resultsTabPage
+      // 
+      this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.resultsTabPage.Name = "resultsTabPage";
+      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.resultsTabPage.Size = new System.Drawing.Size(498, 352);
+      this.resultsTabPage.TabIndex = 2;
+      this.resultsTabPage.Text = "Results";
+      this.resultsTabPage.UseVisualStyleBackColor = true;
       // 
       // connectButton
@@ -189 +204 @@
         agentsPage.Controls.Add((Control)console.AgentList.CreateView());
         agentsPage.Controls[0].Dock = DockStyle.Fill;
+        resultsTabPage.Controls.Clear();
+        resultsTabPage.Controls.Add((Control)console.ResultsList.CreateView());
+        resultsTabPage.Controls[0].Dock = DockStyle.Fill;
         opLibButton.Enabled = true;
         opLibButton.Enabled = true;

trunk/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

@@ -33 +33 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Charting, Version=3.0.0.91, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\HeuristicLab.Charting\bin\Debug\HeuristicLab.Charting.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -62 +82 @@
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Histogram.cs" />
+    <Compile Include="ResultList.cs" />
     <Compile Include="ResultTable.cs" />
     <Compile Include="ResultExporter.cs" />
@@ -92 +114 @@
       <DependentUpon>AgentView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ResultListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ResultListView.Designer.cs">
+      <DependentUpon>ResultListView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -100 +128 @@
       <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
       <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Charting.Data\HeuristicLab.Charting.Data.csproj">
+      <Project>{E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}</Project>
+      <Name>HeuristicLab.Charting.Data</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Core\HeuristicLab.Core.csproj">
@@ -131 +163 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ResultListView.resx">
+      <DependentUpon>ResultListView.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />