Changeset 1885

Timestamp:

05/23/09 11:08:42 (16 years ago)

Author:

mstoeger

Message:

xaxis grid color can be set in the options dialog #555

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Visualization/3.2/LineChart.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/Options/ColorSelection.Designer.cs (added)
• HeuristicLab.Visualization/3.2/Options/ColorSelection.cs (added)
• HeuristicLab.Visualization/3.2/Options/ColorSelection.resx (added)
• HeuristicLab.Visualization/3.2/Options/Options.Designer.cs (modified) (14 diffs)
• HeuristicLab.Visualization/3.2/Options/Options.cs (modified) (6 diffs)
• HeuristicLab.Visualization/3.2/XAxisDescriptor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs

@@ -79 +79 @@
       IDataRow row3 = new DataRow();
 
+      model.XAxis.Label = "X Axis";
+      model.XAxis.ShowLabel = true;
+      model.XAxis.ShowGrid = true;
+      model.XAxis.GridColor = Color.Blue;
+
       YAxisDescriptor yaxis1 = model.DefaultYAxis;
       YAxisDescriptor yaxis2 = new YAxisDescriptor();
-
-      model.XAxis.Label = "X Axis";
-      model.XAxis.ShowLabel = true;
 
       yaxis1.Label = "Y-Axis 1";
@@ -130 +132 @@
       };
 
-      f.ShowDialog();
-    }
-
-    [Test]
-    public void TestGridX() {
-      LineChartTestForm f = new LineChartTestForm(model);
-      IDataRow row1 = new DataRow();
-      model.AddDataRow(row1);
-
-      model.XAxis.ShowGrid = false;
-
-      Random rand = new Random(42);
-      for (int i = 0; i < 10; i++) {
-        row1.AddValue(rand.NextDouble() * 10);
-      }
       f.ShowDialog();
     }

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

@@ -115 +115 @@
     <Compile Include="LabelProvider\ContinuousLabelProvider.cs" />
     <Compile Include="LabelProvider\DiscreteLabelProvider.cs" />
+    <Compile Include="Options\ColorSelection.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Options\ColorSelection.Designer.cs">
+      <DependentUpon>ColorSelection.cs</DependentUpon>
+    </Compile>
     <Compile Include="XAxisDescriptor.cs" />
     <Compile Include="YAxisGrid.cs" />
@@ -197 +203 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Options\ColorSelection.resx">
+      <DependentUpon>ColorSelection.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Options\Options.resx">
       <DependentUpon>Options.cs</DependentUpon>

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

@@ -101 +101 @@
 
       if (model.XAxis.ShowGrid) {
+        xAxisGrid.Color = model.XAxis.GridColor;
         canvas.AddShape(xAxisGrid);
       }

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.OptionsDialogSelectColorBtn = new System.Windows.Forms.Button();
-      this.ColorPreviewTB = new System.Windows.Forms.TextBox();
       this.label2 = new System.Windows.Forms.Label();
       this.LinestyleCB = new System.Windows.Forms.ComboBox();
@@ -46 +44 @@
       this.btnChangeTitleFont = new System.Windows.Forms.Button();
       this.tpXAxis = new System.Windows.Forms.TabPage();
+      this.chkShowXAxisGrid = new System.Windows.Forms.CheckBox();
       this.btnChangeXAxisFont = new System.Windows.Forms.Button();
       this.tpYAxes = new System.Windows.Forms.TabPage();
@@ -53 +52 @@
       this.flpShowYAxis = new System.Windows.Forms.FlowLayoutPanel();
       this.fdFont = new System.Windows.Forms.FontDialog();
-      this.chkShowXAxisGrid = new System.Windows.Forms.CheckBox();
+      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();
@@ -63 +65 @@
       this.gbxYAxisClipChangeable.SuspendLayout();
       this.gbxShowYAxis.SuspendLayout();
+      this.groupBox2.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -81 +84 @@
       // tabPage1
       // 
-      this.tabPage1.Controls.Add(this.OptionsDialogSelectColorBtn);
-      this.tabPage1.Controls.Add(this.ColorPreviewTB);
       this.tabPage1.Controls.Add(this.label2);
       this.tabPage1.Controls.Add(this.LinestyleCB);
