Changeset 14014


Ignore:
Timestamp:
07/07/16 11:41:59 (12 months ago)
Author:
bburlacu
Message:

#2594: Fixed small issue with layout update when the number of columns was changed. Improved layout of the configuration panel. Made GradientView invisible as an item in the Solution View.

Location:
branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

    r14006 r14014  
    4848
    4949    #region Properties
     50    public string XAxisTitle {
     51      get { return chart.ChartAreas[0].AxisX.Title; }
     52      set { chart.ChartAreas[0].AxisX.Title = value; }
     53    }
     54
     55    public string YAxisTitle {
     56      get { return chart.ChartAreas[0].AxisY.Title; }
     57      set { chart.ChartAreas[0].AxisY.Title = value; }
     58    }
     59
    5060    public bool ShowLegend {
    5161      get { return chart.Legends[0].Enabled; }
     
    218228      chart.ContextMenuStrip.Items.Add(new ToolStripSeparator());
    219229      chart.ContextMenuStrip.Items.Add(configToolStripMenuItem);
    220 
    221230      configurationDialog = new GradientChartConfigurationDialog(this);
    222231
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.cs

    r13853 r14014  
    2525using System.Windows.Forms;
    2626using HeuristicLab.Collections;
     27using HeuristicLab.Core.Views;
    2728using HeuristicLab.MainForm;
    2829using HeuristicLab.MainForm.WindowsForms;
    2930using HeuristicLab.Problems.DataAnalysis;
    30 using HeuristicLab.Problems.DataAnalysis.Views;
    3131using HeuristicLab.Visualization.ChartControlsExtensions;
    3232
     
    3434  [View("Gradient View")]
    3535  [Content(typeof(IRegressionSolution))]
    36   public partial class RegressionSolutionGradientView : DataAnalysisSolutionEvaluationView {
     36  public partial class RegressionSolutionGradientView : ItemView {
    3737    private const int DrawingSteps = 1000;
    3838
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.Designer.cs

    r13999 r14014  
    3131      this.automaticYAxisCheckBox = new System.Windows.Forms.CheckBox();
    3232      this.densityGroupBox = new System.Windows.Forms.GroupBox();
     33      this.columnsTextBox = new System.Windows.Forms.TextBox();
     34      this.columnsLabel = new System.Windows.Forms.Label();
    3335      this.densityComboBox = new System.Windows.Forms.ComboBox();
     36      this.label1 = new System.Windows.Forms.Label();
    3437      this.configSplitContainer = new System.Windows.Forms.SplitContainer();
    3538      this.variableGroupBox = new System.Windows.Forms.GroupBox();
    36       this.layoutGroupBox = new System.Windows.Forms.GroupBox();
    37       this.columnsTextBox = new System.Windows.Forms.TextBox();
    38       this.columnsLabel = new System.Windows.Forms.Label();
    3939      this.scrollPanel = new System.Windows.Forms.Panel();
    4040      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
     
    4646      this.configSplitContainer.SuspendLayout();
    4747      this.variableGroupBox.SuspendLayout();
    48       this.layoutGroupBox.SuspendLayout();
    4948      this.scrollPanel.SuspendLayout();
    5049      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     
    5756      this.variableListView.Location = new System.Drawing.Point(3, 16);
    5857      this.variableListView.Name = "variableListView";
    59       this.variableListView.Size = new System.Drawing.Size(163, 458);
     58      this.variableListView.Size = new System.Drawing.Size(163, 478);
    6059      this.variableListView.TabIndex = 0;
    6160      this.variableListView.UseCompatibleStateImageBehavior = false;
     
    113112      // densityGroupBox
    114113      //
     114      this.densityGroupBox.Controls.Add(this.columnsTextBox);
     115      this.densityGroupBox.Controls.Add(this.columnsLabel);
    115116      this.densityGroupBox.Controls.Add(this.densityComboBox);
     117      this.densityGroupBox.Controls.Add(this.label1);
    116118      this.densityGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
    117119      this.densityGroupBox.Location = new System.Drawing.Point(0, 77);
    118120      this.densityGroupBox.Name = "densityGroupBox";
    119       this.densityGroupBox.Size = new System.Drawing.Size(169, 49);
     121      this.densityGroupBox.Size = new System.Drawing.Size(169, 74);
    120122      this.densityGroupBox.TabIndex = 3;
    121123      this.densityGroupBox.TabStop = false;
    122       this.densityGroupBox.Text = "Density";
     124      this.densityGroupBox.Text = "Settings";
     125      //
     126      // columnsTextBox
     127      //
     128      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     129            | System.Windows.Forms.AnchorStyles.Right)));
     130      this.columnsTextBox.Location = new System.Drawing.Point(66, 46);
     131      this.columnsTextBox.Name = "columnsTextBox";
     132      this.columnsTextBox.Size = new System.Drawing.Size(94, 20);
     133      this.columnsTextBox.TabIndex = 1;
     134      this.columnsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.columnsTextBox_Validating);
     135      this.columnsTextBox.Validated += new System.EventHandler(this.columnsTextBox_Validated);
     136      //
     137      // columnsLabel
     138      //
     139      this.columnsLabel.AutoSize = true;
     140      this.columnsLabel.Location = new System.Drawing.Point(7, 49);
     141      this.columnsLabel.Name = "columnsLabel";
     142      this.columnsLabel.Size = new System.Drawing.Size(50, 13);
     143      this.columnsLabel.TabIndex = 0;
     144      this.columnsLabel.Text = "Columns:";
    123145      //
    124146      // densityComboBox
     
    133155            "Test",
    134156            "All"});
    135       this.densityComboBox.Location = new System.Drawing.Point(6, 19);
     157      this.densityComboBox.Location = new System.Drawing.Point(66, 19);
    136158      this.densityComboBox.Name = "densityComboBox";
    137       this.densityComboBox.Size = new System.Drawing.Size(157, 21);
     159      this.densityComboBox.Size = new System.Drawing.Size(94, 21);
    138160      this.densityComboBox.TabIndex = 0;
    139161      this.densityComboBox.SelectedIndexChanged += new System.EventHandler(this.densityComboBox_SelectedIndexChanged);
     162      //
     163      // label1
     164      //
     165      this.label1.AutoSize = true;
     166      this.label1.Location = new System.Drawing.Point(7, 22);
     167      this.label1.Name = "label1";
     168      this.label1.Size = new System.Drawing.Size(45, 13);
     169      this.label1.TabIndex = 0;
     170      this.label1.Text = "Density:";
    140171      //
    141172      // configSplitContainer
     
    149180      //
    150181      this.configSplitContainer.Panel1.Controls.Add(this.variableGroupBox);
    151       this.configSplitContainer.Panel1.Controls.Add(this.layoutGroupBox);
    152182      this.configSplitContainer.Panel1.Controls.Add(this.densityGroupBox);
    153183      this.configSplitContainer.Panel1.Controls.Add(this.yAxisConfigGroupBox);
     
    159189      this.configSplitContainer.SplitterDistance = 169;
    160190      this.configSplitContainer.TabIndex = 0;
     191      this.configSplitContainer.TabStop = false;
    161192      //
    162193      // variableGroupBox
     
    164195      this.variableGroupBox.Controls.Add(this.variableListView);
    165196      this.variableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
    166       this.variableGroupBox.Location = new System.Drawing.Point(0, 171);
     197      this.variableGroupBox.Location = new System.Drawing.Point(0, 151);
    167198      this.variableGroupBox.Name = "variableGroupBox";
    168       this.variableGroupBox.Size = new System.Drawing.Size(169, 477);
     199      this.variableGroupBox.Size = new System.Drawing.Size(169, 497);
    169200      this.variableGroupBox.TabIndex = 1;
    170201      this.variableGroupBox.TabStop = false;
    171202      this.variableGroupBox.Text = "Variables";
    172       //
    173       // layoutGroupBox
    174       //
    175       this.layoutGroupBox.Controls.Add(this.columnsTextBox);
    176       this.layoutGroupBox.Controls.Add(this.columnsLabel);
    177       this.layoutGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
    178       this.layoutGroupBox.Location = new System.Drawing.Point(0, 126);
    179       this.layoutGroupBox.Name = "layoutGroupBox";
    180       this.layoutGroupBox.Size = new System.Drawing.Size(169, 45);
    181       this.layoutGroupBox.TabIndex = 5;
    182       this.layoutGroupBox.TabStop = false;
    183       this.layoutGroupBox.Text = "Layout";
    184       //
    185       // columnsTextBox
    186       //
    187       this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    188             | System.Windows.Forms.AnchorStyles.Right)));
    189       this.columnsTextBox.Location = new System.Drawing.Point(66, 17);
    190       this.columnsTextBox.Name = "columnsTextBox";
    191       this.columnsTextBox.Size = new System.Drawing.Size(94, 20);
    192       this.columnsTextBox.TabIndex = 1;
    193       this.columnsTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.columnsTextBox_Validating);
    194       this.columnsTextBox.Validated += new System.EventHandler(this.columnsTextBox_Validated);
    195       //
    196       // columnsLabel
    197       //
    198       this.columnsLabel.AutoSize = true;
    199       this.columnsLabel.Location = new System.Drawing.Point(7, 20);
    200       this.columnsLabel.Name = "columnsLabel";
    201       this.columnsLabel.Size = new System.Drawing.Size(50, 13);
    202       this.columnsLabel.TabIndex = 0;
    203       this.columnsLabel.Text = "Columns:";
    204203      //
    205204      // scrollPanel
     
    227226      this.yAxisConfigGroupBox.PerformLayout();
    228227      this.densityGroupBox.ResumeLayout(false);
     228      this.densityGroupBox.PerformLayout();
    229229      this.configSplitContainer.Panel1.ResumeLayout(false);
    230230      this.configSplitContainer.Panel2.ResumeLayout(false);
     
    232232      this.configSplitContainer.ResumeLayout(false);
    233233      this.variableGroupBox.ResumeLayout(false);
    234       this.layoutGroupBox.ResumeLayout(false);
    235       this.layoutGroupBox.PerformLayout();
    236234      this.scrollPanel.ResumeLayout(false);
    237235      this.scrollPanel.PerformLayout();
     
    253251    private System.Windows.Forms.GroupBox variableGroupBox;
    254252    private System.Windows.Forms.Panel scrollPanel;
    255     private System.Windows.Forms.GroupBox layoutGroupBox;
    256253    private System.Windows.Forms.TextBox columnsTextBox;
    257254    private System.Windows.Forms.Label columnsLabel;
    258255    private System.Windows.Forms.ErrorProvider errorProvider;
     256    private System.Windows.Forms.Label label1;
    259257  }
    260258}
  • branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs

    r13999 r14014  
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis.Views {
    33   [View("Target Response Gradient View")]
     33  [View("Target Response Gradients")]
    3434  [Content(typeof(IRegressionSolution))]
    3535  public partial class RegressionSolutionTargetResponseGradientView : DataAnalysisSolutionEvaluationView {
     
    209209      tl.Controls.Clear();
    210210      int row = 0, column = 0;
    211       foreach (var chartsPanel in VisibleChartsPanels) {
     211      foreach (var v in VisibleVariables) {
     212        var chartsPanel = groupingPanels[v];
    212213        tl.Controls.Add(chartsPanel, column, row);
     214
     215        if (column == 0) {
     216          var chart = gradientCharts[v];
     217          chart.YAxisTitle = Content.ProblemData.TargetVariable;
     218        }
     219
    213220        column++;
     221
    214222        if (column == MaxColumns) {
    215223          row++;
     
    361369        ReOrderControls();
    362370        SetStyles();
    363         tl.ResumeLayout();
     371        tl.ResumeLayout(true);
    364372      }
    365373    }
Note: See TracChangeset for help on using the changeset viewer.