Changeset 10977 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4

Timestamp:

06/11/14 12:35:14 (10 years ago)

Author:

rstoll

Message:

• Simplified DataGridContent - using a private set in the property instead of private fields
• Disabled transformation if filter is active
• Code Fromatted

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations

Files:

• DataGridContent.cs (modified) (7 diffs)
• TransformationContent.cs (modified) (2 diffs)

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

@@ -31 +31 @@
   public class DataGridContent : Item, IViewShortcut, IDataGridContent {
 
-    private readonly IDataGridLogic dataGridLogic;
-    private readonly IManipulationLogic manipulationLogic;
-    private readonly IFilterLogic filterLogic;
-
-    public IManipulationLogic ManipulationLogic {
-      get { return manipulationLogic; }
-    }
-
-    public IDataGridLogic DataGridLogic {
-      get {
-        return dataGridLogic;
-      }
-    }
-
-    public IFilterLogic FilterLogic {
-      get {
-        return filterLogic;
-      }
-    }
+    public IManipulationLogic ManipulationLogic { get; private set; }
+    public IDataGridLogic DataGridLogic { get; private set; }
+    public IFilterLogic FilterLogic { get; private set; }
 
     public static new Image StaticItemImage {
@@ -57 +41 @@
     public int Rows {
       get {
-        return dataGridLogic.Rows;
+        return DataGridLogic.Rows;
       }
       set {
@@ -66 +50 @@
     public int Columns {
       get {
-        return dataGridLogic.Columns;
+        return DataGridLogic.Columns;
       }
       set {
@@ -75 +59 @@
     public IEnumerable<string> ColumnNames {
       get {
-        return dataGridLogic.ColumnNames;
+        return DataGridLogic.ColumnNames;
       }
       set {
@@ -84 +68 @@
     public IEnumerable<string> RowNames {
       get {
-        return dataGridLogic.RowNames;
+        return DataGridLogic.RowNames;
       }
       set {
@@ -105 +89 @@
 
     public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
-      dataGridLogic = theDataGridLogic;
-      manipulationLogic = theManipulationLogic;
-      filterLogic = theFilterLogic;
+      DataGridLogic = theDataGridLogic;
+      ManipulationLogic = theManipulationLogic;
+      FilterLogic = theFilterLogic;
     }
 
@@ -120 +104 @@
 
     public string GetValue(int rowIndex, int columnIndex) {
-      return dataGridLogic.GetValue(columnIndex, rowIndex);
+      return DataGridLogic.GetValue(columnIndex, rowIndex);
     }
 
     public bool SetValue(string value, int rowIndex, int columnIndex) {
-      return dataGridLogic.SetValue(value, columnIndex, rowIndex);
+      return DataGridLogic.SetValue(value, columnIndex, rowIndex);
     }
 
     public event DataPreprocessingChangedEventHandler Changed {
-      add { dataGridLogic.Changed += value; }
-      remove { dataGridLogic.Changed -= value; }
+      add { DataGridLogic.Changed += value; }
+      remove { DataGridLogic.Changed -= value; }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/TransformationContent.cs

@@ -30 +30 @@
 
     public IPreprocessingData Data { get; private set; }
+    public IFilterLogic FilterLogic { get; private set; }
 
     public ICheckedItemList<ITransformation> CheckedTransformationList { get; private set; }
 
-    public TransformationContent(IPreprocessingData data) {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
+    }
+
+    public TransformationContent(IPreprocessingData data, IFilterLogic filterLogic) {
       Data = data;
       CheckedTransformationList = new CheckedItemList<ITransformation>();
+      FilterLogic = filterLogic;
     }
 
@@ -44 +50 @@
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
-    }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TransformationContent(this, cloner);