Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1881


Ignore:
Timestamp:
05/23/09 10:22:40 (16 years ago)
Author:
mstoeger
Message:

renamed xaxis-properties #498

Location:
trunk/sources
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs

    r1880 r1881  
    8282      YAxisDescriptor yaxis2 = new YAxisDescriptor();
    8383
    84       model.XAxis.XAxisLabel = "X Axis";
    85       model.XAxis.ShowXAxisLabel = true;
     84      model.XAxis.Label = "X Axis";
     85      model.XAxis.ShowLabel = true;
    8686
    8787      yaxis1.Label = "Y-Axis 1";
     
    139139      model.AddDataRow(row1);
    140140
    141       model.XAxis.ShowXAxisGrid = false;
     141      model.XAxis.ShowGrid = false;
    142142
    143143      Random rand = new Random(42);
  • trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs

    r1880 r1881  
    144144      }
    145145
    146       XmlNode labelProviderNode = document.ImportNode(XAxis.XAxisLabelProvider.GetLabelProviderXmlNode(), true);
     146      XmlNode labelProviderNode = document.ImportNode(XAxis.LabelProvider.GetLabelProviderXmlNode(), true);
    147147      node.AppendChild(labelProviderNode);
    148148
     
    155155      foreach (XmlNode dataRow in node.ChildNodes) {
    156156        if (dataRow.Name.Equals("LabelProvider")) {
    157           XAxis.XAxisLabelProvider = XAxis.XAxisLabelProvider.PopulateLabelProviderXmlNode(dataRow);
     157          XAxis.LabelProvider = XAxis.LabelProvider.PopulateLabelProviderXmlNode(dataRow);
    158158        } else {
    159159          XmlAttributeCollection attrs = dataRow.Attributes;
  • trunk/sources/HeuristicLab.Visualization/3.2/DataExport/CSVDataExport.cs

    r1880 r1881  
    2727
    2828        // write headers
    29         writer.AddString(model.XAxis.XAxisLabel);
     29        writer.AddString(model.XAxis.Label);
    3030        foreach (IDataRow row in model.Rows)
    3131          writer.AddString(row.Label);
  • trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

    r1880 r1881  
    9191      titleShape.Text = model.Title;
    9292
    93       if (model.XAxis.ShowXAxisGrid) {
     93      if (model.XAxis.ShowGrid) {
    9494        canvas.AddShape(xAxisGrid);
    9595      }
     
    107107      }
    108108
    109       xAxis.ShowLabel = model.XAxis.ShowXAxisLabel;
    110       xAxis.Label = model.XAxis.XAxisLabel;
     109      xAxis.ShowLabel = model.XAxis.ShowLabel;
     110      xAxis.Label = model.XAxis.Label;
    111111
    112112      canvas.AddShape(xAxis);
  • trunk/sources/HeuristicLab.Visualization/3.2/Options/Options.cs

    r1880 r1881  
    6666
    6767    public void ResetSettings() {
    68       model.XAxis.ShowXAxisGrid = oldShowXAxisGrid;
     68      model.XAxis.ShowGrid = oldShowXAxisGrid;
    6969
    7070      foreach (var param in oldLineParams) {
     
    153153
    154154    private void Options_Load(object sender, EventArgs e) {
    155       oldShowXAxisGrid = model.XAxis.ShowXAxisGrid;
    156       chkShowXAxisGrid.Checked = model.XAxis.ShowXAxisGrid;
     155      oldShowXAxisGrid = model.XAxis.ShowGrid;
     156      chkShowXAxisGrid.Checked = model.XAxis.ShowGrid;
    157157
    158158      InitTabPageLines();
     
    245245
    246246    private void chkShowXAxisGrid_CheckedChanged(object sender, EventArgs e) {
    247       model.XAxis.ShowXAxisGrid = chkShowXAxisGrid.Checked;
     247      model.XAxis.ShowGrid = chkShowXAxisGrid.Checked;
    248248    }
    249249
  • trunk/sources/HeuristicLab.Visualization/3.2/Options/OptionsDialog.Designer.cs

    r1880 r1881  
    6060      //
    6161      this.options.Location = new System.Drawing.Point(2, 3);
    62       chartDataRowsModel1.XAxis.ShowXAxisLabel = true;
     62      chartDataRowsModel1.XAxis.ShowLabel = true;
    6363      chartDataRowsModel1.Title = "Title";
    6464      viewSettings1.LegendColor = System.Drawing.Color.Blue;
     
    7070      viewSettings1.XAxisFont = new System.Drawing.Font("Arial", 8F);
    7171      chartDataRowsModel1.ViewSettings = viewSettings1;
    72       chartDataRowsModel1.XAxis.XAxisLabel = "";
    73       chartDataRowsModel1.XAxis.XAxisLabelProvider = continuousLabelProvider1;
     72      chartDataRowsModel1.XAxis.Label = "";
     73      chartDataRowsModel1.XAxis.LabelProvider = continuousLabelProvider1;
    7474      this.options.Model = chartDataRowsModel1;
    7575      this.options.Name = "options";
  • trunk/sources/HeuristicLab.Visualization/3.2/XAxisDescriptor.cs

    r1880 r1881  
    55
    66  public class XAxisDescriptor {
    7     private string xAxisLabel = "";
    8     private bool showXAxisLabel = true;
    9     private bool showXAxisGrid = true;
    10     private ILabelProvider xAxisLabelProvider = new ContinuousLabelProvider("0.##");
     7    private string label = "";
     8    private bool showLabel = true;
     9    private bool showGrid = true;
     10    private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
    1111
    1212    public event XAxisDescriptorChangedHandler XAxisDescriptorChanged;
    1313
    14     public bool ShowXAxisGrid {
    15       get { return showXAxisGrid; }
     14    public bool ShowGrid {
     15      get { return showGrid; }
    1616      set {
    17         this.showXAxisGrid = value;
     17        this.showGrid = value;
    1818        FireXAxisDescriptorChanged();
    1919      }
    2020    }
    2121
    22     public ILabelProvider XAxisLabelProvider {
    23       get { return xAxisLabelProvider; }
     22    public ILabelProvider LabelProvider {
     23      get { return labelProvider; }
    2424      set {
    25         this.xAxisLabelProvider = value;
     25        this.labelProvider = value;
    2626        FireXAxisDescriptorChanged();
    2727      }
    2828    }
    2929
    30     public string XAxisLabel {
    31       get { return xAxisLabel; }
     30    public string Label {
     31      get { return label; }
    3232      set {
    33         xAxisLabel = value;
     33        label = value;
    3434        FireXAxisDescriptorChanged();
    3535      }
    3636    }
    3737
    38     public bool ShowXAxisLabel {
    39       get { return showXAxisLabel; }
     38    public bool ShowLabel {
     39      get { return showLabel; }
    4040      set {
    41         showXAxisLabel = value;
     41        showLabel = value;
    4242        FireXAxisDescriptorChanged();
    4343      }
Note: See TracChangeset for help on using the changeset viewer.