Changeset 16150 for branches/2947_ConfigurableIndexedDataTable
- Timestamp:
- 09/15/18 11:54:41 (6 years ago)
- Location:
- branches/2947_ConfigurableIndexedDataTable
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.Designer.cs
r15583 r16150 50 50 System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title(); 51 51 this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart(); 52 this.configureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 52 53 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); 53 54 ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit(); … … 100 101 this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove); 101 102 // 103 // configureToolStripMenuItem 104 // 105 this.configureToolStripMenuItem.Name = "configureToolStripMenuItem"; 106 this.configureToolStripMenuItem.Size = new System.Drawing.Size(256, 22); 107 this.configureToolStripMenuItem.Text = "Configure Chart..."; 108 this.configureToolStripMenuItem.Click += new System.EventHandler(this.configureToolStripMenuItem_Click); 109 // 102 110 // DataTableView 103 111 // … … 121 129 122 130 protected HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart; 123 131 private System.Windows.Forms.ToolStripMenuItem configureToolStripMenuItem; 124 132 } 125 133 } -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs
r16149 r16150 49 49 chart.ChartAreas[0].CursorX.Interval = 1; 50 50 chart.SuppressExceptions = true; 51 chart.ContextMenuStrip.Items.Add(configureToolStripMenuItem); 51 52 } 52 53 … … 518 519 } 519 520 #endregion 521 private void configureToolStripMenuItem_Click(object sender, EventArgs e) { 522 ShowConfiguration(); 523 } 520 524 #endregion 521 525 -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs
r15583 r16150 40 40 protected Dictionary<Series, Series> seriesToRegressionSeriesTable; 41 41 private double xMin, xMax, yMin, yMax; 42 protected bool showChartOnly = false; 42 43 43 44 public new ScatterPlot Content { … … 46 47 } 47 48 48 public bool Show Name{49 get { return nameTextBox.Visible; }49 public bool ShowChartOnly { 50 get { return showChartOnly; } 50 51 set { 51 if (nameTextBox.Visible != value) { 52 foreach (Control c in Controls) { 53 if (c == chart) continue; 54 c.Visible = value; 55 } 56 chart.Dock = value ? DockStyle.None : DockStyle.Fill; 52 if (showChartOnly != value) { 53 showChartOnly = value; 54 UpdateControlsVisibility(); 57 55 } 58 56 } … … 137 135 } 138 136 } else MessageBox.Show("Nothing to configure."); 137 } 138 139 protected void UpdateControlsVisibility() { 140 if (InvokeRequired) 141 Invoke(new Action(UpdateControlsVisibility)); 142 else { 143 foreach (Control c in Controls) { 144 if (c == chart) continue; 145 c.Visible = !showChartOnly; 146 } 147 chart.Dock = showChartOnly ? DockStyle.Fill : DockStyle.None; 148 } 139 149 } 140 150 -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs
r15583 r16150 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 24 using System.ComponentModel; 25 using System.Linq; 22 26 using HeuristicLab.Collections; 23 27 using HeuristicLab.Common; 24 28 using HeuristicLab.Core; 25 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using System;27 using System.Collections.Generic;28 using System.ComponentModel;29 using System.Linq;30 30 31 31 namespace HeuristicLab.Analysis { 32 32 [Item("IndexedDataRow", "A data row that contains a series of points.")] 33 33 [StorableClass] 34 public class IndexedDataRow<T> : NamedItem {34 public class IndexedDataRow<T> : NamedItem, IDataRow { 35 35 36 36 private DataRowVisualProperties visualProperties; -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotMultiView.cs
r15583 r16150 457 457 Content = scatterPlot, 458 458 Dock = DockStyle.Fill, 459 Show Name = false459 ShowChartOnly = true 460 460 //ShowLegend = false, 461 461 //XAxisFormat = "G3" -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs
r15583 r16150 86 86 this.scatterPlotView.Name = "scatterPlotView"; 87 87 this.scatterPlotView.ReadOnly = false; 88 this.scatterPlotView.Show Name = false;88 this.scatterPlotView.ShowChartOnly = true; 89 89 this.scatterPlotView.Size = new System.Drawing.Size(618, 517); 90 90 this.scatterPlotView.TabIndex = 0; -
branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Problems.TestFunctions.Views/3.3/ParetoFrontScatterPlotView.Designer.cs
r15583 r16150 62 62 this.scatterPlotView.Name = "scatterPlotView"; 63 63 this.scatterPlotView.ReadOnly = false; 64 this.scatterPlotView.Show Name= false;64 this.scatterPlotView.ShowChartOnly = false; 65 65 this.scatterPlotView.Size = new System.Drawing.Size(615, 342); 66 66 this.scatterPlotView.TabIndex = 3;
Note: See TracChangeset
for help on using the changeset viewer.