Changeset 2040 for trunk/sources

Timestamp:

06/10/09 17:14:04 (15 years ago)

Author:

dwagner

Message:

dw: Added new dialog for adding lines using the options dialog. (#478)

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• AvgAggregator.cs (modified) (2 diffs)
• AvgLineAggregator.cs (modified) (1 diff)
• DataRow.cs (modified) (1 diff)
• DataRowBase.cs (modified) (1 diff)
• FloatingAvgAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization-3.2.csproj (modified) (2 diffs)
• IDataRow.cs (modified) (2 diffs)
• MaxAggregator.cs (modified) (2 diffs)
• MinAggregator.cs (modified) (2 diffs)
• Options/AddLineDialog.Designer.cs (added)
• Options/AddLineDialog.cs (added)
• Options/AddLineDialog.resx (added)
• Options/Options.Designer.cs (modified) (13 diffs)
• Options/Options.cs (modified) (10 diffs)

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Visualization {
-  public class AvgAggregator : DataRowBase {
+  public interface IAggregator {
+    void AddWatch(IDataRow dataRow);
+    void RemoveWatch(IDataRow dataRow);
+  }
+
+  public class AvgAggregator : DataRowBase, IAggregator {
     #region IAggregator Members
 
@@ -58 +63 @@
       curAvgValue = 0;
       count = 0;
+      this.RowSettings.LineType = DataRowType.SingleValue;
     }
 

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Visualization {
-  public class AvgLineAggregator : DataRowBase {
+  public class AvgLineAggregator : DataRowBase, IAggregator {
 
     private readonly List<double> dataRow = new List<double>();

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

@@ -224 +224 @@
       }
     }
-
-    public override string ToString() {
-      return RowSettings.Label;
-    }
   }
 }

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

@@ -17 +17 @@
     }
 
+    public string Label{
+      get { return rowSettings.Label; }
+    }
+
     protected DataRowBase() {
       rowSettings = new DataRowSettings();
+      rowSettings.LineType = DataRowType.Normal; //default value for most lines and aggregators
       rowSettings.DataVisualSettingChanged += value_DataVisualSettingChanged;
     }

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Visualization {
-  public class FloatingAvgAggregator : DataRowBase {
+  public class FloatingAvgAggregator : DataRowBase, IAggregator {
 
     private readonly List<double> dataRow = new List<double>();

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

@@ -116 +116 @@
     <Compile Include="LabelProvider\ContinuousLabelProvider.cs" />
     <Compile Include="LabelProvider\DiscreteLabelProvider.cs" />
+    <Compile Include="Options\AddLineDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Options\AddLineDialog.Designer.cs">
+      <DependentUpon>AddLineDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Options\ColorSelection.cs">
       <SubType>UserControl</SubType>
@@ -205 +211 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Options\AddLineDialog.resx">
+      <DependentUpon>AddLineDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Options\ColorSelection.resx">
       <DependentUpon>ColorSelection.cs</DependentUpon>

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

@@ -23 +23 @@
     void RemoveValue(int index);
     void RemoveValues(int index, int count);
-
+    
     int Count { get; }
     double this[int index] { get; set; }
@@ -30 +30 @@
     double MaxValue { get; }
 
+    string Label{ get;}
+
     event ValuesChangedHandler ValuesChanged;
     event ValueChangedHandler ValueChanged;

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Visualization {
-  public class MaxAggregator : DataRowBase {
+  public class MaxAggregator : DataRowBase, IAggregator {
     #region IAggregator Members
 
@@ -23 +23 @@
 
     #endregion
+
+    public MaxAggregator() {
+      this.RowSettings.LineType = DataRowType.SingleValue;
+    }
+
 
     List<IDataRow> dataRowWatches = new List<IDataRow>();

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Visualization {
-  public class MinAggregator : DataRowBase {
+  public class MinAggregator : DataRowBase, IAggregator {
     #region IAggregator Members
 
@@ -23 +23 @@
 
     #endregion
+
+    public MinAggregator() {
+      this.RowSettings.LineType=DataRowType.SingleValue;
+    }
 
     readonly List<IDataRow> dataRowWatches = new List<IDataRow>();

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

@@ -26 +26 @@
       this.Optionstabs = new System.Windows.Forms.TabControl();
       this.tabPage1 = new System.Windows.Forms.TabPage();
+      this.btnAddLine = new System.Windows.Forms.Button();
       this.label2 = new System.Windows.Forms.Label();
       this.LinestyleCB = new System.Windows.Forms.ComboBox();
@@ -31 +32 @@
       this.LineSelectCB = new System.Windows.Forms.ComboBox();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.selectedLineColorSelection = new HeuristicLab.Visualization.Options.ColorSelection();
       this.MarkercheckBox = new System.Windows.Forms.CheckBox();
       this.label4 = new System.Windows.Forms.Label();
@@ -44 +46 @@
       this.btnChangeTitleFont = new System.Windows.Forms.Button();
       this.tpXAxis = new System.Windows.Forms.TabPage();
+      this.groupBox2 = new System.Windows.Forms.GroupBox();
+      this.label6 = new System.Windows.Forms.Label();
+      this.xAxisGridColorSelection = new HeuristicLab.Visualization.Options.ColorSelection();
       this.chkShowXAxisGrid = new System.Windows.Forms.CheckBox();
       this.btnChangeXAxisFont = new System.Windows.Forms.Button();
@@ -52 +57 @@
       this.flpShowYAxis = new System.Windows.Forms.FlowLayoutPanel();
       this.fdFont = new System.Windows.Forms.FontDialog();
-      this.label6 = new System.Windows.Forms.Label();
-      this.groupBox2 = new System.Windows.Forms.GroupBox();
-      this.selectedLineColorSelection = new HeuristicLab.Visualization.Options.ColorSelection();
-      this.xAxisGridColorSelection = new HeuristicLab.Visualization.Options.ColorSelection();
       this.Optionstabs.SuspendLayout();
       this.tabPage1.SuspendLayout();
@@ -62 +63 @@
       this.tpTitle.SuspendLayout();
       this.tpXAxis.SuspendLayout();
+      this.groupBox2.SuspendLayout();
       this.tpYAxes.SuspendLayout();
       this.gbxYAxisClipChangeable.SuspendLayout();
       this.gbxShowYAxis.SuspendLayout();
-      this.groupBox2.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -84 +85 @@
       // tabPage1
       // 
+      this.tabPage1.Controls.Add(this.btnAddLine);
       this.tabPage1.Controls.Add(this.label2);
       this.tabPage1.Controls.Add(this.LinestyleCB);
@@ -97 +99 @@
       this.tabPage1.UseVisualStyleBackColor = true;
       // 
+      // btnAddLine
+      // 
+      this.btnAddLine.Location = new System.Drawing.Point(192, 177);
+      this.btnAddLine.Name = "btnAddLine";
+      this.btnAddLine.Size = new System.Drawing.Size(75, 23);
+      this.btnAddLine.TabIndex = 10;
+      this.btnAddLine.Text = "Add Line";
+      this.btnAddLine.UseVisualStyleBackColor = true;
+      this.btnAddLine.Click += new System.EventHandler(this.btnAddLine_Click);
+      // 
       // label2
       // 
@@ -144 +156 @@
       this.groupBox1.Location = new System.Drawing.Point(4, 54);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(274, 129);
+      this.groupBox1.Size = new System.Drawing.Size(274, 120);
       this.groupBox1.TabIndex = 9;
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "Details";
       // 
+      // selectedLineColorSelection
+      // 
+      this.selectedLineColorSelection.Color = System.Drawing.SystemColors.Control;
+      this.selectedLineColorSelection.Location = new System.Drawing.Point(142, 73);
+      this.selectedLineColorSelection.Name = "selectedLineColorSelection";
+      this.selectedLineColorSelection.Size = new System.Drawing.Size(121, 25);
+      this.selectedLineColorSelection.TabIndex = 10;
+      this.selectedLineColorSelection.ColorChanged += new HeuristicLab.Visualization.Options.ColorChangedHandler(this.selectedLineColorSelection_ColorChanged);
+      // 
       // MarkercheckBox
       // 
       this.MarkercheckBox.AutoSize = true;
-      this.MarkercheckBox.Location = new System.Drawing.Point(142, 106);
+      this.MarkercheckBox.Location = new System.Drawing.Point(204, 103);
       this.MarkercheckBox.Name = "MarkercheckBox";
       this.MarkercheckBox.Size = new System.Drawing.Size(59, 17);
@@ -280 +301 @@
       this.tpXAxis.UseVisualStyleBackColor = true;
       // 
+      // groupBox2
+      // 
+      this.groupBox2.Controls.Add(this.label6);
+      this.groupBox2.Controls.Add(this.xAxisGridColorSelection);
+      this.groupBox2.Controls.Add(this.chkShowXAxisGrid);
+      this.groupBox2.Location = new System.Drawing.Point(8, 42);
+      this.groupBox2.Name = "groupBox2";
+      this.groupBox2.Size = new System.Drawing.Size(205, 94);
+      this.groupBox2.TabIndex = 6;
+      this.groupBox2.TabStop = false;
+      this.groupBox2.Text = "Grid";
+      // 
+      // label6
+      // 
+      this.label6.AutoSize = true;
+      this.label6.Location = new System.Drawing.Point(20, 55);
+      this.label6.Name = "label6";
+      this.label6.Size = new System.Drawing.Size(31, 13);
+      this.label6.TabIndex = 5;
+      this.label6.Text = "Color";
+      // 
+      // xAxisGridColorSelection
+      // 
+      this.xAxisGridColorSelection.Color = System.Drawing.SystemColors.Control;
+      this.xAxisGridColorSelection.Location = new System.Drawing.Point(54, 49);
+      this.xAxisGridColorSelection.Name = "xAxisGridColorSelection";
+      this.xAxisGridColorSelection.Size = new System.Drawing.Size(126, 25);
+      this.xAxisGridColorSelection.TabIndex = 4;
+      this.xAxisGridColorSelection.ColorChanged += new HeuristicLab.Visualization.Options.ColorChangedHandler(this.xAxisGridColorSelection_ColorChanged);
+      // 
       // chkShowXAxisGrid
       // 
@@ -355 +406 @@
       this.flpShowYAxis.Size = new System.Drawing.Size(275, 57);
       this.flpShowYAxis.TabIndex = 0;
-      // 
-      // label6
-      // 
-      this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(20, 55);
-      this.label6.Name = "label6";
-      this.label6.Size = new System.Drawing.Size(31, 13);
-      this.label6.TabIndex = 5;
-      this.label6.Text = "Color";
-      // 
-      // groupBox2
-      // 
-      this.groupBox2.Controls.Add(this.label6);
-      this.groupBox2.Controls.Add(this.xAxisGridColorSelection);
-      this.groupBox2.Controls.Add(this.chkShowXAxisGrid);
-      this.groupBox2.Location = new System.Drawing.Point(8, 42);
-      this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(205, 94);
-      this.groupBox2.TabIndex = 6;
-      this.groupBox2.TabStop = false;
-      this.groupBox2.Text = "Grid";
-      // 
-      // selectedLineColorSelection
-      // 
-      this.selectedLineColorSelection.Color = System.Drawing.SystemColors.Control;
-      this.selectedLineColorSelection.Location = new System.Drawing.Point(142, 73);
-      this.selectedLineColorSelection.Name = "selectedLineColorSelection";
-      this.selectedLineColorSelection.Size = new System.Drawing.Size(121, 25);
-      this.selectedLineColorSelection.TabIndex = 10;
-      this.selectedLineColorSelection.ColorChanged += new HeuristicLab.Visualization.Options.ColorChangedHandler(this.selectedLineColorSelection_ColorChanged);
-      // 
-      // xAxisGridColorSelection
-      // 
-      this.xAxisGridColorSelection.Color = System.Drawing.SystemColors.Control;
-      this.xAxisGridColorSelection.Location = new System.Drawing.Point(54, 49);
-      this.xAxisGridColorSelection.Name = "xAxisGridColorSelection";
-      this.xAxisGridColorSelection.Size = new System.Drawing.Size(126, 25);
-      this.xAxisGridColorSelection.TabIndex = 4;
-      this.xAxisGridColorSelection.ColorChanged += new HeuristicLab.Visualization.Options.ColorChangedHandler(this.xAxisGridColorSelection_ColorChanged);
       // 
       // Options
@@ -413 +425 @@
       this.tpTitle.PerformLayout();
       this.tpXAxis.ResumeLayout(false);
+      this.groupBox2.ResumeLayout(false);
+      this.groupBox2.PerformLayout();
       this.tpYAxes.ResumeLayout(false);
       this.tpYAxes.PerformLayout();
@@ -419 +433 @@
       this.gbxShowYAxis.ResumeLayout(false);
       this.gbxShowYAxis.PerformLayout();
-      this.groupBox2.ResumeLayout(false);
-      this.groupBox2.PerformLayout();
       this.ResumeLayout(false);
 
@@ -459 +471 @@
     private System.Windows.Forms.Label label6;
     private ColorSelection xAxisGridColorSelection;
+    private System.Windows.Forms.Button btnAddLine;
+    private AddLineDialog addLineDialog;
   }
 }

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

@@ -10 +10 @@
     private ViewSettings viewSettings;
     private ViewSettings oldViewSettings;
-    private LineParams[] oldLineParams;
+    private List<LineParams> oldLineParams;
     private string oldTitle;
     private Dictionary<CheckBox, bool> ShowYAxisBoxes;
@@ -154 +154 @@
 
     private void Options_Load(object sender, EventArgs e) {
+      model.DataRowAdded += model_DataRowAdded;
       oldShowXAxisGrid = model.XAxis.ShowGrid;
       chkShowXAxisGrid.Checked = model.XAxis.ShowGrid;
@@ -165 +166 @@
       InitTabPageLines();
       InitTabPageYAxes();
+    }
+
+    void model_DataRowAdded(IDataRow row)
+    {
+      LineSelectCB.Items.Add(row);
+      oldLineParams.Add(new LineParams(row));
     }
 
@@ -170 +177 @@
       if (model.Rows.Count != 0) {
         int index = 0;
-        oldLineParams = new LineParams[model.Rows.Count];
+        oldLineParams = new List<LineParams>();
         foreach (var row in model.Rows) {
-          oldLineParams[index++] = new LineParams(row);
+          oldLineParams.Add(new LineParams(row));
+          LineSelectCB.Items.Add(row);
         }
         LineThicknessCB.DataSource = GetThicknesses();
@@ -180 +188 @@
         MarkercheckBox.Checked = model.Rows[0].RowSettings.ShowMarkers;
 
-        LineSelectCB.DataSource = model.Rows;
+      // LineSelectCB.DataSource = model.Rows;
+        LineSelectCB.DisplayMember = "RowSettings.Label";
+
 
         LineSelectCB.SelectedIndex = 0;
@@ -213 +223 @@
 
     private void LineSelectCB_SelectedIndexChanged(object sender, EventArgs e) {
-      if (LineSelectCB.SelectedValue != null) {
+      if (LineSelectCB.SelectedItem != null) {
         /*  int index =
             LineThicknessCB.FindStringExact(((IDataRow)LineSelectCB.SelectedValue).Thickness.ToString());
@@ -219 +229 @@
           index = LinestyleCB.FindStringExact(((IDataRow)LineSelectCB.SelectedValue).Style.ToString());
           LinestyleCB.SelectedIndex = index;  */
-        LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Thickness;
-        LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Style;
-        selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Color;
-        MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedValue).RowSettings.ShowMarkers;
+        LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Thickness;
+        LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Style;
+        selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Color;
+        MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedItem).RowSettings.ShowMarkers;
       }
     }
@@ -232 +242 @@
 
     private void LinestyleCB_SelectedIndexChanged(object sender, EventArgs e) {
-      if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Style = (DrawingStyle)LinestyleCB.SelectedItem;
+      if (LineSelectCB.SelectedItem != null) {
+        ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Style = (DrawingStyle)LinestyleCB.SelectedItem;
       }
     }
 
     private void LineThicknessCB_SelectedIndexChanged(object sender, EventArgs e) {
-      if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Thickness = (int)LineThicknessCB.SelectedItem;
+      if (LineSelectCB.SelectedItem != null) {
+        ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Thickness = (int)LineThicknessCB.SelectedItem;
       }
     }
 
     private void MarkercheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (LineSelectCB.SelectedValue != null) {
-        ((IDataRow)LineSelectCB.SelectedValue).RowSettings.ShowMarkers = MarkercheckBox.Checked;
+      if (LineSelectCB.SelectedItem != null) {
+        ((IDataRow)LineSelectCB.SelectedItem).RowSettings.ShowMarkers = MarkercheckBox.Checked;
       }
     }
@@ -259 +269 @@
 
     private void selectedLineColorSelection_ColorChanged(ColorSelection sender) {
-      ((IDataRow)LineSelectCB.SelectedValue).RowSettings.Color = selectedLineColorSelection.Color;
+      if(LineSelectCB.SelectedItem!=null)
+      ((IDataRow)LineSelectCB.SelectedItem).RowSettings.Color = selectedLineColorSelection.Color;
     }
 
@@ -265 +276 @@
       model.XAxis.GridColor = xAxisGridColorSelection.Color;
     }
+
+    private void btnAddLine_Click(object sender, EventArgs e) {
+      addLineDialog = new AddLineDialog(model);
+      addLineDialog.Show();
+    }
   }
 }