@@ -96 +97 @@
       this.tabPage1.UseVisualStyleBackColor = true;
       // 
-      // OptionsDialogSelectColorBtn
-      // 
-      this.OptionsDialogSelectColorBtn.Location = new System.Drawing.Point(217, 126);
-      this.OptionsDialogSelectColorBtn.Name = "OptionsDialogSelectColorBtn";
-      this.OptionsDialogSelectColorBtn.Size = new System.Drawing.Size(50, 23);
-      this.OptionsDialogSelectColorBtn.TabIndex = 7;
-      this.OptionsDialogSelectColorBtn.Text = "Select";
-      this.OptionsDialogSelectColorBtn.UseVisualStyleBackColor = true;
-      this.OptionsDialogSelectColorBtn.Click += new System.EventHandler(this.OptionsDialogSelectColorBtn_Click);
-      // 
-      // ColorPreviewTB
-      // 
-      this.ColorPreviewTB.Location = new System.Drawing.Point(146, 127);
-      this.ColorPreviewTB.Name = "ColorPreviewTB";
-      this.ColorPreviewTB.ReadOnly = true;
-      this.ColorPreviewTB.Size = new System.Drawing.Size(64, 20);
-      this.ColorPreviewTB.TabIndex = 6;
-      // 
       // label2
       // 
@@ -154 +137 @@
       // groupBox1
       // 
+      this.groupBox1.Controls.Add(this.selectedLineColorSelection);
       this.groupBox1.Controls.Add(this.MarkercheckBox);
       this.groupBox1.Controls.Add(this.label4);
@@ -287 +271 @@
       // tpXAxis
       // 
-      this.tpXAxis.Controls.Add(this.chkShowXAxisGrid);
+      this.tpXAxis.Controls.Add(this.groupBox2);
       this.tpXAxis.Controls.Add(this.btnChangeXAxisFont);
       this.tpXAxis.Location = new System.Drawing.Point(4, 22);
@@ -295 +279 @@
       this.tpXAxis.Text = "X-Axis";
       this.tpXAxis.UseVisualStyleBackColor = true;
+      // 
+      // chkShowXAxisGrid
+      // 
+      this.chkShowXAxisGrid.AutoSize = true;
+      this.chkShowXAxisGrid.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.chkShowXAxisGrid.Location = new System.Drawing.Point(20, 28);
+      this.chkShowXAxisGrid.Name = "chkShowXAxisGrid";
+      this.chkShowXAxisGrid.Size = new System.Drawing.Size(56, 17);
+      this.chkShowXAxisGrid.TabIndex = 3;
+      this.chkShowXAxisGrid.Text = "Visible";
+      this.chkShowXAxisGrid.UseVisualStyleBackColor = true;
+      this.chkShowXAxisGrid.CheckedChanged += new System.EventHandler(this.chkShowXAxisGrid_CheckedChanged);
       // 
       // btnChangeXAxisFont
@@ -360 +356 @@
       this.flpShowYAxis.TabIndex = 0;
       // 
-      // chkShowXAxisGrid
-      // 
-      this.chkShowXAxisGrid.AutoSize = true;
-      this.chkShowXAxisGrid.Location = new System.Drawing.Point(3, 32);
-      this.chkShowXAxisGrid.Name = "chkShowXAxisGrid";
-      this.chkShowXAxisGrid.Size = new System.Drawing.Size(107, 17);
-      this.chkShowXAxisGrid.TabIndex = 3;
-      this.chkShowXAxisGrid.Text = "Show X-Axis Grid";
-      this.chkShowXAxisGrid.UseVisualStyleBackColor = true;
-      this.chkShowXAxisGrid.CheckedChanged += new System.EventHandler(this.chkShowXAxisGrid_CheckedChanged);
+      // 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
@@ -389 +413 @@
       this.tpTitle.PerformLayout();
       this.tpXAxis.ResumeLayout(false);
-      this.tpXAxis.PerformLayout();
       this.tpYAxes.ResumeLayout(false);
       this.tpYAxes.PerformLayout();
