Changeset 10818 for branches/DataPreprocessing

Timestamp:

05/07/14 15:15:45 (10 years ago)

Author:

psteiner

Message:

Persistence of charting congfiguration

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/HistogramView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/LineChartView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.cs (modified) (11 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingChartContent.cs (modified) (2 diffs)

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

@@ -16 +16 @@
       chartType = DataRowVisualProperties.DataRowChartType.Histogram;
       chartTitle = HISTOGRAM_CHART_TITLE;
-      allInOneMode = false;
     }
 
@@ -25 +24 @@
 
     private void allInOneCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (allInOneMode == false)
-        allInOneMode = true;
+      if (allInOneCheckBox.Checked)
+        Content.AllInOneMode = true;
       else
-        allInOneMode = false;
+        Content.AllInOneMode = false;
       GenerateChart();
+    }
+
+    protected override void OnContentChanged()
+    {
+      base.OnContentChanged();
+      if (Content != null)
+      {
+        allInOneCheckBox.Checked = Content.AllInOneMode;
+      }
     }
 

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

@@ -45 +45 @@
 
     private void allInOneCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (allInOneMode == false)
-        allInOneMode = true;
+      if (allInOneCheckBox.Checked)
+        Content.AllInOneMode = true;
       else
-        allInOneMode = false;
+        Content.AllInOneMode = false;
       GenerateChart();
+    }
+
+    protected override void OnContentChanged()
+    {
+      base.OnContentChanged();
+      if (Content != null)
+      {
+        allInOneCheckBox.Checked = Content.AllInOneMode;
+      }
     }
   }

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

@@ -41 +41 @@
     private PreprocessingDataTable dataTable;
     private List<PreprocessingDataTable> dataTablePerVariable;
-    private ICheckedItemList<StringValue> variableItemList;
     private List<DataRow> dataRows;
 
     protected DataRowVisualProperties.DataRowChartType chartType;
     protected string chartTitle;
-    protected bool allInOneMode;
 
     private const string DEFAULT_CHART_TITLE = "Chart";
@@ -55 +53 @@
       chartType = DataRowVisualProperties.DataRowChartType.Line;
       chartTitle = DEFAULT_CHART_TITLE;
-      allInOneMode = true;
     }
 
@@ -73 +70 @@
       }
 
-      if (!allInOneMode)
+      //if (!Content.AllInOneMode)
+        if (Content != null && !Content.AllInOneMode)
         GenerateChart();
 
@@ -104 +102 @@
 
     private void InitData() {
-      variableItemList = logic.CreateVariableItemList();
-      checkedItemList.Content = variableItemList;
+      if (Content.VariableItemList == null)
+      {
+        Content.VariableItemList = logic.CreateVariableItemList();
+      }
+      checkedItemList.Content = Content.VariableItemList;
       dataRows = logic.CreateAllDataRows(chartType);
 
@@ -115 +116 @@
       // init data table per variable
       dataTablePerVariable = new List<PreprocessingDataTable>();
-      foreach (var checkedItem in variableItemList.CheckedItems) {
-        string variableName = variableItemList[checkedItem.Index].Value;
+      foreach (var checkedItem in Content.VariableItemList.CheckedItems)
+      {
+        string variableName = Content.VariableItemList[checkedItem.Index].Value;
         PreprocessingDataTable d = new PreprocessingDataTable(variableName);
         DataRow row = GetDataRow(variableName);
@@ -144 +146 @@
         logic = Content.ChartLogic;
         InitData();
-        variableItemList.CheckedItemsChanged += CheckedItemsChanged;
+        Content.VariableItemList.CheckedItemsChanged += CheckedItemsChanged;
         GenerateChart();
       }
@@ -190 +192 @@
       d.Rows.Add(row);
       dataTablePerVariable.Add(d);
-      variableItemList.Add(new StringValue(name));
-      if (!allInOneMode)
+      Content.VariableItemList.Add(new StringValue(name));
+      if (!Content.AllInOneMode)
         GenerateChart();
     }
@@ -202 +204 @@
       StringValue stringValue = FindVariableItemList(name);
       if (stringValue != null)
-        variableItemList.Remove(stringValue);
-      if (!allInOneMode)
+        Content.VariableItemList.Remove(stringValue);
+      if (!Content.AllInOneMode)
         GenerateChart();
     }
 
     private StringValue FindVariableItemList(string name) {
-      foreach (StringValue stringValue in variableItemList) {
+      foreach (StringValue stringValue in Content.VariableItemList)
+      {
         if (stringValue.Value == name)
           return stringValue;
@@ -219 +222 @@
       ClearTableLayout();
 
-      if (allInOneMode) {
+      if (Content.AllInOneMode)
+      {
         GenerateSingleChartLayout();
       } else
@@ -247 +251 @@
     private void GenerateMultiChartLayout() {
       int checkedItemsCnt = 0;
-      foreach (var item in variableItemList.CheckedItems)
+      foreach (var item in Content.VariableItemList.CheckedItems)
         checkedItemsCnt++;
 
@@ -320 +324 @@
 
     private void radioButton1_CheckedChanged(object sender, EventArgs e) {
-      if (allInOneMode == false)
-        allInOneMode = true;
+      if (Content.AllInOneMode == false)
+        Content.AllInOneMode = true;
       else
-        allInOneMode = false;
+        Content.AllInOneMode = false;
       GenerateChart();
     }

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using System;
+using System.Collections.Generic;
 
 namespace HeuristicLab.DataPreprocessing {
   [Item("PreprocessingChart", "Represents a preprocessing chart.")]
   public class PreprocessingChartContent : Item, IViewShortcut {
+
+    private bool allInOneMode = true;
+
+    private ICheckedItemList<StringValue> variableItemList = null;
+
 
     private readonly IChartLogic chartLogic;
@@ -55 +63 @@
       remove { chartLogic.Changed -= value; }
     }
+
+    public bool AllInOneMode
+    {
+      get { return this.allInOneMode; }
+      set { this.allInOneMode = value; }
+    }
+
+    public ICheckedItemList<StringValue> VariableItemList
+    {
+      get { return this.variableItemList; }
+      set { this.variableItemList = value; }
+    }
   }
 }