Changeset 1972 for trunk/sources/HeuristicLab.Visualization/3.2

Timestamp:

05/30/09 12:19:16 (15 years ago)

Author:

shofstad

Message:

DataRowSettings updated (#636)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• DataRow.cs (modified) (2 diffs)
• DataRowBase.cs (modified) (2 diffs)
• IDataRow.cs (modified) (1 diff)
• Options/DataRowSettings.cs (modified) (3 diffs)
• Options/Options.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/DataRow.cs

@@ -32 +32 @@
       this.RowSettings.Color = color;
       this.RowSettings.Thickness = thickness;
-      this.Style = style;
+      this.RowSettings.Style = style;
       this.dataRow = dataRow;
-      this.ShowMarkers = true;
+      this.RowSettings.ShowMarkers = true;
     }
 
@@ -41 +41 @@
       this.RowSettings.Color = color;
       this.RowSettings.Thickness = thickness;
-      this.Style = style;
-      this.ShowMarkers = showMarkers;
+      this.RowSettings.Style = style;
+      this.RowSettings.ShowMarkers = showMarkers;
       this.dataRow = dataRow;
     }

trunk/sources/HeuristicLab.Visualization/3.2/DataRowBase.cs

@@ -6 +6 @@
     //private Color color = Color.Black;
     //private int thickness = 2;
-    private DrawingStyle style = DrawingStyle.Solid;
-    private DataRowType lineType = DataRowType.Normal;
+//    private DrawingStyle style = DrawingStyle.Solid;
+//    private DataRowType lineType = DataRowType.Normal;
     private YAxisDescriptor yAxis;
-    private bool showMarkers = true;
+//    private bool showMarkers = true;
 
-    private DataRowSettings rowSettings = new DataRowSettings();
+    private DataRowSettings rowSettings ;
 
     public DataRowSettings RowSettings {
       get { return rowSettings; }
-      set { rowSettings = value; }
+      set {
+        rowSettings.DataVisualSettingChanged -= value_DataVisualSettingChanged;
+        value.DataVisualSettingChanged += value_DataVisualSettingChanged;
+        rowSettings = value;
+      }
     }
 
-    public bool ShowMarkers {
-      get { return showMarkers; }
-      set {
-        showMarkers = value;
-        OnDataRowChanged(this);
-      }
-    }          
+    public DataRowBase() {
+      rowSettings = new DataRowSettings();
+      rowSettings.DataVisualSettingChanged += value_DataVisualSettingChanged;
+    }
+
+    void value_DataVisualSettingChanged(DataRowSettings row) {
+      OnDataRowChanged(this);
+    }
+
+//    public bool ShowMarkers {
+//      get { return showMarkers; }
+//      set {
+//        showMarkers = value;
+//        OnDataRowChanged(this);
+//      }
+//    }          
 
 //    public string Label {
@@ -50 +63 @@
 //    }
 
-    public DrawingStyle Style {
-      get { return style; }
-      set {
-        style = value;
-        OnDataRowChanged(this);
-      }
-    }
-
-    public DataRowType LineType {
-      get { return lineType; }
-      set {
-        lineType = value;
-        OnDataRowChanged(this);
-      }
-    }
+//    public DrawingStyle Style {
+//      get { return style; }
+//      set {
+//        style = value;
+//        OnDataRowChanged(this);
+//      }
+//    }
+//
+//    public DataRowType LineType {
+//      get { return lineType; }
+//      set {
+//        lineType = value;
+//        OnDataRowChanged(this);
+//      }
+//    }
 
     public YAxisDescriptor YAxis {

trunk/sources/HeuristicLab.Visualization/3.2/IDataRow.cs

@@ -11 +11 @@
     //Color Color { get; set; }
     //int Thickness { get; set; }
-    DrawingStyle Style { get; set; }
-    DataRowType LineType { get; set; }
-    bool ShowMarkers { get; set; }
+//    DrawingStyle Style { get; set; }
+//    DataRowType LineType { get; set; }
+//    bool ShowMarkers { get; set; }
     DataRowSettings RowSettings { get; set; }
  

trunk/sources/HeuristicLab.Visualization/3.2/Options/DataRowSettings.cs

@@ -4 +4 @@
   public class DataRowSettings {
     public event UpdateDataRowSettingsHandler OnUpdateDataRowSettings;
+    public event DataVisualSettingChangedHandler DataVisualSettingChanged;
 
     private string label;
@@ -36 +37 @@
     }
 
-//    public bool ShowMarkers {
-//      get { return showMarkers; }
-//      set {
-//        showMarkers = value;
-//        //OnDataRowChanged(this);
-//      }
-//    }
-
     public string Label {
       get { return label; }
       set {
         label = value;
-        //OnDataRowChanged(this);
+        OnDataVisualSettingChanged(this);
       }
     }
-
+    
     public Color Color {
       get { return color; }
       set {
         color = value;
-        //OnDataRowChanged(this);
+        OnDataVisualSettingChanged(this);
       }
     }
@@ -64 +57 @@
       set {
         thickness = value;
-        //OnDataRowChanged(this);
+        OnDataVisualSettingChanged(this);
       }
     }
 
