Changeset 1881
- Timestamp:
- 05/23/09 10:22:40 (16 years ago)
- Location:
- trunk/sources
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs
r1880 r1881 82 82 YAxisDescriptor yaxis2 = new YAxisDescriptor(); 83 83 84 model.XAxis. XAxisLabel = "X Axis";85 model.XAxis.Show XAxisLabel = true;84 model.XAxis.Label = "X Axis"; 85 model.XAxis.ShowLabel = true; 86 86 87 87 yaxis1.Label = "Y-Axis 1"; … … 139 139 model.AddDataRow(row1); 140 140 141 model.XAxis.Show XAxisGrid = false;141 model.XAxis.ShowGrid = false; 142 142 143 143 Random rand = new Random(42); -
trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs
r1880 r1881 144 144 } 145 145 146 XmlNode labelProviderNode = document.ImportNode(XAxis. XAxisLabelProvider.GetLabelProviderXmlNode(), true);146 XmlNode labelProviderNode = document.ImportNode(XAxis.LabelProvider.GetLabelProviderXmlNode(), true); 147 147 node.AppendChild(labelProviderNode); 148 148 … … 155 155 foreach (XmlNode dataRow in node.ChildNodes) { 156 156 if (dataRow.Name.Equals("LabelProvider")) { 157 XAxis. XAxisLabelProvider = XAxis.XAxisLabelProvider.PopulateLabelProviderXmlNode(dataRow);157 XAxis.LabelProvider = XAxis.LabelProvider.PopulateLabelProviderXmlNode(dataRow); 158 158 } else { 159 159 XmlAttributeCollection attrs = dataRow.Attributes; -
trunk/sources/HeuristicLab.Visualization/3.2/DataExport/CSVDataExport.cs
r1880 r1881 27 27 28 28 // write headers 29 writer.AddString(model.XAxis. XAxisLabel);29 writer.AddString(model.XAxis.Label); 30 30 foreach (IDataRow row in model.Rows) 31 31 writer.AddString(row.Label); -
trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs
r1880 r1881 91 91 titleShape.Text = model.Title; 92 92 93 if (model.XAxis.Show XAxisGrid) {93 if (model.XAxis.ShowGrid) { 94 94 canvas.AddShape(xAxisGrid); 95 95 } … … 107 107 } 108 108 109 xAxis.ShowLabel = model.XAxis.Show XAxisLabel;110 xAxis.Label = model.XAxis. XAxisLabel;109 xAxis.ShowLabel = model.XAxis.ShowLabel; 110 xAxis.Label = model.XAxis.Label; 111 111 112 112 canvas.AddShape(xAxis); -
trunk/sources/HeuristicLab.Visualization/3.2/Options/Options.cs
r1880 r1881 66 66 67 67 public void ResetSettings() { 68 model.XAxis.Show XAxisGrid = oldShowXAxisGrid;68 model.XAxis.ShowGrid = oldShowXAxisGrid; 69 69 70 70 foreach (var param in oldLineParams) { … … 153 153 154 154 private void Options_Load(object sender, EventArgs e) { 155 oldShowXAxisGrid = model.XAxis.Show XAxisGrid;156 chkShowXAxisGrid.Checked = model.XAxis.Show XAxisGrid;155 oldShowXAxisGrid = model.XAxis.ShowGrid; 156 chkShowXAxisGrid.Checked = model.XAxis.ShowGrid; 157 157 158 158 InitTabPageLines(); … … 245 245 246 246 private void chkShowXAxisGrid_CheckedChanged(object sender, EventArgs e) { 247 model.XAxis.Show XAxisGrid = chkShowXAxisGrid.Checked;247 model.XAxis.ShowGrid = chkShowXAxisGrid.Checked; 248 248 } 249 249 -
trunk/sources/HeuristicLab.Visualization/3.2/Options/OptionsDialog.Designer.cs
r1880 r1881 60 60 // 61 61 this.options.Location = new System.Drawing.Point(2, 3); 62 chartDataRowsModel1.XAxis.Show XAxisLabel = true;62 chartDataRowsModel1.XAxis.ShowLabel = true; 63 63 chartDataRowsModel1.Title = "Title"; 64 64 viewSettings1.LegendColor = System.Drawing.Color.Blue; … … 70 70 viewSettings1.XAxisFont = new System.Drawing.Font("Arial", 8F); 71 71 chartDataRowsModel1.ViewSettings = viewSettings1; 72 chartDataRowsModel1.XAxis. XAxisLabel = "";73 chartDataRowsModel1.XAxis. XAxisLabelProvider = continuousLabelProvider1;72 chartDataRowsModel1.XAxis.Label = ""; 73 chartDataRowsModel1.XAxis.LabelProvider = continuousLabelProvider1; 74 74 this.options.Model = chartDataRowsModel1; 75 75 this.options.Name = "options"; -
trunk/sources/HeuristicLab.Visualization/3.2/XAxisDescriptor.cs
r1880 r1881 5 5 6 6 public class XAxisDescriptor { 7 private string xAxisLabel = "";8 private bool show XAxisLabel = true;9 private bool show XAxisGrid = 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.##"); 11 11 12 12 public event XAxisDescriptorChangedHandler XAxisDescriptorChanged; 13 13 14 public bool Show XAxisGrid {15 get { return show XAxisGrid; }14 public bool ShowGrid { 15 get { return showGrid; } 16 16 set { 17 this.show XAxisGrid = value;17 this.showGrid = value; 18 18 FireXAxisDescriptorChanged(); 19 19 } 20 20 } 21 21 22 public ILabelProvider XAxisLabelProvider {23 get { return xAxisLabelProvider; }22 public ILabelProvider LabelProvider { 23 get { return labelProvider; } 24 24 set { 25 this. xAxisLabelProvider = value;25 this.labelProvider = value; 26 26 FireXAxisDescriptorChanged(); 27 27 } 28 28 } 29 29 30 public string XAxisLabel {31 get { return xAxisLabel; }30 public string Label { 31 get { return label; } 32 32 set { 33 xAxisLabel = value;33 label = value; 34 34 FireXAxisDescriptorChanged(); 35 35 } 36 36 } 37 37 38 public bool Show XAxisLabel {39 get { return show XAxisLabel; }38 public bool ShowLabel { 39 get { return showLabel; } 40 40 set { 41 show XAxisLabel = value;41 showLabel = value; 42 42 FireXAxisDescriptorChanged(); 43 43 }
Note: See TracChangeset
for help on using the changeset viewer.