Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9258


Ignore:
Timestamp:
02/28/13 15:38:12 (11 years ago)
Author:
mkommend
Message:

#2020: Integrated changes developed in the CMA-ES branch by abeham in the trunk.

Location:
trunk/sources
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

    r8339 r9258  
    2020#endregion
    2121
     22using HeuristicLab.Collections;
     23using HeuristicLab.Core.Views;
     24using HeuristicLab.MainForm;
    2225using System;
    2326using System.Collections.Generic;
    … …  
    2629using System.Windows.Forms;
    2730using System.Windows.Forms.DataVisualization.Charting;
    28 using HeuristicLab.Collections;
    29 using HeuristicLab.Core.Views;
    30 using HeuristicLab.MainForm;
    3131
    3232namespace HeuristicLab.Analysis.Views {
    … …  
    115115    public void ShowConfiguration() {
    116116      if (Content != null) {
    117         using (DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content)) {
     117        using (var dialog = new DataTableVisualPropertiesDialog(Content)) {
    118118          dialog.ShowDialog(this);
    119119        }
    … …  
    123123      foreach (var row in rows) {
    124124        RegisterDataRowEvents(row);
    125         Series series = new Series(row.Name);
     125        var series = new Series(row.Name);
    126126        if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
    127127        else series.LegendText = row.Name;
    … …  
    231231      if (!Content.VisualProperties.AxisTitleColor.IsEmpty) area.AxisY2.TitleForeColor = Content.VisualProperties.AxisTitleColor;
    232232      area.AxisY2.Title = Content.VisualProperties.SecondYAxisTitle;
     233
     234      area.AxisX.IsLogarithmic = Content.VisualProperties.XAxisLogScale;
     235      area.AxisX2.IsLogarithmic = Content.VisualProperties.SecondXAxisLogScale;
     236      area.AxisY.IsLogarithmic = Content.VisualProperties.YAxisLogScale;
     237      area.AxisY2.IsLogarithmic = Content.VisualProperties.SecondYAxisLogScale;
    233238    }
    234239
    … …  
    500505          break;
    501506        default: {
     507            bool yLogarithmic = series.YAxisType == AxisType.Primary
     508                                  ? Content.VisualProperties.YAxisLogScale
     509                                  : Content.VisualProperties.SecondYAxisLogScale;
     510            bool xLogarithmic = series.XAxisType == AxisType.Primary
     511                                  ? Content.VisualProperties.XAxisLogScale
     512                                  : Content.VisualProperties.SecondXAxisLogScale;
    502513            for (int i = 0; i < row.Values.Count; i++) {
    503514              var value = row.Values[i];
    504               DataPoint point = new DataPoint();
    505               point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
    506               if (IsInvalidValue(value))
     515              var point = new DataPoint();
     516              point.XValue = row.VisualProperties.StartIndexZero && !xLogarithmic ? i : i + 1;
     517              if (IsInvalidValue(value) || (yLogarithmic && value <= 0))
    507518                point.IsEmpty = true;
    508519              else

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.Designer.cs

    r8015 r9258  
    5151      this.label4 = new System.Windows.Forms.Label();
    5252      this.xAxisPrimaryGroupBox = new System.Windows.Forms.GroupBox();
     53      this.xAxisPrimaryLogScaleCheckBox = new System.Windows.Forms.CheckBox();
    5354      this.panel2 = new System.Windows.Forms.Panel();
    5455      this.xAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
    … …  
    6465      this.label11 = new System.Windows.Forms.Label();
    6566      this.xAxisSecondaryGroupBox = new System.Windows.Forms.GroupBox();
     67      this.xAxisSecondaryLogScaleCheckBox = new System.Windows.Forms.CheckBox();
    6668      this.panel4 = new System.Windows.Forms.Panel();
    6769      this.xAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
    … …  
    8082      this.yAxisTabPage = new System.Windows.Forms.TabPage();
    8183      this.yAxisSecondaryGroupBox = new System.Windows.Forms.GroupBox();
     84      this.yAxisSecondaryLogScaleCheckBox = new System.Windows.Forms.CheckBox();
    8285      this.panel8 = new System.Windows.Forms.Panel();
    8386      this.yAxisSecondaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
    … …  
    9194      this.label14 = new System.Windows.Forms.Label();
    9295      this.yAxisPrimaryGroupBox = new System.Windows.Forms.GroupBox();
     96      this.yAxisPrimaryLogScaleCheckBox = new System.Windows.Forms.CheckBox();
    9397      this.panel6 = new System.Windows.Forms.Panel();
    9498      this.yAxisPrimaryMaximumFixedRadioButton = new System.Windows.Forms.RadioButton();
    … …  
    141145      // yAxisPrimaryTitleTextBox
    142146      //
    143       this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    144                   | System.Windows.Forms.AnchorStyles.Right)));
    145       this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
     147      this.yAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     148            | System.Windows.Forms.AnchorStyles.Right)));
     149      this.yAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(74, 19);
    146150      this.yAxisPrimaryTitleTextBox.Name = "yAxisPrimaryTitleTextBox";
    147       this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
     151      this.yAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(361, 20);
    148152      this.yAxisPrimaryTitleTextBox.TabIndex = 1;
    149153      this.yAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.yPrimaryTitleTextBox_Validated);
    … …  
    151155      // yAxisSecondaryTitleTextBox
    152156      //
    153       this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    154                   | System.Windows.Forms.AnchorStyles.Right)));
    155       this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
     157      this.yAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     158            | System.Windows.Forms.AnchorStyles.Right)));
     159      this.yAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(74, 19);
    156160      this.yAxisSecondaryTitleTextBox.Name = "yAxisSecondaryTitleTextBox";
    157       this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
     161      this.yAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(361, 20);
    158162      this.yAxisSecondaryTitleTextBox.TabIndex = 1;
    159163      this.yAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.ySecondaryTitleTextBox_Validated);
    … …  
    170174      // xAxisPrimaryGroupBox
    171175      //
    172       this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    173                   | System.Windows.Forms.AnchorStyles.Right)));
     176      this.xAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     177            | System.Windows.Forms.AnchorStyles.Right)));
     178      this.xAxisPrimaryGroupBox.Controls.Add(this.xAxisPrimaryLogScaleCheckBox);
    174179      this.xAxisPrimaryGroupBox.Controls.Add(this.panel2);
    175180      this.xAxisPrimaryGroupBox.Controls.Add(this.panel1);
    … …  
    182187      this.xAxisPrimaryGroupBox.Location = new System.Drawing.Point(3, 3);
    183188      this.xAxisPrimaryGroupBox.Name = "xAxisPrimaryGroupBox";
    184       this.xAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 99);
     189      this.xAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 126);
    185190      this.xAxisPrimaryGroupBox.TabIndex = 0;
    186191      this.xAxisPrimaryGroupBox.TabStop = false;
    187192      this.xAxisPrimaryGroupBox.Text = "Primary Axis";
    188193      //
     194      // xAxisPrimaryLogScaleCheckBox
     195      //
     196      this.xAxisPrimaryLogScaleCheckBox.AutoSize = true;
     197      this.xAxisPrimaryLogScaleCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     198      this.xAxisPrimaryLogScaleCheckBox.Location = new System.Drawing.Point(6, 99);
     199      this.xAxisPrimaryLogScaleCheckBox.Name = "xAxisPrimaryLogScaleCheckBox";
     200      this.xAxisPrimaryLogScaleCheckBox.Size = new System.Drawing.Size(83, 17);
     201      this.xAxisPrimaryLogScaleCheckBox.TabIndex = 8;
     202      this.xAxisPrimaryLogScaleCheckBox.Text = "Logarithmic:";
     203      this.xAxisPrimaryLogScaleCheckBox.UseVisualStyleBackColor = true;
     204      this.xAxisPrimaryLogScaleCheckBox.CheckedChanged += new System.EventHandler(this.xAxisPrimaryLogScaleCheckBox_CheckedChanged);
     205      //
    189206      // panel2
    190207      //
    191208      this.panel2.Controls.Add(this.xAxisPrimaryMaximumFixedRadioButton);
    192209      this.panel2.Controls.Add(this.xAxisPrimaryMaximumAutoRadioButton);
    193       this.panel2.Location = new System.Drawing.Point(66, 71);
     210      this.panel2.Location = new System.Drawing.Point(74, 71);
    194211      this.panel2.Name = "panel2";
    195212      this.panel2.Size = new System.Drawing.Size(106, 20);
    … …  
    224241      this.panel1.Controls.Add(this.xAxisPrimaryMinimumFixedRadioButton);
    225242      this.panel1.Controls.Add(this.xAxisPrimaryMinimumAutoRadioButton);
    226       this.panel1.Location = new System.Drawing.Point(66, 45);
     243      this.panel1.Location = new System.Drawing.Point(74, 45);
    227244      this.panel1.Name = "panel1";
    228245      this.panel1.Size = new System.Drawing.Size(106, 20);
    … …  
    255272      // xAxisPrimaryMinimumFixedTextBox
    256273      //
    257       this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    258                   | System.Windows.Forms.AnchorStyles.Right)));
     274      this.xAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     275            | System.Windows.Forms.AnchorStyles.Right)));
    259276      this.xAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
    260277      this.xAxisPrimaryMinimumFixedTextBox.Name = "xAxisPrimaryMinimumFixedTextBox";
    … …  
    265282      // xAxisPrimaryMaximumFixedTextBox
    266283      //
    267       this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    268                   | System.Windows.Forms.AnchorStyles.Right)));
     284      this.xAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     285            | System.Windows.Forms.AnchorStyles.Right)));
    269286      this.xAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
    270287      this.xAxisPrimaryMaximumFixedTextBox.Name = "xAxisPrimaryMaximumFixedTextBox";
    … …  
    293310      // xAxisPrimaryTitleTextBox
    294311      //
    295       this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    296                   | System.Windows.Forms.AnchorStyles.Right)));
    297       this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
     312      this.xAxisPrimaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     313            | System.Windows.Forms.AnchorStyles.Right)));
     314      this.xAxisPrimaryTitleTextBox.Location = new System.Drawing.Point(74, 19);
    298315      this.xAxisPrimaryTitleTextBox.Name = "xAxisPrimaryTitleTextBox";
    299       this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
     316      this.xAxisPrimaryTitleTextBox.Size = new System.Drawing.Size(361, 20);
    300317      this.xAxisPrimaryTitleTextBox.TabIndex = 1;
    301318      this.xAxisPrimaryTitleTextBox.Validated += new System.EventHandler(this.xPrimaryTitleTextBox_Validated);
    … …  
    312329      // xAxisSecondaryGroupBox
    313330      //
    314       this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    315                   | System.Windows.Forms.AnchorStyles.Left)
    316                   | System.Windows.Forms.AnchorStyles.Right)));
     331      this.xAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     332            | System.Windows.Forms.AnchorStyles.Left)
     333            | System.Windows.Forms.AnchorStyles.Right)));
     334      this.xAxisSecondaryGroupBox.Controls.Add(this.xAxisSecondaryLogScaleCheckBox);
    317335      this.xAxisSecondaryGroupBox.Controls.Add(this.panel4);
    318336      this.xAxisSecondaryGroupBox.Controls.Add(this.panel3);
    … …  
    323341      this.xAxisSecondaryGroupBox.Controls.Add(this.label5);
    324342      this.xAxisSecondaryGroupBox.Controls.Add(this.label6);
    325       this.xAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 108);
     343      this.xAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 135);
    326344      this.xAxisSecondaryGroupBox.Name = "xAxisSecondaryGroupBox";
    327       this.xAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 99);
     345      this.xAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 125);
    328346      this.xAxisSecondaryGroupBox.TabIndex = 1;
    329347      this.xAxisSecondaryGroupBox.TabStop = false;
    330348      this.xAxisSecondaryGroupBox.Text = "Secondary Axis";
    331349      //
     350      // xAxisSecondaryLogScaleCheckBox
     351      //
     352      this.xAxisSecondaryLogScaleCheckBox.AutoSize = true;
     353      this.xAxisSecondaryLogScaleCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     354      this.xAxisSecondaryLogScaleCheckBox.Location = new System.Drawing.Point(6, 99);
     355      this.xAxisSecondaryLogScaleCheckBox.Name = "xAxisSecondaryLogScaleCheckBox";
     356      this.xAxisSecondaryLogScaleCheckBox.Size = new System.Drawing.Size(83, 17);
     357      this.xAxisSecondaryLogScaleCheckBox.TabIndex = 8;
     358      this.xAxisSecondaryLogScaleCheckBox.Text = "Logarithmic:";
     359      this.xAxisSecondaryLogScaleCheckBox.UseVisualStyleBackColor = true;
     360      this.xAxisSecondaryLogScaleCheckBox.CheckedChanged += new System.EventHandler(this.xAxisSecondaryLogScaleCheckBox_CheckedChanged);
     361      //
    332362      // panel4
    333363      //
    334364      this.panel4.Controls.Add(this.xAxisSecondaryMaximumFixedRadioButton);
    335365      this.panel4.Controls.Add(this.xAxisSecondaryMaximumAutoRadioButton);
    336       this.panel4.Location = new System.Drawing.Point(66, 71);
     366      this.panel4.Location = new System.Drawing.Point(74, 71);
    337367      this.panel4.Name = "panel4";
    338368      this.panel4.Size = new System.Drawing.Size(106, 20);
    … …  
    367397      this.panel3.Controls.Add(this.xAxisSecondaryMinimumFixedRadioButton);
    368398      this.panel3.Controls.Add(this.xAxisSecondaryMinimumAutoRadioButton);
    369       this.panel3.Location = new System.Drawing.Point(66, 45);
     399      this.panel3.Location = new System.Drawing.Point(74, 45);
    370400      this.panel3.Name = "panel3";
    371401      this.panel3.Size = new System.Drawing.Size(106, 20);
    … …  
    398428      // xAxisSecondaryMinimumFixedTextBox
    399429      //
    400       this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    401                   | System.Windows.Forms.AnchorStyles.Right)));
     430      this.xAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     431            | System.Windows.Forms.AnchorStyles.Right)));
    402432      this.xAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
    403433      this.xAxisSecondaryMinimumFixedTextBox.Name = "xAxisSecondaryMinimumFixedTextBox";
    … …  
    408438      // xAxisSecondaryMaximumFixedTextBox
    409439      //
    410       this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    411                   | System.Windows.Forms.AnchorStyles.Right)));
     440      this.xAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     441            | System.Windows.Forms.AnchorStyles.Right)));
    412442      this.xAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
    413443      this.xAxisSecondaryMaximumFixedTextBox.Name = "xAxisSecondaryMaximumFixedTextBox";
    … …  
    427457      // xAxisSecondaryTitleTextBox
    428458      //
    429       this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    430                   | System.Windows.Forms.AnchorStyles.Right)));
    431       this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(66, 19);
     459      this.xAxisSecondaryTitleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     460            | System.Windows.Forms.AnchorStyles.Right)));
     461      this.xAxisSecondaryTitleTextBox.Location = new System.Drawing.Point(74, 19);
    432462      this.xAxisSecondaryTitleTextBox.Name = "xAxisSecondaryTitleTextBox";
    433       this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(369, 20);
     463      this.xAxisSecondaryTitleTextBox.Size = new System.Drawing.Size(361, 20);
    434464      this.xAxisSecondaryTitleTextBox.TabIndex = 1;
    435465      this.xAxisSecondaryTitleTextBox.Validated += new System.EventHandler(this.xSecondaryTitleTextBox_Validated);
    … …  
    455485      // axisTabControl
    456486      //
    457       this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    458                   | System.Windows.Forms.AnchorStyles.Right)));
     487      this.axisTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     488            | System.Windows.Forms.AnchorStyles.Right)));
    459489      this.axisTabControl.Controls.Add(this.xAxisTabPage);
    460490      this.axisTabControl.Controls.Add(this.yAxisTabPage);
    … …  
    462492      this.axisTabControl.Name = "axisTabControl";
    463493      this.axisTabControl.SelectedIndex = 0;
    464       this.axisTabControl.Size = new System.Drawing.Size(455, 236);
     494      this.axisTabControl.Size = new System.Drawing.Size(455, 289);
    465495      this.axisTabControl.TabIndex = 8;
    466496      //
    … …  
    472502      this.xAxisTabPage.Name = "xAxisTabPage";
    473503      this.xAxisTabPage.Padding = new System.Windows.Forms.Padding(3);
    474       this.xAxisTabPage.Size = new System.Drawing.Size(447, 210);
     504      this.xAxisTabPage.Size = new System.Drawing.Size(447, 263);
    475505      this.xAxisTabPage.TabIndex = 0;
    476506      this.xAxisTabPage.Text = "X-Axis";
    … …  
    484514      this.yAxisTabPage.Name = "yAxisTabPage";
    485515      this.yAxisTabPage.Padding = new System.Windows.Forms.Padding(3);
    486       this.yAxisTabPage.Size = new System.Drawing.Size(447, 210);
     516      this.yAxisTabPage.Size = new System.Drawing.Size(447, 263);
    487517      this.yAxisTabPage.TabIndex = 1;
    488518      this.yAxisTabPage.Text = "Y-Axis";
    … …  
    491521      // yAxisSecondaryGroupBox
    492522      //
    493       this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    494                   | System.Windows.Forms.AnchorStyles.Left)
    495                   | System.Windows.Forms.AnchorStyles.Right)));
     523      this.yAxisSecondaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     524            | System.Windows.Forms.AnchorStyles.Left)
     525            | System.Windows.Forms.AnchorStyles.Right)));
     526      this.yAxisSecondaryGroupBox.Controls.Add(this.yAxisSecondaryLogScaleCheckBox);
    496527      this.yAxisSecondaryGroupBox.Controls.Add(this.panel8);
    497528      this.yAxisSecondaryGroupBox.Controls.Add(this.panel7);
    … …  
    502533      this.yAxisSecondaryGroupBox.Controls.Add(this.label13);
    503534      this.yAxisSecondaryGroupBox.Controls.Add(this.label14);
    504       this.yAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 108);
     535      this.yAxisSecondaryGroupBox.Location = new System.Drawing.Point(3, 135);
    505536      this.yAxisSecondaryGroupBox.Name = "yAxisSecondaryGroupBox";
    506       this.yAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 99);
     537      this.yAxisSecondaryGroupBox.Size = new System.Drawing.Size(441, 125);
    507538      this.yAxisSecondaryGroupBox.TabIndex = 1;
    508539      this.yAxisSecondaryGroupBox.TabStop = false;
    509540      this.yAxisSecondaryGroupBox.Text = "Secondary Axis";
    510541      //
     542      // yAxisSecondaryLogScaleCheckBox
     543      //
     544      this.yAxisSecondaryLogScaleCheckBox.AutoSize = true;
     545      this.yAxisSecondaryLogScaleCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     546      this.yAxisSecondaryLogScaleCheckBox.Location = new System.Drawing.Point(6, 99);
     547      this.yAxisSecondaryLogScaleCheckBox.Name = "yAxisSecondaryLogScaleCheckBox";
     548      this.yAxisSecondaryLogScaleCheckBox.Size = new System.Drawing.Size(83, 17);
     549      this.yAxisSecondaryLogScaleCheckBox.TabIndex = 9;
     550      this.yAxisSecondaryLogScaleCheckBox.Text = "Logarithmic:";
     551      this.yAxisSecondaryLogScaleCheckBox.UseVisualStyleBackColor = true;
     552      this.yAxisSecondaryLogScaleCheckBox.CheckedChanged += new System.EventHandler(this.yAxisSecondaryLogScaleCheckBox_CheckedChanged);
     553      //
    511554      // panel8
    512555      //
    513556      this.panel8.Controls.Add(this.yAxisSecondaryMaximumFixedRadioButton);
    514557      this.panel8.Controls.Add(this.yAxisSecondaryMaximumAutoRadioButton);
    515       this.panel8.Location = new System.Drawing.Point(66, 71);
     558      this.panel8.Location = new System.Drawing.Point(74, 71);
    516559      this.panel8.Name = "panel8";
    517560      this.panel8.Size = new System.Drawing.Size(106, 20);
    … …  
    546589      this.panel7.Controls.Add(this.yAxisSecondaryMinimumFixedRadioButton);
    547590      this.panel7.Controls.Add(this.yAxisSecondaryMinimumAutoRadioButton);
    548       this.panel7.Location = new System.Drawing.Point(66, 45);
     591      this.panel7.Location = new System.Drawing.Point(74, 45);
    549592      this.panel7.Name = "panel7";
    550593      this.panel7.Size = new System.Drawing.Size(106, 20);
    … …  
    577620      // yAxisSecondaryMinimumFixedTextBox
    578621      //
    579       this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    580                   | System.Windows.Forms.AnchorStyles.Right)));
     622      this.yAxisSecondaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     623            | System.Windows.Forms.AnchorStyles.Right)));
    581624      this.yAxisSecondaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
    582625      this.yAxisSecondaryMinimumFixedTextBox.Name = "yAxisSecondaryMinimumFixedTextBox";
    … …  
    587630      // yAxisSecondaryMaximumFixedTextBox
    588631      //
    589       this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    590                   | System.Windows.Forms.AnchorStyles.Right)));
     632      this.yAxisSecondaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     633            | System.Windows.Forms.AnchorStyles.Right)));
    591634      this.yAxisSecondaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
    592635      this.yAxisSecondaryMaximumFixedTextBox.Name = "yAxisSecondaryMaximumFixedTextBox";
    … …  
    615658      // yAxisPrimaryGroupBox
    616659      //
    617       this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    618                   | System.Windows.Forms.AnchorStyles.Right)));
     660      this.yAxisPrimaryGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     661            | System.Windows.Forms.AnchorStyles.Right)));
     662      this.yAxisPrimaryGroupBox.Controls.Add(this.yAxisPrimaryLogScaleCheckBox);
    619663      this.yAxisPrimaryGroupBox.Controls.Add(this.panel6);
    620664      this.yAxisPrimaryGroupBox.Controls.Add(this.panel5);
    … …  
    627671      this.yAxisPrimaryGroupBox.Location = new System.Drawing.Point(3, 3);
    628672      this.yAxisPrimaryGroupBox.Name = "yAxisPrimaryGroupBox";
    629       this.yAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 99);
     673      this.yAxisPrimaryGroupBox.Size = new System.Drawing.Size(441, 126);
    630674      this.yAxisPrimaryGroupBox.TabIndex = 0;
    631675      this.yAxisPrimaryGroupBox.TabStop = false;
    632676      this.yAxisPrimaryGroupBox.Text = "Primary Axis";
    633677      //
     678      // yAxisPrimaryLogScaleCheckBox
     679      //
     680      this.yAxisPrimaryLogScaleCheckBox.AutoSize = true;
     681      this.yAxisPrimaryLogScaleCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
     682      this.yAxisPrimaryLogScaleCheckBox.Location = new System.Drawing.Point(6, 99);
     683      this.yAxisPrimaryLogScaleCheckBox.Name = "yAxisPrimaryLogScaleCheckBox";
     684      this.yAxisPrimaryLogScaleCheckBox.Size = new System.Drawing.Size(83, 17);
     685      this.yAxisPrimaryLogScaleCheckBox.TabIndex = 10;
     686      this.yAxisPrimaryLogScaleCheckBox.Text = "Logarithmic:";
     687      this.yAxisPrimaryLogScaleCheckBox.UseVisualStyleBackColor = true;
     688      this.yAxisPrimaryLogScaleCheckBox.CheckedChanged += new System.EventHandler(this.yAxisPrimaryLogScaleCheckBox_CheckedChanged);
     689      //
    634690      // panel6
    635691      //
    636692      this.panel6.Controls.Add(this.yAxisPrimaryMaximumFixedRadioButton);
    637693      this.panel6.Controls.Add(this.yAxisPrimaryMaximumAutoRadioButton);
    638       this.panel6.Location = new System.Drawing.Point(66, 71);
     694      this.panel6.Location = new System.Drawing.Point(74, 71);
    639695      this.panel6.Name = "panel6";
    640696      this.panel6.Size = new System.Drawing.Size(106, 20);
    … …  
    669725      this.panel5.Controls.Add(this.yAxisPrimaryMinimumAutoRadioButton);
    670726      this.panel5.Controls.Add(this.yAxisPrimaryMinimumFixedRadioButton);
    671       this.panel5.Location = new System.Drawing.Point(66, 45);
     727      this.panel5.Location = new System.Drawing.Point(74, 45);
    672728      this.panel5.Name = "panel5";
    673729      this.panel5.Size = new System.Drawing.Size(106, 20);
    … …  
    700756      // yAxisPrimaryMinimumFixedTextBox
    701757      //
    702       this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    703                   | System.Windows.Forms.AnchorStyles.Right)));
     758      this.yAxisPrimaryMinimumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     759            | System.Windows.Forms.AnchorStyles.Right)));
    704760      this.yAxisPrimaryMinimumFixedTextBox.Location = new System.Drawing.Point(191, 45);
    705761      this.yAxisPrimaryMinimumFixedTextBox.Name = "yAxisPrimaryMinimumFixedTextBox";
    … …  
    710766      // yAxisPrimaryMaximumFixedTextBox
    711767      //
    712       this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    713                   | System.Windows.Forms.AnchorStyles.Right)));
     768      this.yAxisPrimaryMaximumFixedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     769            | System.Windows.Forms.AnchorStyles.Right)));
    714770      this.yAxisPrimaryMaximumFixedTextBox.Location = new System.Drawing.Point(191, 71);
    715771      this.yAxisPrimaryMaximumFixedTextBox.Name = "yAxisPrimaryMaximumFixedTextBox";
    … …  
    738794      // titleTextBox
    739795      //
    740       this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    741                   | System.Windows.Forms.AnchorStyles.Right)));
     796      this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     797            | System.Windows.Forms.AnchorStyles.Right)));
    742798      this.titleTextBox.Location = new System.Drawing.Point(66, 0);
    743799      this.titleTextBox.Name = "titleTextBox";
    … …  
    757813      // axisFontLabel
    758814      //
    759       this.axisFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    760                   | System.Windows.Forms.AnchorStyles.Right)));
     815      this.axisFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     816            | System.Windows.Forms.AnchorStyles.Right)));
    761817      this.axisFontLabel.AutoSize = true;
    762818      this.axisFontLabel.Location = new System.Drawing.Point(98, 60);
    … …  
    768824      // titleFontLabel
    769825      //
    770       this.titleFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    771                   | System.Windows.Forms.AnchorStyles.Right)));
     826      this.titleFontLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     827            | System.Windows.Forms.AnchorStyles.Right)));
    772828      this.titleFontLabel.AutoSize = true;
    773829      this.titleFontLabel.Location = new System.Drawing.Point(98, 31);
    … …  
    822878      // titleFontDialog
    823879      //
     880      this.titleFontDialog.Color = System.Drawing.SystemColors.ControlText;
    824881      this.titleFontDialog.FontMustExist = true;
    825882      this.titleFontDialog.ShowColor = true;
     883      //
     884      // axisFontDialog
     885      //
     886      this.axisFontDialog.Color = System.Drawing.SystemColors.ControlText;
    826887      //
    827888      // DataTableVisualPropertiesControl
    … …  
    838899      this.Controls.Add(this.titleFontButton);
    839900      this.Name = "DataTableVisualPropertiesControl";
    840       this.Size = new System.Drawing.Size(455, 322);
     901      this.Size = new System.Drawing.Size(455, 373);
    841902      this.xAxisPrimaryGroupBox.ResumeLayout(false);
    842903      this.xAxisPrimaryGroupBox.PerformLayout();
    … …  
    9401001    private System.Windows.Forms.Panel panel7;
    9411002    private System.Windows.Forms.Panel panel8;
     1003    private System.Windows.Forms.CheckBox xAxisPrimaryLogScaleCheckBox;
     1004    private System.Windows.Forms.CheckBox xAxisSecondaryLogScaleCheckBox;
     1005    private System.Windows.Forms.CheckBox yAxisSecondaryLogScaleCheckBox;
     1006    private System.Windows.Forms.CheckBox yAxisPrimaryLogScaleCheckBox;
    9421007  }
    9431008}

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesControl.cs

    r8280 r9258  
    2020#endregion
    2121
     22using HeuristicLab.MainForm;
     23using HeuristicLab.MainForm.WindowsForms;
    2224using System.Drawing;
    2325using System.Windows.Forms;
    24 using HeuristicLab.MainForm;
    25 using HeuristicLab.MainForm.WindowsForms;
    2626
    2727namespace HeuristicLab.Analysis.Views {
    … …  
    7575          xAxisPrimaryMaximumFixedRadioButton.Checked = false;
    7676          xAxisPrimaryMaximumFixedTextBox.Text = string.Empty;
     77          xAxisPrimaryLogScaleCheckBox.Checked = false;
    7778          xAxisSecondaryTitleTextBox.Text = string.Empty;
    7879          xAxisSecondaryMinimumAutoRadioButton.Checked = false;
    … …  
    8283          xAxisSecondaryMaximumFixedRadioButton.Checked = false;
    8384          xAxisSecondaryMaximumFixedTextBox.Text = string.Empty;
     85          xAxisSecondaryLogScaleCheckBox.Checked = false;
    8486
    8587          yAxisPrimaryTitleTextBox.Text = string.Empty;
    … …  
    9092          yAxisPrimaryMaximumFixedRadioButton.Checked = false;
    9193          yAxisPrimaryMaximumFixedTextBox.Text = string.Empty;
     94          yAxisPrimaryLogScaleCheckBox.Checked = false;
    9295          yAxisSecondaryTitleTextBox.Text = string.Empty;
    9396          yAxisSecondaryMinimumAutoRadioButton.Checked = false;
    … …  
    97100          yAxisSecondaryMaximumFixedRadioButton.Checked = false;
    98101          yAxisSecondaryMaximumFixedTextBox.Text = string.Empty;
     102          yAxisSecondaryLogScaleCheckBox.Checked = false;
    99103        } else {
    100104          titleFontLabel.Text = "( " + FormatFont(Content.TitleFont) + " )";
    … …  
    109113          xAxisPrimaryMaximumFixedRadioButton.Checked = !Content.XAxisMaximumAuto;
    110114          xAxisPrimaryMaximumFixedTextBox.Text = Content.XAxisMaximumFixedValue.ToString();
     115          xAxisPrimaryLogScaleCheckBox.Checked = Content.XAxisLogScale;
    111116          xAxisSecondaryTitleTextBox.Text = Content.SecondXAxisTitle;
    112117          xAxisSecondaryMinimumAutoRadioButton.Checked = Content.SecondXAxisMinimumAuto;
    … …  
    116121          xAxisSecondaryMaximumFixedRadioButton.Checked = !Content.SecondXAxisMaximumAuto;
    117122          xAxisSecondaryMaximumFixedTextBox.Text = Content.SecondXAxisMaximumFixedValue.ToString();
     123          xAxisSecondaryLogScaleCheckBox.Checked = Content.SecondXAxisLogScale;
    118124
    119125          yAxisPrimaryTitleTextBox.Text = Content.YAxisTitle;
    … …  
    124130          yAxisPrimaryMaximumFixedRadioButton.Checked = !Content.YAxisMaximumAuto;
    125131          yAxisPrimaryMaximumFixedTextBox.Text = Content.YAxisMaximumFixedValue.ToString();
     132          yAxisPrimaryLogScaleCheckBox.Checked = Content.YAxisLogScale;
    126133          yAxisSecondaryTitleTextBox.Text = Content.SecondYAxisTitle;
    127134          yAxisSecondaryMinimumAutoRadioButton.Checked = Content.SecondYAxisMinimumAuto;
    … …  
    131138          yAxisSecondaryMaximumFixedRadioButton.Checked = !Content.SecondYAxisMaximumAuto;
    132139          yAxisSecondaryMaximumFixedTextBox.Text = Content.SecondYAxisMaximumFixedValue.ToString();
    133         }
    134       }
    135       finally { SuppressEvents = false; }
     140          yAxisSecondaryLogScaleCheckBox.Checked = Content.SecondYAxisLogScale;
     141        }
     142      } finally { SuppressEvents = false; }
    136143      SetEnabledStateOfControls();
    137144    }
    … …  
    333340          Content.XAxisMinimumAuto = xAxisPrimaryMinimumAutoRadioButton.Checked;
    334341          if (Content.XAxisMinimumAuto) xAxisPrimaryMinimumFixedTextBox.Text = double.NaN.ToString();
    335         }
    336         finally { SuppressEvents = false; }
     342        } finally { SuppressEvents = false; }
    337343        SetEnabledStateOfControls();
    338344      }
    … …  
    345351          Content.XAxisMaximumAuto = xAxisPrimaryMaximumAutoRadioButton.Checked;
    346352          if (Content.XAxisMaximumAuto) xAxisPrimaryMaximumFixedTextBox.Text = double.NaN.ToString();
    347         }
    348         finally { SuppressEvents = false; }
     353        } finally { SuppressEvents = false; }
    349354        SetEnabledStateOfControls();
    350355      }
    … …  
    357362          Content.SecondXAxisMinimumAuto = xAxisSecondaryMinimumAutoRadioButton.Checked;
    358363          if (Content.SecondXAxisMinimumAuto) xAxisSecondaryMinimumFixedTextBox.Text = double.NaN.ToString();
    359         }
    360         finally { SuppressEvents = false; }
     364        } finally { SuppressEvents = false; }
    361365        SetEnabledStateOfControls();
    362366      }
    … …  
    369373          Content.SecondXAxisMaximumAuto = xAxisSecondaryMaximumAutoRadioButton.Checked;
    370374          if (Content.SecondXAxisMaximumAuto) xAxisSecondaryMaximumFixedTextBox.Text = double.NaN.ToString();
    371         }
    372         finally { SuppressEvents = false; }
     375        } finally { SuppressEvents = false; }
    373376        SetEnabledStateOfControls();
    374377      }
    … …  
    381384          Content.YAxisMinimumAuto = yAxisPrimaryMinimumAutoRadioButton.Checked;
    382385          if (Content.YAxisMinimumAuto) yAxisPrimaryMinimumFixedTextBox.Text = double.NaN.ToString();
    383         }
    384         finally { SuppressEvents = false; }
     386        } finally { SuppressEvents = false; }
    385387        SetEnabledStateOfControls();
    386388      }
    … …  
    393395          Content.YAxisMaximumAuto = yAxisPrimaryMaximumAutoRadioButton.Checked;
    394396          if (Content.YAxisMaximumAuto) yAxisPrimaryMaximumFixedTextBox.Text = double.NaN.ToString();
    395         }
    396         finally { SuppressEvents = false; }
     397        } finally { SuppressEvents = false; }
    397398        SetEnabledStateOfControls();
    398399      }
    … …  
    405406          Content.SecondYAxisMinimumAuto = yAxisSecondaryMinimumAutoRadioButton.Checked;
    406407          if (Content.SecondYAxisMinimumAuto) yAxisSecondaryMinimumFixedTextBox.Text = double.NaN.ToString();
    407         }
    408         finally { SuppressEvents = false; }
     408        } finally { SuppressEvents = false; }
    409409        SetEnabledStateOfControls();
    410410      }
    … …  
    417417          Content.SecondYAxisMaximumAuto = yAxisSecondaryMaximumAutoRadioButton.Checked;
    418418          if (Content.SecondYAxisMaximumAuto) yAxisSecondaryMaximumFixedTextBox.Text = double.NaN.ToString();
    419         }
    420         finally { SuppressEvents = false; }
    421         SetEnabledStateOfControls();
     419        } finally { SuppressEvents = false; }
     420        SetEnabledStateOfControls();
     421      }
     422    }
     423
     424    private void xAxisPrimaryLogScaleCheckBox_CheckedChanged(object sender, System.EventArgs e) {
     425      if (!SuppressEvents && Content != null) {
     426        SuppressEvents = true;
     427        try {
     428          Content.XAxisLogScale = xAxisPrimaryLogScaleCheckBox.Checked;
     429        } finally { SuppressEvents = false; }
     430      }
     431    }
     432
     433    private void xAxisSecondaryLogScaleCheckBox_CheckedChanged(object sender, System.EventArgs e) {
     434      if (!SuppressEvents && Content != null) {
     435        SuppressEvents = true;
     436        try {
     437          Content.SecondXAxisLogScale = xAxisSecondaryLogScaleCheckBox.Checked;
     438        } finally { SuppressEvents = false; }
     439      }
     440    }
     441
     442    private void yAxisPrimaryLogScaleCheckBox_CheckedChanged(object sender, System.EventArgs e) {
     443      if (!SuppressEvents && Content != null) {
     444        SuppressEvents = true;
     445        try {
     446          Content.YAxisLogScale = yAxisPrimaryLogScaleCheckBox.Checked;
     447        } finally { SuppressEvents = false; }
     448      }
     449    }
     450
     451    private void yAxisSecondaryLogScaleCheckBox_CheckedChanged(object sender, System.EventArgs e) {
     452      if (!SuppressEvents && Content != null) {
     453        SuppressEvents = true;
     454        try {
     455          Content.SecondYAxisLogScale = yAxisSecondaryLogScaleCheckBox.Checked;
     456        } finally { SuppressEvents = false; }
    422457      }
    423458    }

  • trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs

    r8015 r9258  
    6969      this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    7070      this.okButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    71       this.okButton.Location = new System.Drawing.Point(325, 400);
     71      this.okButton.Location = new System.Drawing.Point(325, 425);
    7272      this.okButton.Name = "okButton";
    7373      this.okButton.Size = new System.Drawing.Size(75, 23);
    … …  
    8181      this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    8282      this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    83       this.cancelButton.Location = new System.Drawing.Point(406, 400);
     83      this.cancelButton.Location = new System.Drawing.Point(406, 425);
    8484      this.cancelButton.Name = "cancelButton";
    8585      this.cancelButton.Size = new System.Drawing.Size(75, 23);
    … …  
    9191      // tabControl
    9292      //
    93       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    94                   | System.Windows.Forms.AnchorStyles.Left)
    95                   | System.Windows.Forms.AnchorStyles.Right)));
     93      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     94            | System.Windows.Forms.AnchorStyles.Left)
     95            | System.Windows.Forms.AnchorStyles.Right)));
    9696      this.tabControl.Controls.Add(this.seriesTabPage);
    9797      this.tabControl.Controls.Add(this.chartTabPage);
    … …  
    9999      this.tabControl.Name = "tabControl";
    100100      this.tabControl.SelectedIndex = 0;
    101       this.tabControl.Size = new System.Drawing.Size(469, 382);
     101      this.tabControl.Size = new System.Drawing.Size(469, 407);
    102102      this.tabControl.TabIndex = 2;
    103103      //
    … …  
    108108      this.seriesTabPage.Name = "seriesTabPage";
    109109      this.seriesTabPage.Padding = new System.Windows.Forms.Padding(3);
    110       this.seriesTabPage.Size = new System.Drawing.Size(461, 356);
     110      this.seriesTabPage.Size = new System.Drawing.Size(461, 381);
    111111      this.seriesTabPage.TabIndex = 0;
    112112      this.seriesTabPage.Text = "Series";
    … …  
    115115      // splitContainer
    116116      //
    117       this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    118                   | System.Windows.Forms.AnchorStyles.Left)
    119                   | System.Windows.Forms.AnchorStyles.Right)));
     117      this.splitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     118            | System.Windows.Forms.AnchorStyles.Left)
     119            | System.Windows.Forms.AnchorStyles.Right)));
    120120      this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
    121121      this.splitContainer.Location = new System.Drawing.Point(0, 0);
    … …  
    133133      this.splitContainer.Panel2.Controls.Add(this.dataRowVisualPropertiesControl);
    134134      this.splitContainer.Panel2MinSize = 50;
    135       this.splitContainer.Size = new System.Drawing.Size(461, 356);
     135      this.splitContainer.Size = new System.Drawing.Size(461, 381);
    136136      this.splitContainer.SplitterDistance = 125;
    137137      this.splitContainer.TabIndex = 0;
    … …  
    161161      // seriesListView
    162162      //
    163       this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    164                   | System.Windows.Forms.AnchorStyles.Left)
    165                   | System.Windows.Forms.AnchorStyles.Right)));
     163      this.seriesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     164            | System.Windows.Forms.AnchorStyles.Left)
     165            | System.Windows.Forms.AnchorStyles.Right)));
    166166      this.seriesListView.HideSelection = false;
    167167      this.seriesListView.Location = new System.Drawing.Point(3, 32);
    … …  
    169169      this.seriesListView.Name = "seriesListView";
    170170      this.seriesListView.ShowGroups = false;
    171       this.seriesListView.Size = new System.Drawing.Size(119, 321);
     171      this.seriesListView.Size = new System.Drawing.Size(119, 346);
    172172      this.seriesListView.TabIndex = 2;
    173173      this.seriesListView.UseCompatibleStateImageBehavior = false;
    … …  
    177177      // dataRowVisualPropertiesControl
    178178      //
    179       this.dataRowVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    180                   | System.Windows.Forms.AnchorStyles.Left)
    181                   | System.Windows.Forms.AnchorStyles.Right)));
     179      this.dataRowVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     180            | System.Windows.Forms.AnchorStyles.Left)
     181            | System.Windows.Forms.AnchorStyles.Right)));
    182182      this.dataRowVisualPropertiesControl.Content = null;
    183183      this.dataRowVisualPropertiesControl.Location = new System.Drawing.Point(3, 26);
    184184      this.dataRowVisualPropertiesControl.Name = "dataRowVisualPropertiesControl";
    185       this.dataRowVisualPropertiesControl.Size = new System.Drawing.Size(326, 327);
     185      this.dataRowVisualPropertiesControl.Size = new System.Drawing.Size(326, 352);
    186186      this.dataRowVisualPropertiesControl.TabIndex = 0;
    187187      //
    … …  
    192192      this.chartTabPage.Name = "chartTabPage";
    193193      this.chartTabPage.Padding = new System.Windows.Forms.Padding(3);
    194       this.chartTabPage.Size = new System.Drawing.Size(461, 356);
     194      this.chartTabPage.Size = new System.Drawing.Size(461, 381);
    195195      this.chartTabPage.TabIndex = 1;
    196196      this.chartTabPage.Text = "Chart";
    … …  
    199199      // dataTableVisualPropertiesControl
    200200      //
    201       this.dataTableVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    202                   | System.Windows.Forms.AnchorStyles.Left)
    203                   | System.Windows.Forms.AnchorStyles.Right)));
     201      this.dataTableVisualPropertiesControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     202            | System.Windows.Forms.AnchorStyles.Left)
     203            | System.Windows.Forms.AnchorStyles.Right)));
    204204      this.dataTableVisualPropertiesControl.Content = null;
    205205      this.dataTableVisualPropertiesControl.Location = new System.Drawing.Point(3, 6);
    206206      this.dataTableVisualPropertiesControl.Name = "dataTableVisualPropertiesControl";
    207       this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(455, 347);
     207      this.dataTableVisualPropertiesControl.Size = new System.Drawing.Size(455, 372);
    208208      this.dataTableVisualPropertiesControl.TabIndex = 0;
    209209      //
    … …  
    213213      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    214214      this.CancelButton = this.cancelButton;
    215       this.ClientSize = new System.Drawing.Size(493, 435);
     215      this.ClientSize = new System.Drawing.Size(493, 460);
    216216      this.Controls.Add(this.tabControl);
    217217      this.Controls.Add(this.cancelButton);

  • trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

    r7259 r9258  
    2020#endregion
    2121
     22using HeuristicLab.Common;
     23using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2224using System.ComponentModel;
    2325using System.Drawing;
    24 using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Analysis {
    … …  
    312312          OnPropertyChanged("SecondYAxisMaximumFixedValue");
    313313        }
     314      }
     315    }
     316
     317    private bool xAxisLogScale;
     318    public bool XAxisLogScale {
     319      get { return xAxisLogScale; }
     320      set {
     321        if (xAxisLogScale == value) return;
     322        xAxisLogScale = value;
     323        OnPropertyChanged("XAxisLogScale");
     324      }
     325    }
     326
     327    private bool secondXAxisLogScale;
     328    public bool SecondXAxisLogScale {
     329      get { return secondXAxisLogScale; }
     330      set {
     331        if (secondXAxisLogScale == value) return;
     332        secondXAxisLogScale = value;
     333        OnPropertyChanged("SecondXAxisLogScale");
     334      }
     335    }
     336
     337    private bool yAxisLogScale;
     338    public bool YAxisLogScale {
     339      get { return yAxisLogScale; }
     340      set {
     341        if (yAxisLogScale == value) return;
     342        yAxisLogScale = value;
     343        OnPropertyChanged("YAxisLogScale");
     344      }
     345    }
     346
     347    private bool secondYAxisLogScale;
     348    public bool SecondYAxisLogScale {
     349      get { return secondYAxisLogScale; }
     350      set {
     351        if (secondYAxisLogScale == value) return;
     352        secondYAxisLogScale = value;
     353        OnPropertyChanged("SecondYAxisLogScale");
    314354      }
    315355    }
    … …  
    472512      this.secondYAxisMaximumAuto = original.secondYAxisMaximumAuto;
    473513      this.secondYAxisMaximumFixedValue = original.secondYAxisMaximumFixedValue;
     514      this.xAxisLogScale = original.xAxisLogScale;
     515      this.secondXAxisLogScale = original.secondXAxisLogScale;
     516      this.yAxisLogScale = original.yAxisLogScale;
     517      this.secondYAxisLogScale = original.secondYAxisLogScale;
    474518    }
    475519    public DataTableVisualProperties() {
    … …  
    497541      this.secondYAxisMaximumAuto = true;
    498542      this.secondYAxisMaximumFixedValue = double.NaN;
     543      this.xAxisLogScale = false;
     544      this.secondXAxisLogScale = false;
     545      this.yAxisLogScale = false;
     546      this.secondYAxisLogScale = false;
    499547    }
    500548    public DataTableVisualProperties(string title)
    … …  
    509557    public event PropertyChangedEventHandler PropertyChanged;
    510558    protected virtual void OnPropertyChanged(string propertyName) {
    511       PropertyChangedEventHandler handler = PropertyChanged;
     559      var handler = PropertyChanged;
    512560      if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
    513561    }
    … …  
    547595        this.secondYAxisMaximumAuto = true;
    548596        this.secondYAxisMaximumFixedValue = double.NaN;
     597      }
    549598      #endregion
    550       }
    551599    }
    552600  }

  • trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

    r8806 r9258  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <Compile Include="Creators\NormalDistributedRealVectorCreator.cs" />
    110111    <Compile Include="Interfaces\IRealVectorMultiNeighborhoodShakingOperator.cs" />
    111112    <Compile Include="ParticleOperators\RealVectorParticleCreator.cs" />

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r8720 r9258  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    2522using HeuristicLab.Analysis;
    2623using HeuristicLab.Common;
    … …  
    3229using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3330using HeuristicLab.PluginInfrastructure;
     31using System;
     32using System.Collections.Generic;
     33using System.Linq;
    3434
    3535namespace HeuristicLab.Problems.TestFunctions {
    … …  
    125125    public override IDeepCloneable Clone(Cloner cloner) {
    126126      return new SingleObjectiveTestFunctionProblem(this, cloner);
    127     }
    128 
    129     private bool IsNotFieldReferenced(IOperator x) {
    130       return !(x == strategyVectorCreator
    131         || x == strategyVectorCrossover
    132         || x == strategyVectorManipulator);
    133127    }
    134128
    … …  
    337331    }
    338332    private void ParameterizeOperators() {
    339       foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {
     333      foreach (var op in Operators.OfType<IRealVectorCrossover>()) {
    340334        op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    341335        op.ParentsParameter.Hidden = true;
    … …  
    345339        op.BoundsParameter.Hidden = true;
    346340      }
    347       foreach (IRealVectorManipulator op in Operators.OfType<IRealVectorManipulator>()) {
     341      foreach (var op in Operators.OfType<IRealVectorManipulator>()) {
    348342        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    349343        op.RealVectorParameter.Hidden = true;
    … …  
    351345        op.BoundsParameter.Hidden = true;
    352346      }
    353       foreach (IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) {
    354         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    355         op.RealVectorParameter.Hidden = true;
    356       }
    357       foreach (IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) {
     347      foreach (var op in Operators.OfType<IRealVectorMoveOperator>()) {
     348        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     349        op.RealVectorParameter.Hidden = true;
     350      }
     351      foreach (var op in Operators.OfType<IRealVectorMoveGenerator>()) {
    358352        op.BoundsParameter.ActualName = BoundsParameter.Name;
    359353        op.BoundsParameter.Hidden = true;
    360354      }
    361       foreach (ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
     355      foreach (var op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
    362356        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
    363357        op.QualityParameter.Hidden = true;
    … …  
    365359        op.RealVectorParameter.Hidden = true;
    366360      }
    367       foreach (IRealVectorParticleCreator op in Operators.OfType<IRealVectorParticleCreator>()) {
     361      foreach (var op in Operators.OfType<IRealVectorParticleCreator>()) {
    368362        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    369363        op.RealVectorParameter.Hidden = true;
    … …  
    373367        op.ProblemSizeParameter.Hidden = true;
    374368      }
    375       foreach (IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) {
     369      foreach (var op in Operators.OfType<IRealVectorParticleUpdater>()) {
    376370        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    377371        op.RealVectorParameter.Hidden = true;
    … …  
    379373        op.BoundsParameter.Hidden = true;
    380374      }
    381       foreach (IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) {
     375      foreach (var op in Operators.OfType<IRealVectorSwarmUpdater>()) {
    382376        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    383377        op.RealVectorParameter.Hidden = true;
    … …  
    385379        op.MaximizationParameter.Hidden = true;
    386380      }
    387       foreach (IRealVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
    388         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    389         op.RealVectorParameter.Hidden = true;
    390       }
    391       foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
     381      foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
     382        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     383        op.RealVectorParameter.Hidden = true;
     384      }
     385      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
    392386        op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    393387        op.SolutionParameter.Hidden = true;
    394388      }
    395       foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
     389      foreach (var op in Operators.OfType<ISingleObjectivePathRelinker>()) {
    396390        op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    397391        op.ParentsParameter.Hidden = true;
    398392      }
    399       foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
     393      foreach (var op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
    400394        op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
    401395        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
    … …  
    404398    }
    405399    private void UpdateStrategyVectorBounds() {
    406       DoubleMatrix strategyBounds = (DoubleMatrix)Bounds.Clone();
     400      var strategyBounds = (DoubleMatrix)Bounds.Clone();
    407401      for (int i = 0; i < strategyBounds.Rows; i++) {
    408402        if (strategyBounds[i, 0] < 0) strategyBounds[i, 0] = 0;
Note: See TracChangeset for help on using the changeset viewer.