Free cookie consent management tool by TermsFeed Policy Generator

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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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  }
Note: See TracChangeset for help on using the changeset viewer.