@@ -396 +419 @@
       this.gbxShowYAxis.ResumeLayout(false);
       this.gbxShowYAxis.PerformLayout();
+      this.groupBox2.ResumeLayout(false);
+      this.groupBox2.PerformLayout();
       this.ResumeLayout(false);
 
@@ -404 +429 @@
     private System.Windows.Forms.TabControl Optionstabs;
     private System.Windows.Forms.TabPage tabPage1;
-    private System.Windows.Forms.Button OptionsDialogSelectColorBtn;
-    private System.Windows.Forms.TextBox ColorPreviewTB;
     private System.Windows.Forms.Label label2;
     private System.Windows.Forms.ComboBox LinestyleCB;
@@ -432 +455 @@
     private System.Windows.Forms.TextBox tbxTitle;
     private System.Windows.Forms.Label label5;
+    private ColorSelection selectedLineColorSelection;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private System.Windows.Forms.Label label6;
+    private ColorSelection xAxisGridColorSelection;
   }
 }

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

@@ -14 +14 @@
     private Dictionary<CheckBox, bool> ShowYAxisBoxes;
     private bool oldShowXAxisGrid;
+    private Color oldXAxisGridColor;
     private Dictionary<CheckBox, bool> yAxisClipChangeableBoxes;
 
@@ -67 +68 @@
     public void ResetSettings() {
       model.XAxis.ShowGrid = oldShowXAxisGrid;
+      chkShowXAxisGrid.Checked = oldShowXAxisGrid;
+      
+      model.XAxis.GridColor = oldXAxisGridColor;
+      xAxisGridColorSelection.Color = oldXAxisGridColor;
 
       foreach (var param in oldLineParams) {
@@ -95 +100 @@
     }
 
-    private void OptionsDialogSelectColorBtn_Click(object sender, EventArgs e) {
-      ColorDialog dlg = new ColorDialog();
-      dlg.ShowDialog();
-      ColorPreviewTB.BackColor = dlg.Color;
-      ((IDataRow)LineSelectCB.SelectedValue).Color = dlg.Color;
-    }
-
     private static IList<int> GetThicknesses() {
       return new List<int>(new[] {1, 2, 3, 4, 5, 6, 7, 8});
@@ -155 +153 @@
       oldShowXAxisGrid = model.XAxis.ShowGrid;
       chkShowXAxisGrid.Checked = model.XAxis.ShowGrid;
+
+      oldXAxisGridColor = model.XAxis.GridColor;
+      xAxisGridColorSelection.Color = model.XAxis.GridColor;
 
       InitTabPageLines();
@@ -216 +217 @@
         LineThicknessCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).Thickness;
         LinestyleCB.SelectedItem = ((IDataRow)LineSelectCB.SelectedValue).Style;
-        ColorPreviewTB.BackColor = ((IDataRow)LineSelectCB.SelectedValue).Color;
+        selectedLineColorSelection.Color = ((IDataRow)LineSelectCB.SelectedValue).Color;
         MarkercheckBox.Checked = ((IDataRow)LineSelectCB.SelectedValue).ShowMarkers;
       }
@@ -252 +253 @@
       model.ViewSettings.UpdateView();
     }
+
+    private void selectedLineColorSelection_ColorChanged(ColorSelection sender) {
+      ((IDataRow)LineSelectCB.SelectedValue).Color = selectedLineColorSelection.Color;
+    }
+
+    private void xAxisGridColorSelection_ColorChanged(ColorSelection sender) {
+      model.XAxis.GridColor = xAxisGridColorSelection.Color;
+    }
   }
 }

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

@@ +1 @@
+using System.Drawing;
 using HeuristicLab.Visualization.LabelProvider;
 
@@ -8 +9 @@
     private bool showLabel = true;
     private bool showGrid = true;
+    private Color gridColor = Color.LightBlue;
     private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
 
@@ -44 +46 @@
     }
 
+    public Color GridColor {
+      get { return this.gridColor; }
+      set {
+        this.gridColor = value;
+        FireXAxisDescriptorChanged();
+      }
+    }
+
     private void FireXAxisDescriptorChanged() {
       if (XAxisDescriptorChanged != null)