Changeset 10239

Timestamp:

12/18/13 13:55:04 (11 years ago)

Author:

psteiner

Message:

DataPreprocessingView + Refactoring

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (3 diffs)
• Implementations/DataGridContent.cs (modified) (1 diff)
• Implementations/DataGridLogic.cs (added)
• Interfaces/IDataGridLogic.cs (added)
• Views (added)
• Views/DataGridContentView.Designer.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/DataGridContentView.Designer.cs)
• Views/DataGridContentView.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/DataGridContentView.cs)
• Views/DataPreprocessingView.cs (added)
• Views/DataPreprocessingView.designer.cs (added)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -77 +77 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="Plugin.cs.frame" />
-    <Compile Include="DataPreprocessingView.cs">
+    <Compile Include="Implementations\DataGridLogic.cs" />
+    <Compile Include="Interfaces\IDataGridLogic.cs" />
+    <Compile Include="Views\DataPreprocessingView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DataPreprocessingView.Designer.cs">
+    <Compile Include="Views\DataPreprocessingView.designer.cs">
       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     </Compile>
+    <None Include="Plugin.cs.frame" />
     <Compile Include="Implementations\DataGridContent.cs" />
     <Compile Include="Implementations\PreprocessingContext.cs" />
@@ -90 +92 @@
     <Compile Include="Implementations\SearchLogic.cs" />
     <Compile Include="Implementations\StatisticInfo.cs" />
-    <Compile Include="DataGridContentView.cs">
+    <Compile Include="Views\DataGridContentView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DataGridContentView.Designer.cs">
+    <Compile Include="Views\DataGridContentView.Designer.cs">
       <DependentUpon>DataGridContentView.cs</DependentUpon>
     </Compile>
@@ -163 +165 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\DataPreprocessingView.resx">
+      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs

@@ -5 +5 @@
 using System.Text;
 using HeuristicLab.Data;
+using HeuristicLab.Core;
+using HeuristicLab.Common;
+using System.Drawing;
 
 namespace HeuristicLab.DataPreprocessing {
-  public class DataGridContent : IDataGridContent {
+
+  [Item("DataGridContent", "Represents a data grid.")]
+    public class DataGridContent : Item,IDataGridContent,IContent
+    {
     private readonly IPreprocessingData preprocessingData;
    
     public DataGridContent(IPreprocessingData thePreprocessingData) {
       preprocessingData = thePreprocessingData;
+    }
+
+    public DataGridContent(DataGridContent dataGridContent, Cloner cloner)
+        : base(dataGridContent, cloner)
+    {
+
+    }
+
+    public IDataGridLogic DataGridLogic { get; set; }
+
+    public static new Image StaticItemImage
+    {
+        get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner)
+    {
+        return new DataGridContent(this, cloner);
     }