Changeset 6176

Timestamp:

05/10/11 15:25:05 (14 years ago)

Author:

abeham

Message:

#1465

• Removed properties menu from EnhancedChart
• Added IConfigureableView interface to DataTableView

Location:

branches/histogram

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (3 diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs (modified) (4 diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs (modified) (5 diffs)

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -89 +89 @@
       series1.Name = "Default";
       this.chart.Series.Add(series1);
-      this.chart.ShowPropertiesContextMenuItem = true;
       this.chart.Size = new System.Drawing.Size(359, 248);
       this.chart.TabIndex = 3;
@@ -97 +96 @@
       title1.Text = "Title";
       this.chart.Titles.Add(title1);
-      this.chart.PropertiesClicked += new System.EventHandler(this.chart_PropertiesClicked);
       this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -36 +36 @@
   [View("DataTable View")]
   [Content(typeof(DataTable), true)]
-  public partial class DataTableView : NamedItemView {
+  public partial class DataTableView : NamedItemView, IConfigureableView {
     protected List<Series> invisibleSeries;
     protected Dictionary<IObservableList<double>, DataRow> valuesRowsTable;
@@ -144 +144 @@
       base.SetEnabledStateOfControls();
       chart.Enabled = Content != null;
+    }
+
+    public void ShowConfiguration() {
+      if (Content != null) {
+        DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content);
+        dialog.ShowDialog();
+      } else MessageBox.Show("Nothing to configure.");
     }
 
@@ -503 +510 @@
       }
     }
-    private void chart_PropertiesClicked(object sender, EventArgs e) {
-      DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content);
-      dialog.ShowDialog();
-    }
     #endregion
 

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs

@@ -50 +50 @@
       this.copyImageToClipboardBitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-      this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.propertiesToolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
       this.contextMenuStrip.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -60 +58 @@
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exportChartToolStripMenuItem,
-            this.copyImageToClipboardBitmapToolStripMenuItem,
-            this.propertiesToolStripSeparator,
-            this.propertiesToolStripMenuItem});
+            this.copyImageToClipboardBitmapToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
       this.contextMenuStrip.Size = new System.Drawing.Size(257, 76);
-      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
       // 
       // exportChartToolStripMenuItem
@@ -87 +82 @@
       this.saveFileDialog.FilterIndex = 2;
       // 
-      // propertiesToolStripMenuItem
-      // 
-      this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
-      this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-      this.propertiesToolStripMenuItem.Text = "Properties";
-      this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click);
-      // 
-      // propertiesToolStripSeparator
-      // 
-      this.propertiesToolStripSeparator.Name = "propertiesToolStripSeparator";
-      this.propertiesToolStripSeparator.Size = new System.Drawing.Size(253, 6);
-      // 
       // EnhancedChart
       // 
@@ -114 +97 @@
     private System.Windows.Forms.ToolStripMenuItem copyImageToClipboardBitmapToolStripMenuItem;
     private System.Windows.Forms.SaveFileDialog saveFileDialog;
-    private System.Windows.Forms.ToolStripSeparator propertiesToolStripSeparator;
-    private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
   }
 }

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Common.Resources;
 
 namespace HeuristicLab.Visualization.ChartControlsExtensions {
@@ -32 +31 @@
       : base() {
       InitializeComponent();
-      propertiesToolStripMenuItem.Image = VSImageLibrary.Properties;
       EnableDoubleClickResetsZoom = true;
       EnableMiddleClickPanning = true;
@@ -42 +40 @@
     [DefaultValue(true)]
     public bool EnableMiddleClickPanning { get; set; }
-    [DefaultValue(false)]
-    public bool ShowPropertiesContextMenuItem { get; set; }
 
     public static void CustomizeChartArea(ChartArea chartArea) {
@@ -142 +138 @@
     #endregion
 
-    private void contextMenuStrip_Opening(object sender, CancelEventArgs e) {
-      propertiesToolStripSeparator.Visible = ShowPropertiesContextMenuItem;
-      propertiesToolStripMenuItem.Visible = ShowPropertiesContextMenuItem;
-    }
-
     private void exportChartToolStripMenuItem_Click(object sender, System.EventArgs e) {
       // Set image file format
@@ -177 +168 @@
       Clipboard.SetDataObject(bmp);
     }
-
-    private void propertiesToolStripMenuItem_Click(object sender, EventArgs e) {
-      OnPropertiesClicked();
-    }
-
-    public event EventHandler PropertiesClicked;
-    private void OnPropertiesClicked() {
-      var handler = PropertiesClicked;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
   }
 }