Changeset 10998

Timestamp:

06/11/14 15:25:24 (10 years ago)

Author:

psteiner

Message:

Formatting Sourcecode Views

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• CheckedTransformationListView.cs (modified) (1 diff)
• ComparisonFilterView.cs (modified) (3 diffs)
• DataCompletenessView.cs (modified) (2 diffs)
• DataGridContentView.cs (modified) (2 diffs)
• DataPreprocessingView.cs (modified) (1 diff)
• FilterView.cs (modified) (2 diffs)
• PreprocessingScatterPlotView.cs (modified) (1 diff)
• ScatterPlotSingleView.cs (modified) (1 diff)
• TransformationView.cs (modified) (1 diff)
• Utils/FindPreprocessingItemsIterator.cs (modified) (2 diffs)
• Utils/IFindPreprocessingItemsIterator.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.cs

@@ -62 +62 @@
       }
       return null;
-    }
+    } 
 
     private bool CanInstanciateTransformation(Type type) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs

@@ -72 +72 @@
       if (Content.ConstrainedValue != null) {
         this.cbAttr.Items.AddRange(Content.ConstrainedValue.VariableNames.ToArray<string>());
-        //if (!string.IsNullOrEmpty(Content.ConstraintColumn))
         this.cbAttr.SelectedItem = this.cbAttr.Items[Content.ConstraintColumn];
-
-        //if (Content.ConstraintColumn != null)
-        //{
         cbAttr.SelectedItem = Content.ConstraintColumn;
         if (Content.ConstraintData != null)
@@ -82 +78 @@
         else
           this.Content_ConstraintColumnChanged(cbAttr, EventArgs.Empty);
-        //}
       }
     }
@@ -134 +129 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      /*
-      cbAttr.Enabled = !this.ReadOnly && Content != null;
-      cbFilterOperation.Enabled = !this.ReadOnly && Content != null;
-      tbFilterData.Enabled = Content != null;
-      tbFilterData.ReadOnly = ReadOnly;
-       * */
       cbAttr.Enabled = Content != null && !Content.Active;
       cbFilterOperation.Enabled = Content != null && !Content.Active;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataCompletenessView.cs

@@ -43 +43 @@
     }
 
-    
     private void InitData()
     {
@@ -84 +83 @@
       chart.ChartAreas[0].AxisY.IsReversed = true;
     }
-
-
 
     private void CreateSeries(List<List<int>> yValuesPerColumn)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -535 +535 @@
             e.CellBounds.Bottom);
       }
-
       e.PaintContent(e.CellBounds);
       e.Handled = true;
@@ -665 +664 @@
     #endregion
 
-
   }
 }

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

@@ -32 +32 @@
   [Content(typeof(IPreprocessingContext), false)]
   public partial class DataPreprocessingView : ItemView {
+
     public DataPreprocessingView() {
       InitializeComponent();

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

@@ -57 +57 @@
 
     private void UpdateFilterInfo() {
-        //List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
         List<IFilter> filters = Content.Filters.ToList();
-
         int activeFilters = filters.Count(c => c.Active);
-
         applyFilterButton.Enabled = (activeFilters > 0);
         rBtnAnd.Enabled = (activeFilters > 0);
         rBtnOr.Enabled = (activeFilters > 0);
-        //btnReset.Enabled = (activeFilters > 0);
         Content.FilterLogic.Reset();
         bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
@@ -121 +117 @@
     }
 
-    /*
-    private void btnReset_Click(object sender, EventArgs e)
-    {
-      if (Content != null)
-      {
-        Content.FilterLogic.Reset();
-      }
-    }
-     * */
-
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.cs

@@ -462 +462 @@
       if (chartDoubleClick != null)
         chartDoubleClick(this, e);
-    }
+    } 
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs

@@ -13 +13 @@
   public partial class ScatterPlotSingleView : ItemView {
 
-    public ScatterPlotSingleView() {
-      InitializeComponent();
-    }
-
     public new ScatterPlotContent Content {
       get { return (ScatterPlotContent)base.Content; }
       set { base.Content = value; }
+    }
+
+    public ScatterPlotSingleView()
+    {
+      InitializeComponent();
     }
 

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

@@ -33 +33 @@
   public partial class TransformationView : AsynchronousContentView {
 
+    public new TransformationContent Content
+    {
+      get { return (TransformationContent)base.Content; }
+      set { base.Content = value; }
+    }
+
     public TransformationView() {
       InitializeComponent();
-    }
-
-    public new TransformationContent Content {
-      get { return (TransformationContent)base.Content; }
-      set { base.Content = value; }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/Utils/FindPreprocessingItemsIterator.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing.Views {
   class FindPreprocessingItemsIterator : IFindPreprocessingItemsIterator {
+
     private IDictionary<int, IList<int>> items;
     private Tuple<int, int> currentCell;
@@ -31 +32 @@
     public FindPreprocessingItemsIterator(IDictionary<int, IList<int>> items) {
       this.items = items;
-      Reset();
+      Reset(); 
     }
-
 
     public void SetStartCell(int columnIndex, int rowIndex) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/Utils/IFindPreprocessingItemsIterator.cs

@@ -27 +27 @@
     bool MoveNext();
     void Reset();
-    void SetStartCell(int columnIndex, int rowIndex);
+    void SetStartCell(int columnIndex, int rowIndex); 
   }
 }