Changeset 10772 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Timestamp:

04/23/14 12:38:07 (11 years ago)

Author:

pfleck

Message:

• Current Transformations from GUI stored in TransformationContent.
• Corrected namespace from Transformation interfaces.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataPreprocessingView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• TransformationView.Designer.cs (modified) (3 diffs)
• TransformationView.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

@@ -49 +49 @@
         var statisticsLogic = new StatisticsLogic(data, searchLogic);
         var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
-        var transformationLogic = new TransformationLogic(data, searchLogic, statisticsLogic);
         var lineChartLogic = new ChartLogic(data);
         var histogramLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
 
-        
-
-        var viewShortcuts = new ItemCollection<IViewShortcut>() {
+        var viewShortcuts = new ItemCollection<IViewShortcut> {
           new DataGridContent(dataGridLogic, manipulationLogic, filterLogic),
           new StatisticsContent(statisticsLogic),
           new FilterContent(filterLogic),
-          new TransformationContent(transformationLogic),
+          new TransformationContent(data),
           new ManipulationContent(manipulationLogic),
           new LineChartContent(lineChartLogic),

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

@@ -226 +226 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Transformations\3.3\HeuristicLab.Problems.DataAnalysis.Transformations-3.3.csproj">
+      <Project>{2e257a94-d1af-435c-99b4-5ac00eadfd6a}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Transformations-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
       <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Plugin.cs.frame

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Transformations", "3.3")]
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -45 +47 @@
     /// </summary>
     private void InitializeComponent() {
-      this.label1 = new System.Windows.Forms.Label();
-      this.SuspendLayout();
+      components = new System.ComponentModel.Container();
+      this.transformationCollectionView = new HeuristicLab.Core.Views.CheckedItemCollectionView<ITransformation>();
+      // transformationCollectionView
       // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(26, 68);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(103, 13);
-      this.label1.TabIndex = 0;
-      this.label1.Text = "Not yet implemented";
+      this.transformationCollectionView.Caption = "Transformations";
+      this.transformationCollectionView.Content = null;
+      this.transformationCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.transformationCollectionView.Location = new System.Drawing.Point(0, 0);
+      this.transformationCollectionView.Name = "transformationCollectionView";
+      this.transformationCollectionView.Size = new System.Drawing.Size(627, 528);
+      this.transformationCollectionView.TabIndex = 0;
       // 
       // TransformationView
@@ -61 +63 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.label1);
+      this.Controls.Add(this.transformationCollectionView);
       this.Name = "TransformationView";
+      this.Size = new System.Drawing.Size(627, 528);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
 
     #endregion
-
-    private System.Windows.Forms.Label label1;
+    private Core.Views.CheckedItemCollectionView<ITransformation> transformationCollectionView;
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs

@@ -22 +22 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -36 +37 @@
       set { base.Content = value; }
     }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      if (Content == null) {
+        transformationCollectionView.Content = null;
+      } else {
+        transformationCollectionView.Content = Content.CheckedTransformationCollection;
+      }
+    }
   }
 }