Changeset 1237 for trunk/sources/HeuristicLab.Visualization

Timestamp:

03/02/09 17:12:35 (16 years ago)

Author:

dwagner

Message:

Use DataRowChanged event instead of ApplyChangesToRow Method.
Moved OptionsDialog files to Options subfolder. (#497)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• LineChart.cs (modified) (4 diffs)
• Options (modified) (1 prop)
• Options/OptionsDialog.Designer.cs (modified) (10 diffs)
• Options/OptionsDialog.cs (modified) (2 diffs)
• OptionsDialog.Designer.cs (deleted)
• OptionsDialog.cs (deleted)
• OptionsDialog.resx (deleted)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -152 +152 @@
       row.ValueChanged += OnRowValueChanged;
       row.ValuesChanged += OnRowValuesChanged;
+      row.DataRowChanged += OnDataRowChanged;
+
       if (row.Count > maxDataRowCount) {
         maxDataRowCount = row.Count;
@@ -225 +227 @@
       row.ValueChanged -= OnRowValueChanged;
       row.ValuesChanged -= OnRowValuesChanged;
+      row.DataRowChanged -= OnDataRowChanged;
     }
 
@@ -328 +331 @@
     private void canvasUI1_MouseDown(object sender, MouseEventArgs e) {
       Focus();
-      if (e.Button == System.Windows.Forms.MouseButtons.Right) {
-        if (this.ParentForm != null)
-          this.contextMenuStrip1.Show(e.Location.X + this.ParentForm.Location.X,
-                                      e.Location.Y + this.ParentForm.Location.Y + 50);
-        else {
-          this.contextMenuStrip1.Show(e.Location.X, e.Location.Y);
-        }
+      if (e.Button == MouseButtons.Right) {
+     
+          this.contextMenuStrip1.Show(PointToScreen(e.Location));
+     
       }
       else {
@@ -416 +416 @@
     }
 
-    public void ApplyChangesToRow(IDataRow row) {
+    public void OnDataRowChanged(IDataRow row) {
       foreach (LineShape ls in rowToLineShapes[row]) {
         ls.LSColor = row.Color;

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

@@ -37 +37 @@
       this.label3 = new System.Windows.Forms.Label();
       this.tabPage2 = new System.Windows.Forms.TabPage();
+      this.labelposition = new System.Windows.Forms.Label();
       this.cbLabelPosition = new System.Windows.Forms.ComboBox();
       this.OptionsDialogCancelButton = new System.Windows.Forms.Button();
       this.OptionsDialogOkButton = new System.Windows.Forms.Button();
-      this.labelposition = new System.Windows.Forms.Label();
+      this.OptionsDialogApplyBtn = new System.Windows.Forms.Button();
       this.Optionstabs.SuspendLayout();
       this.tabPage1.SuspendLayout();
@@ -82 +83 @@
       this.OptionsDialogSelectColorBt.Text = "Select";
       this.OptionsDialogSelectColorBt.UseVisualStyleBackColor = true;
-      this.OptionsDialogSelectColorBt.Click += new System.EventHandler(this.button1_Click);
+      this.OptionsDialogSelectColorBt.Click += new System.EventHandler(this.OptionsDialogSelectColorBtn_Click);
       // 
       // ColorPreviewTB
@@ -103 +104 @@
       // LinestyleCB
       // 
+      this.LinestyleCB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.LinestyleCB.FormattingEnabled = true;
       this.LinestyleCB.Location = new System.Drawing.Point(146, 73);
@@ -120 +122 @@
       // LineSelectCB
       // 
+      this.LineSelectCB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.LineSelectCB.FormattingEnabled = true;
       this.LineSelectCB.Location = new System.Drawing.Point(146, 30);
@@ -150 +153 @@
       // LineThicknessCB
       // 
+      this.LineThicknessCB.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.LineThicknessCB.FormattingEnabled = true;
       this.LineThicknessCB.Location = new System.Drawing.Point(142, 46);
@@ -177 +181 @@
       this.tabPage2.UseVisualStyleBackColor = true;
       // 
+      // labelposition
+      // 
+      this.labelposition.AutoSize = true;
+      this.labelposition.Location = new System.Drawing.Point(8, 38);
+      this.labelposition.Name = "labelposition";
+      this.labelposition.Size = new System.Drawing.Size(72, 13);
+      this.labelposition.TabIndex = 1;
+      this.labelposition.Text = "Labelposition:";
+      // 
       // cbLabelPosition
       // 
+      this.cbLabelPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.cbLabelPosition.FormattingEnabled = true;
       this.cbLabelPosition.Items.AddRange(new object[] {
@@ -202 +216 @@
       // OptionsDialogOkButton
       // 
-      this.OptionsDialogOkButton.Location = new System.Drawing.Point(132, 232);
+      this.OptionsDialogOkButton.Location = new System.Drawing.Point(43, 232);
       this.OptionsDialogOkButton.Name = "OptionsDialogOkButton";
       this.OptionsDialogOkButton.Size = new System.Drawing.Size(75, 23);
@@ -210 +224 @@
       this.OptionsDialogOkButton.Click += new System.EventHandler(this.OptionsDialogOkButton_Click);
       // 
-      // labelposition
-      // 
-      this.labelposition.AutoSize = true;
-      this.labelposition.Location = new System.Drawing.Point(8, 38);
-      this.labelposition.Name = "labelposition";
-      this.labelposition.Size = new System.Drawing.Size(72, 13);
-      this.labelposition.TabIndex = 1;
-      this.labelposition.Text = "Labelposition:";
+      // OptionsDialogApplyBtn
+      // 
+      this.OptionsDialogApplyBtn.Location = new System.Drawing.Point(128, 231);
+      this.OptionsDialogApplyBtn.Name = "OptionsDialogApplyBtn";
+      this.OptionsDialogApplyBtn.Size = new System.Drawing.Size(75, 23);
+      this.OptionsDialogApplyBtn.TabIndex = 3;
+      this.OptionsDialogApplyBtn.Text = "Apply";
+      this.OptionsDialogApplyBtn.UseVisualStyleBackColor = true;
+      this.OptionsDialogApplyBtn.Click += new System.EventHandler(this.OptionsDialogApplyBtn_Click);
       // 
       // OptionsDialog
@@ -224 +239 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(292, 266);
+      this.Controls.Add(this.OptionsDialogApplyBtn);
       this.Controls.Add(this.OptionsDialogOkButton);
       this.Controls.Add(this.OptionsDialogCancelButton);
@@ -262 +278 @@
     private System.Windows.Forms.ComboBox cbLabelPosition;
     private System.Windows.Forms.Label labelposition;
+    private System.Windows.Forms.Button OptionsDialogApplyBtn;
   }
 }

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

@@ -5 +5 @@
 namespace HeuristicLab.Visualization.Options {
   public partial class OptionsDialog : Form {
-    private LineChart lc;
+    private readonly LineChart lc;
 
     public OptionsDialog(LineChart lc) {
@@ -12 +12 @@
     }
 
-    private void button1_Click(object sender, EventArgs e) {
+    private void OptionsDialogSelectColorBtn_Click(object sender, EventArgs e) {
       ColorDialog dlg = new ColorDialog();
       dlg.ShowDialog();
-      this.ColorPreviewTB.BackColor = dlg.Color;
+      ColorPreviewTB.BackColor = dlg.Color;
     }
 
     public IList<int> GetThicknesses() {
-      return new List<int>() {0, 1, 2, 3, 4, 5, 6, 7, 8};
+      return new List<int> {0, 1, 2, 3, 4, 5, 6, 7, 8};
     }
 
     public IList<DrawingStyle> GetStyles() {
-      return new List<DrawingStyle>() {DrawingStyle.Solid, DrawingStyle.Dashed};
+      return new List<DrawingStyle> {DrawingStyle.Solid, DrawingStyle.Dashed};
     }
 
     private void OptionsDialog_Load(object sender, EventArgs e) {
-      this.LineSelectCB.DataSource = lc.GetRows();
-      this.LineSelectCB.DisplayMember = "Label";
+      if (lc.GetRows().Count != 0) {
+        LineSelectCB.DataSource = lc.GetRows();
+        LineSelectCB.DisplayMember = "Label";
 
-      LineThicknessCB.DataSource = GetThicknesses();
-      LinestyleCB.DataSource = GetStyles();
-      LineSelectCB.SelectedIndex = 0;
-      LineSelectCB_SelectedIndexChanged(this, null);
+        LineThicknessCB.DataSource = GetThicknesses();
+        LinestyleCB.DataSource = GetStyles();
+        LineSelectCB.SelectedIndex = 0;
+        LineSelectCB_SelectedIndexChanged(this, null);
+      }
     }
 
     private void LineSelectCB_SelectedIndexChanged(object sender, EventArgs e) {
-      IDataRow datarow = (IDataRow)this.LineSelectCB.SelectedValue;
-
-      int index = this.LineThicknessCB.FindStringExact(datarow.Thickness.ToString());
-      this.LineThicknessCB.SelectedIndex = index;
-      index = this.LinestyleCB.FindStringExact(datarow.Style.ToString());
-      LinestyleCB.SelectedIndex = index;
-      this.ColorPreviewTB.BackColor = datarow.Color;
+      if (LineSelectCB.SelectedValue != null) {
+        int index =
+          LineThicknessCB.FindStringExact(((IDataRow) LineSelectCB.SelectedValue).Thickness.ToString());
+        LineThicknessCB.SelectedIndex = index;
+        index = LinestyleCB.FindStringExact(((IDataRow) LineSelectCB.SelectedValue).Style.ToString());
+        LinestyleCB.SelectedIndex = index;
+        ColorPreviewTB.BackColor = ((IDataRow) LineSelectCB.SelectedValue).Color;
+      }
     }
 
     private void OptionsDialogCancelButton_Click(object sender, EventArgs e) {
-      this.Close();
+      Close();
     }
 
     private void OptionsDialogOkButton_Click(object sender, EventArgs e) {
-      IDataRow datarow = (IDataRow)this.LineSelectCB.SelectedValue;
+      if (LineSelectCB.SelectedValue != null) {
+        ((IDataRow) LineSelectCB.SelectedValue).Thickness = (int) LineThicknessCB.SelectedItem;
+        ((IDataRow) LineSelectCB.SelectedValue).Color = ColorPreviewTB.BackColor;
+        ((IDataRow) LineSelectCB.SelectedValue).Style = (DrawingStyle) LinestyleCB.SelectedItem;
+      }
+      Close();
+    }
 
-      datarow.Thickness = (int)this.LineThicknessCB.SelectedItem;
-      datarow.Color = this.ColorPreviewTB.BackColor;
-      datarow.Style = (DrawingStyle)this.LineThicknessCB.SelectedItem;
-
-      this.lc.ApplyChangesToRow(datarow);
-      this.Close();
+    private void OptionsDialogApplyBtn_Click(object sender, EventArgs e) {
+      if (LineSelectCB.SelectedValue != null) {
+        ((IDataRow) LineSelectCB.SelectedValue).Thickness = (int) LineThicknessCB.SelectedItem;
+        ((IDataRow) LineSelectCB.SelectedValue).Color = ColorPreviewTB.BackColor;
+        ((IDataRow) LineSelectCB.SelectedValue).Style = (DrawingStyle) LinestyleCB.SelectedItem;
+      }
     }
   }