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

Timestamp:

05/29/09 17:23:18 (15 years ago)

Author:

cbahner

Message:

#636 first impl. of drawingStyle (DataRowSettings)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• ChartDataRowsModel.cs (modified) (2 diffs)
• ChartDataRowsModelDummy.cs (modified) (1 diff)
• DataExport/CSVDataExport.cs (modified) (1 diff)
• DataRow.cs (modified) (3 diffs)
• DataRowBase.cs (modified) (2 diffs)
• HeuristicLab.Visualization-3.2.csproj (modified) (2 diffs)
• IDataRow.cs (modified) (2 diffs)
• LineChart.cs (modified) (7 diffs)
• Options/DataRowSettings.cs (added)
• Options/Options.cs (modified) (6 diffs)

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

@@ -121 +121 @@
 
         XmlAttribute idAttr = document.CreateAttribute("label");
-        idAttr.Value = row.Label;
+        idAttr.Value = row.RowSettings.Label;
         columnElement.Attributes.Append(idAttr);
 
@@ -156 +156 @@
           string rowLabel = rowIdAttr.Value;
           DataRow row = new DataRow();
-          row.Label = rowLabel;
+          row.RowSettings.Label = rowLabel;
 
           string[] tokens = dataRow.InnerText.Split(';');

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

@@ -15 +15 @@
       // TODO change to call new DataRow("Datarow 1");
       DataRow row1 = new DataRow();
-      row1.Label = "Datarow 1";
-      row1.Color = Color.Red;
+      row1.RowSettings.Label = "Datarow 1";
+      row1.RowSettings.Color = Color.Red;
       DataRow row2 = new DataRow();
-      row2.Label = "Datarow 2";
-      row2.Color = Color.Blue;
+      row2.RowSettings.Label = "Datarow 2";
+      row2.RowSettings.Color = Color.Blue;
       DataRow row3 = new DataRow();
-      row3.Label = "Datarow 3";
-      row3.Color = Color.DeepPink;
+      row3.RowSettings.Label = "Datarow 3";
+      row3.RowSettings.Color = Color.DeepPink;
 
       AddDataRow(row1);

trunk/sources/HeuristicLab.Visualization/3.2/DataExport/CSVDataExport.cs

@@ -29 +29 @@
         writer.AddString(model.XAxis.Label);
         foreach (IDataRow row in model.Rows)
-          writer.AddString(row.Label);
+          writer.AddString(row.RowSettings.Label);
         writer.NewLine();
 

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

@@ -18 +18 @@
     private readonly List<double> dataRow = new List<double>();
 
-    // TODO implement calculation of min and max values
     private double minValue = double.MaxValue;
     private double maxValue = double.MinValue;
