Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/11/17 19:36:03 (7 years ago)
Author:
pfleck
Message:

#2592

  • Renamed ScatterPlotContent to ParetoFrontScatterPlot (also renamed corresponding view).
  • Refactored ParetoFrontScatterPlotView (use ScatterPlot internally).
File:
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/ParetoFrontScatterPlotView.Designer.cs

    r15202 r15203  
    2121
    2222namespace HeuristicLab.Problems.TestFunctions.Views {
    23   partial class MultiObjectiveTestFunctionParetoFrontScatterPlotView {
     23  partial class ParetoFrontScatterPlotView {
    2424    /// <summary>
    2525    /// Required designer variable.
    … …  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.components = new System.ComponentModel.Container();
    48       System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    49       System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    50       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    51       this.menuStrip1 = new System.Windows.Forms.MenuStrip();
    52       this.chooseDimensionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    53       this.chooseYDimensionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    54       this.testToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    55       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
    56       this.menuStrip1.SuspendLayout();
     47      this.scatterPlotView = new HeuristicLab.Analysis.Views.ScatterPlotView();
     48      this.xAxisComboBox = new System.Windows.Forms.ComboBox();
     49      this.yAxisComboBox = new System.Windows.Forms.ComboBox();
     50      this.xLabel = new System.Windows.Forms.Label();
     51      this.yLabel = new System.Windows.Forms.Label();
    5752      this.SuspendLayout();
    5853      //
    59       // chart
     54      // scatterPlotView
    6055      //
    61       chartArea2.Name = "ChartArea";
    62       this.chart.ChartAreas.Add(chartArea2);
    63       this.chart.Dock = System.Windows.Forms.DockStyle.Fill;
    64       legend2.Alignment = System.Drawing.StringAlignment.Center;
    65       legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
    66       legend2.Name = "Default";
    67       this.chart.Legends.Add(legend2);
    68       this.chart.Location = new System.Drawing.Point(0, 42);
    69       this.chart.Margin = new System.Windows.Forms.Padding(6);
    70       this.chart.Name = "chart";
    71       this.chart.Size = new System.Drawing.Size(1054, 712);
    72       this.chart.TabIndex = 1;
    73       this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
    74       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
    75       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
     56      this.scatterPlotView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     57            | System.Windows.Forms.AnchorStyles.Left)
     58            | System.Windows.Forms.AnchorStyles.Right)));
     59      this.scatterPlotView.Caption = "ScatterPlot View";
     60      this.scatterPlotView.Content = null;
     61      this.scatterPlotView.Location = new System.Drawing.Point(3, 37);
     62      this.scatterPlotView.Name = "scatterPlotView";
     63      this.scatterPlotView.ReadOnly = false;
     64      this.scatterPlotView.ShowName = false;
     65      this.scatterPlotView.Size = new System.Drawing.Size(615, 342);
     66      this.scatterPlotView.TabIndex = 3;
    7667      //
    77       // menuStrip1
     68      // xAxisComboBox
    7869      //
    79       this.menuStrip1.ImageScalingSize = new System.Drawing.Size(32, 32);
    80       this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    81             this.chooseDimensionToolStripMenuItem,
    82             this.chooseYDimensionToolStripMenuItem});
    83       this.menuStrip1.Location = new System.Drawing.Point(0, 0);
    84       this.menuStrip1.Name = "menuStrip1";
    85       this.menuStrip1.Size = new System.Drawing.Size(1054, 42);
    86       this.menuStrip1.TabIndex = 2;
    87       this.menuStrip1.Text = "menuStrip1";
    88       this.menuStrip1.ShowItemToolTips = true;
     70      this.xAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     71      this.xAxisComboBox.FormattingEnabled = true;
     72      this.xAxisComboBox.Location = new System.Drawing.Point(29, 3);
     73      this.xAxisComboBox.Name = "xAxisComboBox";
     74      this.xAxisComboBox.Size = new System.Drawing.Size(135, 28);
     75      this.xAxisComboBox.TabIndex = 4;
     76      this.xAxisComboBox.SelectedIndexChanged += new System.EventHandler(this.axisComboBox_SelectedIndexChanged);
    8977      //
    90       // chooseDimensionToolStripMenuItem
     78      // yAxisComboBox
    9179      //
    92       this.chooseDimensionToolStripMenuItem.Name = "chooseDimensionToolStripMenuItem";
    93       this.chooseDimensionToolStripMenuItem.Size = new System.Drawing.Size(253, 38);
    94       this.chooseDimensionToolStripMenuItem.Text = "Objective 0";
    95       this.chooseDimensionToolStripMenuItem.ToolTipText = "Choose X-Dimension";
     80      this.yAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     81      this.yAxisComboBox.FormattingEnabled = true;
     82      this.yAxisComboBox.Location = new System.Drawing.Point(240, 3);
     83      this.yAxisComboBox.Name = "yAxisComboBox";
     84      this.yAxisComboBox.Size = new System.Drawing.Size(135, 28);
     85      this.yAxisComboBox.TabIndex = 5;
     86      this.yAxisComboBox.SelectedIndexChanged += new System.EventHandler(this.axisComboBox_SelectedIndexChanged);
    9687      //
    97       // chooseYDimensionToolStripMenuItem
     88      // xLabel
    9889      //
    99       this.chooseYDimensionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
    100             this.testToolStripMenuItem});
    101       this.chooseYDimensionToolStripMenuItem.Name = "chooseYDimensionToolStripMenuItem";
    102       this.chooseYDimensionToolStripMenuItem.Size = new System.Drawing.Size(252, 38);
    103       this.chooseYDimensionToolStripMenuItem.Text = "Objective 1";
    104       this.chooseYDimensionToolStripMenuItem.ToolTipText = "Choose Y-Dimension";
     90      this.xLabel.AutoSize = true;
     91      this.xLabel.Location = new System.Drawing.Point(3, 6);
     92      this.xLabel.Name = "xLabel";
     93      this.xLabel.Size = new System.Drawing.Size(20, 20);
     94      this.xLabel.TabIndex = 6;
     95      this.xLabel.Text = "x:";
    10596      //
    106       // testToolStripMenuItem
     97      // yLabel
    10798      //
    108       this.testToolStripMenuItem.Name = "testToolStripMenuItem";
    109       this.testToolStripMenuItem.Size = new System.Drawing.Size(269, 38);
    110       this.testToolStripMenuItem.Text = "Test";
     99      this.yLabel.AutoSize = true;
     100      this.yLabel.Location = new System.Drawing.Point(214, 6);
     101      this.yLabel.Name = "yLabel";
     102      this.yLabel.Size = new System.Drawing.Size(20, 20);
     103      this.yLabel.TabIndex = 7;
     104      this.yLabel.Text = "y:";
    111105      //
    112       // MOQualitiesScatterPlotView
     106      // ParetoFrontScatterPlotView
    113107      //
    114108      this.AllowDrop = true;
    115       this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
    116       this.Controls.Add(this.chart);
    117       this.Controls.Add(this.menuStrip1);
     109      this.Controls.Add(this.yLabel);
     110      this.Controls.Add(this.xLabel);
     111      this.Controls.Add(this.yAxisComboBox);
     112      this.Controls.Add(this.xAxisComboBox);
     113      this.Controls.Add(this.scatterPlotView);
    118114      this.Margin = new System.Windows.Forms.Padding(6);
    119       this.Name = "MOQualitiesScatterPlotView";
    120       this.Size = new System.Drawing.Size(1054, 754);
    121       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
    122       this.menuStrip1.ResumeLayout(false);
    123       this.menuStrip1.PerformLayout();
     115      this.Name = "ParetoFrontScatterPlotView";
     116      this.Size = new System.Drawing.Size(621, 382);
    124117      this.ResumeLayout(false);
    125118      this.PerformLayout();
    … …  
    128121
    129122    #endregion
    130 
    131     private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
    132     private System.Windows.Forms.MenuStrip menuStrip1;
    133     private System.Windows.Forms.ToolStripMenuItem chooseDimensionToolStripMenuItem;
    134     private System.Windows.Forms.ToolStripMenuItem chooseYDimensionToolStripMenuItem;
    135     private System.Windows.Forms.ToolStripMenuItem testToolStripMenuItem;
     123    private HeuristicLab.Analysis.Views.ScatterPlotView scatterPlotView;
     124    private System.Windows.Forms.ComboBox xAxisComboBox;
     125    private System.Windows.Forms.ComboBox yAxisComboBox;
     126    private System.Windows.Forms.Label xLabel;
     127    private System.Windows.Forms.Label yLabel;
    136128  }
    137129}
Note: See TracChangeset for help on using the changeset viewer.