-//    public DrawingStyle Style {
-//      get { return style; }
-//      set {
-//        style = value;
-//        //OnDataRowChanged(this);
-//      }
-//    }
-//
-//    public DataRowType LineType {
-//      get { return lineType; }
-//      set {
-//        lineType = value;
-//        //OnDataRowChanged(this);
-//      }
-//    }
+    public DrawingStyle Style {
+      get { return style; }
+      set {
+        style = value;
+        OnDataVisualSettingChanged(this);
+      }
+    }
+
+    public DataRowType LineType {
+      get { return lineType; }
+      set {
+        lineType = value;
+        OnDataVisualSettingChanged(this);
+      }
+    }
+
+    public bool ShowMarkers {
+      get { return showMarkers; }
+      set {
+        showMarkers = value;
+        OnDataVisualSettingChanged(this);
+      }
+    }
+    
+    protected void OnDataVisualSettingChanged(DataRowSettings row) {
+      if (DataVisualSettingChanged != null) {
+        DataVisualSettingChanged(this);
+      }
+    }
+
   }
   public delegate void UpdateDataRowSettingsHandler();
+  public delegate void DataVisualSettingChangedHandler(DataRowSettings row);
 }

trunk/sources/HeuristicLab.Visualization/3.2/Options/Options.cs

@@ -29 +29 @@
         Color = row.RowSettings.Color;
         Thickness = row.RowSettings.Thickness;
-        Style = row.Style;
+        Style = row.RowSettings.Style;
         this.row = row;
-        this.ShowMarkers = row.ShowMarkers;
+        this.ShowMarkers = row.RowSettings.ShowMarkers;
       }
 
@@ -38 +38 @@
         row.RowSettings.Color = Color;
         row.RowSettings.Thickness = Thickness;
-        row.Style = Style;
-        row.ShowMarkers = this.ShowMarkers;
+        row.RowSettings.Style = Style;
+        row.RowSettings.ShowMarkers = this.ShowMarkers;
       }
     }
@@ -170 +170 @@
         LineThicknessCB.DataSource = GetThicknesses();
         LinestyleCB.DataSource = GetStyles();
-        LinestyleCB.SelectedItem = model.Rows[0].Style;
+        LinestyleCB.SelectedItem = model.Rows[0].RowSettings.Style;
         LineThicknessCB.SelectedItem = model.Rows[0].RowSettings.Thickness;
-        MarkercheckBox.Checked = model.Rows[0].ShowMarkers;
+        MarkercheckBox.Checked = model.Rows[0].RowSettings.ShowMarkers;
 
         LineSelectCB.DataSource = model.Rows;
@@ -216 +216 @@
           LinestyleCB.SelectedIndex = index;  */
         LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Thickness;
-        LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).Style;
+        LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Style;
         selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Color;
-        MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedValue).ShowMarkers;
+        MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.ShowMarkers;
       }
     }
@@ -229 +229 @@
     private void LinestyleCB_SelectedIndexChanged(object sender, EventArgs e) {
       if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).Style = (DrawingStyle)LinestyleCB.SelectedItem;
+        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Style = (DrawingStyle)LinestyleCB.SelectedItem;
       }
     }
@@ -241 +241 @@
     private void MarkercheckBox_CheckedChanged(object sender, EventArgs e) {
       if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).ShowMarkers = MarkercheckBox.Checked;
+        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.ShowMarkers = MarkercheckBox.Checked;
       }
     }