@@ -26 +25 @@
     
     public DataRow(string label) {
-      this.Label = label;
+      this.RowSettings.Label = label;
     }
 
     public DataRow(string label, Color color, int thickness, DrawingStyle style, List<double> dataRow) {
-      this.Label = label;
-      this.Color = color;
-      this.Thickness = thickness;
+      this.RowSettings.Label = label;
+      this.RowSettings.Color = color;
+      this.RowSettings.Thickness = thickness;
       this.Style = style;
       this.dataRow = dataRow;
@@ -39 +38 @@
 
     public DataRow(string label, Color color, int thickness, DrawingStyle style, List<double> dataRow, bool showMarkers) {
-      this.Label = label;
-      this.Color = color;
-      this.Thickness = thickness;
+      this.RowSettings.Label = label;
+      this.RowSettings.Color = color;
+      this.RowSettings.Thickness = thickness;
       this.Style = style;
       this.ShowMarkers = showMarkers;

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

@@ -1 @@
-using System.Drawing;
+using HeuristicLab.Visualization.Options;
 
 namespace HeuristicLab.Visualization {
   public abstract class DataRowBase : IDataRow {
-    private string label = "";
-    private Color color = Color.Black;
-    private int thickness = 2;
+    //private string label = "";
+    //private Color color = Color.Black;
+    //private int thickness = 2;
     private DrawingStyle style = DrawingStyle.Solid;
     private DataRowType lineType = DataRowType.Normal;
     private YAxisDescriptor yAxis;
     private bool showMarkers = true;
+
+    private DataRowSettings rowSettings = new DataRowSettings();
+
+    public DataRowSettings RowSettings {
+      get { return rowSettings; }
+      set { rowSettings = value; }
+    }
 
     public bool ShowMarkers {
@@ -19 +26 @@
     }          
 
-    public string Label {
-      get { return label; }
-      set {
-        label = value;
-        OnDataRowChanged(this);
-      }
-    }
-
-    public Color Color {
-      get { return color; }
-      set {
-        color = value;
-        OnDataRowChanged(this);
-      }
-    }
-
-    public int Thickness {
-      get { return thickness; }
-      set {
-        thickness = value;
-        OnDataRowChanged(this);
-      }
-    }
+//    public string Label {
+//      get { return label; }
+//      set {
+//        label = value;
+//        OnDataRowChanged(this);
+//      }
+//    }
+//
+//    public Color Color {
+//      get { return color; }
+//      set {
+//        color = value;
+//        OnDataRowChanged(this);
+//      }
+//    }
+//
+//    public int Thickness {
+//      get { return thickness; }
+//      set {
+//        thickness = value;
+//        OnDataRowChanged(this);
+//      }
+//    }
 
     public DrawingStyle Style {

trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}</ProjectGuid>
@@ -120 +120 @@
       <DependentUpon>ColorSelection.cs</DependentUpon>
     </Compile>
+    <Compile Include="Options\DataRowSettings.cs" />
     <Compile Include="XAxisDescriptor.cs" />
     <Compile Include="YAxisGrid.cs" />

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

@@ -1 @@
-using System.Drawing;
+using HeuristicLab.Visualization.Options;
 
 namespace HeuristicLab.Visualization {
@@ -8 +8 @@
 
   public interface IDataRow {
-    string Label { get; set; }
-    Color Color { get; set; }
-    int Thickness { get; set; }
+    //string Label { get; set; }
+    //Color Color { get; set; }
+    //int Thickness { get; set; }
     DrawingStyle Style { get; set; }
     DataRowType LineType { get; set; }
     bool ShowMarkers { get; set; }
+    DataRowSettings RowSettings { get; set; }
  
     YAxisDescriptor YAxis { get; set; }

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

@@ -366 +366 @@
       row.DataRowChanged += OnDataRowChanged;
 
-      legendShape.AddLegendItem(new LegendItem(row.Label, row.Color, row.Thickness));
+      legendShape.AddLegendItem(new LegendItem(row.RowSettings.Label, row.RowSettings.Color, row.RowSettings.Thickness));
       legendShape.CreateLegend();
 
@@ -466 +466 @@
       if ((row.LineType == DataRowType.SingleValue)) {
         if (row.Count > 0) {
-          LineShape lineShape = new HorizontalLineShape(0, row[0], double.MaxValue, row[0], row.Color, row.Thickness,
+          LineShape lineShape = new HorizontalLineShape(0, row[0], double.MaxValue, row[0], row.RowSettings.Color, row.RowSettings.Thickness,
                                                         row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
@@ -473 +473 @@
         rowEntry.showMarkers(true);      //no lines, only markers are shown!!
         for (int i = 0; i < row.Count; i++)
-          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i , row[i], 8, row.Color));
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i, row[i], 8, row.RowSettings.Color));
       } else if (row.LineType == DataRowType.Normal) {
         rowEntry.showMarkers(row.ShowMarkers);
         for (int i = 1; i < row.Count; i++) {
-          LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], row.Color, row.Thickness, row.Style);
+          LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], row.RowSettings.Color, row.RowSettings.Thickness, row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
-          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i - 1, row[i - 1], 8, row.Color));
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape(i - 1, row[i - 1], 8, row.RowSettings.Color));
         }
         if (row.Count > 0) {
-          rowEntry.LinesShape.AddMarkerShape(new MarkerShape((row.Count - 1), row[(row.Count - 1)], 8, row.Color));
+          rowEntry.LinesShape.AddMarkerShape(new MarkerShape((row.Count - 1), row[(row.Count - 1)], 8, row.RowSettings.Color));
         }
       }
