Changeset 1345 for trunk

Timestamp:

03/13/09 19:28:05 (15 years ago)

Author:

shofstad

Message:

Legend implementation updated with position setting (#407)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• LineChart.cs (modified) (2 diffs)
• Options/OptionsDialog.Designer.cs (modified) (1 diff)
• Options/OptionsDialog.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -72 +72 @@
       xAxis.Color = viewSettings.XAxisColor;
 
-      switch (viewSettings.LegendPosition) {
-          case LegendPosition.Bottom:
-            setLegendBottom();
-            break;
-
-          case LegendPosition.Top:
-            setLegendTop();
-            break;
-
-          case LegendPosition.Left:
-            setLegendLeft();
-            break;
-
-          case LegendPosition.Right:
-            setLegendRight();
-            break;
-      }
+      SetLegendPosition();
 
       canvasUI.Invalidate();
@@ -155 +139 @@
                                          linesAreaBoundingBox.Y1);
 
-      setLegendBottom();
+      SetLegendPosition();
+    }
+
+    private void SetLegendPosition() {
+      switch (viewSettings.LegendPosition) {
+        case LegendPosition.Bottom:
+          setLegendBottom();
+          break;
+
+        case LegendPosition.Top:
+          setLegendTop();
+          break;
+
+        case LegendPosition.Left:
+          setLegendLeft();
+          break;
+
+        case LegendPosition.Right:
+          setLegendRight();
+          break;
+      }
     }
 

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

@@ -149 +149 @@
       this.cbLegendPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.cbLegendPosition.FormattingEnabled = true;
-      this.cbLegendPosition.Items.AddRange(new object[] {
-            "left",
-            "right",
-            "top",
-            "bottom"});
       this.cbLegendPosition.Location = new System.Drawing.Point(96, 35);
       this.cbLegendPosition.Name = "cbLegendPosition";

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

@@ -14 +14 @@
       this.model = model;
       viewSettings = model.ViewSettings;
+
+      cbLegendPosition.Items.Add(LegendPosition.Top);
+      cbLegendPosition.Items.Add(LegendPosition.Bottom);
+      cbLegendPosition.Items.Add(LegendPosition.Left);
+      cbLegendPosition.Items.Add(LegendPosition.Right);
+
+      cbLegendPosition.SelectedItem = viewSettings.LegendPosition;
     }
 
@@ -91 +98 @@
 
     private void cbLegendPosition_SelectedIndexChanged(object sender, EventArgs e) {
-      string pos = cbLegendPosition.SelectedItem.ToString();
-      if (pos.Equals("left")) {
-        viewSettings.LegendPosition = LegendPosition.Left;
-      } else if (pos.Equals("right")) {
-        viewSettings.LegendPosition = LegendPosition.Right;
-      } else if (pos.Equals("bottom")) {
-        viewSettings.LegendPosition = LegendPosition.Bottom;
-      } else {
-        viewSettings.LegendPosition = LegendPosition.Top;
-      }
-      
+      viewSettings.LegendPosition = (LegendPosition)cbLegendPosition.SelectedItem;
       viewSettings.UpdateView();
     }