@@ -501 +501 @@
       if (row.LineType == DataRowType.SingleValue) {
         if (action == Action.Added) {
-          LineShape lineShape = new HorizontalLineShape(0, row[0], double.MaxValue, row[0], row.Color, row.Thickness,
+          LineShape lineShape = new HorizontalLineShape(0, row[0], double.MaxValue, row[0], row.RowSettings.Color, row.RowSettings.Thickness,
                                                         row.Style);
           rowEntry.LinesShape.AddShape(lineShape);
@@ -514 +514 @@
         if (action == Action.Added) {
           if(rowEntry.LinesShape.Count==0)
-            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.Color));
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.RowSettings.Color));
           if (index > 0 && index == rowEntry.LinesShape.Count + 1) {
-            LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.Color, row.Thickness,
+            LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.RowSettings.Color, row.RowSettings.Thickness,
                                                 row.Style);
             rowEntry.LinesShape.AddShape(lineShape);
-            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.Color));
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.RowSettings.Color));
           } else {
             throw new ArgumentException("Adding a value is only possible at the end of a row!");
@@ -549 +549 @@
         if (action == Action.Added) {
           if (rowEntry.LinesShape.Count == 0)
-            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.Color));
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(0, row[0], 8, row.RowSettings.Color));
           if (index > 0 && index == rowEntry.LinesShape.Count + 1) {
-            LineShape lineShape = new LineShape(index-1, row[index-1], index, row[index], row.Color, row.Thickness,
+            LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.RowSettings.Color, row.RowSettings.Thickness,
                                                 row.Style);
             rowEntry.LinesShape.AddShape(lineShape);
-            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.Color));
+            rowEntry.LinesShape.AddMarkerShape(new MarkerShape(index, row[index], 8, row.RowSettings.Color));
           }
         } else if (action == Action.Modified) {
@@ -744 +744 @@
           LineShape lineShape = shape as LineShape;
           if (lineShape != null) {
-            lineShape.LSColor = row.Color;
+            lineShape.LSColor = row.RowSettings.Color;
             lineShape.LSDrawingStyle = row.Style;
-            lineShape.LSThickness = row.Thickness;
+            lineShape.LSThickness = row.RowSettings.Thickness;
           }
         }

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

@@ -26 +26 @@
 
       public LineParams(IDataRow row) {
-        Label = row.Label;
-        Color = row.Color;
-        Thickness = row.Thickness;
+        Label = row.RowSettings.Label;
+        Color = row.RowSettings.Color;
+        Thickness = row.RowSettings.Thickness;
         Style = row.Style;
         this.row = row;
@@ -35 +35 @@
 
       public void applySettings() {
-        row.Label = Label;
-        row.Color = Color;
-        row.Thickness = Thickness;
+        row.RowSettings.Label = Label;
+        row.RowSettings.Color = Color;
+        row.RowSettings.Thickness = Thickness;
         row.Style = Style;
         row.ShowMarkers = this.ShowMarkers;
@@ -171 +171 @@
         LinestyleCB.DataSource = GetStyles();
         LinestyleCB.SelectedItem = model.Rows[0].Style;
-        LineThicknessCB.SelectedItem = model.Rows[0].Thickness;
+        LineThicknessCB.SelectedItem = model.Rows[0].RowSettings.Thickness;
         MarkercheckBox.Checked = model.Rows[0].ShowMarkers;
 
@@ -215 +215 @@
           index = LinestyleCB.FindStringExact(((IDataRow)LineSelectCB.SelectedValue).Style.ToString());
           LinestyleCB.SelectedIndex = index;  */
-        LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).Thickness;
+        LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Thickness;
         LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).Style;
-        selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedValue).Color;
+        selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Color;
         MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedValue).ShowMarkers;
       }
@@ -235 +235 @@
     private void LineThicknessCB_SelectedIndexChanged(object sender, EventArgs e) {
       if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).Thickness = (int)LineThicknessCB.SelectedItem;
+        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Thickness = (int)LineThicknessCB.SelectedItem;
       }
     }
@@ -255 +255 @@
 
     private void selectedLineColorSelection_ColorChanged(ColorSelection sender) {
-      ((IDataRow)LineSelectCB.SelectedValue).Color = selectedLineColorSelection.Color;
+      ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Color = selectedLineColorSelection.Color;
     }