Changeset 1341 for trunk

Timestamp:

03/13/09 18:21:26 (16 years ago)

Author:

bspisic

Message:

#520 Renamed ViewPropertiesModel to ViewSettings and moved from LineChart to ChartDataRowsModel

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• ChartDataRowsModel.cs (modified) (3 diffs)
• HeuristicLab.Visualization.csproj (modified) (1 diff)
• IChartDataRowsModel.cs (modified) (2 diffs)
• LineChart.cs (modified) (5 diffs)
• Options/OptionsDialog.cs (modified) (2 diffs)
• Options/ViewPropertiesModel.cs (deleted)
• Options/ViewSettings.cs (added)

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModel.cs

@@ -6 +6 @@
 using System.Text;
 using HeuristicLab.Visualization.LabelProvider;
+using HeuristicLab.Visualization.Options;
 
 namespace HeuristicLab.Visualization{
@@ -16 +17 @@
     //private string xAxisLabel;
     private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
+
+    private ViewSettings viewSettings = new ViewSettings();
 
     public ILabelProvider XAxisLabelProvider {
@@ -129 +132 @@
         return max;
       }
+    }
+
+    public ViewSettings ViewSettings {
+      get { return viewSettings; }
+      set { viewSettings = value; }
     }
 

trunk/sources/HeuristicLab.Visualization/HeuristicLab.Visualization.csproj

@@ -100 +100 @@
       <DependentUpon>OptionsDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="Options\ViewPropertiesModel.cs" />
+    <Compile Include="Options\ViewSettings.cs" />
     <Compile Include="PanListener.cs" />
     <Compile Include="LabelProvider\StringLabelProvider.cs" />

trunk/sources/HeuristicLab.Visualization/IChartDataRowsModel.cs

@@ -2 +2 @@
 using HeuristicLab.Core;
 using HeuristicLab.Visualization.LabelProvider;
+using HeuristicLab.Visualization.Options;
 
 namespace HeuristicLab.Visualization {
@@ -25 +26 @@
     int MaxDataRowValues { get; }
 
+    ViewSettings ViewSettings { get; set; }
+
     event ModelChangedHandler ModelChanged;
     event DataRowAddedHandler DataRowAdded;

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -19 +19 @@
     private readonly Dictionary<IDataRow, RowEntry> rowToRowEntry = new Dictionary<IDataRow, RowEntry>();
 
+    private readonly ViewSettings viewSettings;
+
 //    private readonly Stack<RectangleD> clippingAreaHistory = new Stack<RectangleD>();
     private readonly WorldShape userInteractionShape = new WorldShape();
@@ -29 +31 @@
     private bool zoomToFullView;
 
-    private readonly ViewPropertiesModel viewPropertiesModel;
 
     /// <summary>
@@ -50 +51 @@
 
       this.model = model;
-      viewPropertiesModel = new ViewPropertiesModel(titleShape.Font, titleShape.Color, legendShape.Font, legendShape.Color, xAxis.Font, xAxis.Color);
-      viewPropertiesModel.OnUpdateProperties += UpdateViewProperties;
+      viewSettings = model.ViewSettings;
+      viewSettings.OnUpdateSettings += UpdateViewProperties;
 
       Item = model;
@@ -62 +63 @@
 
     private void UpdateViewProperties() {
-      titleShape.Font = viewPropertiesModel.TitleFont;
-      titleShape.Color = viewPropertiesModel.TitleColor;
-
-      legendShape.Font = viewPropertiesModel.LegendFont;
-      legendShape.Color = viewPropertiesModel.LegendColor;
-
-      xAxis.Font = viewPropertiesModel.XAxisFont;
-      xAxis.Color = viewPropertiesModel.XAxisColor;
+      titleShape.Font = viewSettings.TitleFont;
+      titleShape.Color = viewSettings.TitleColor;
+
+      legendShape.Font = viewSettings.LegendFont;
+      legendShape.Color = viewSettings.LegendColor;
+
+      xAxis.Font = viewSettings.XAxisFont;
+      xAxis.Color = viewSettings.XAxisColor;
 
       canvasUI.Invalidate();
@@ -145 +146 @@
 
     private void optionsToolStripMenuItem_Click(object sender, EventArgs e) {
-      OptionsDialog optionsdlg = new OptionsDialog(this.model, viewPropertiesModel);
+      OptionsDialog optionsdlg = new OptionsDialog(model);
       optionsdlg.ShowDialog(this);
     }

trunk/sources/HeuristicLab.Visualization/Options/OptionsDialog.cs

@@ -6 +6 @@
   public partial class OptionsDialog : Form {
     private readonly IChartDataRowsModel model;
-    private readonly ViewPropertiesModel propertiesModel;
+    private readonly ViewSettings viewSettings;
 
-    public OptionsDialog(IChartDataRowsModel model, ViewPropertiesModel propertiesModel) {
+    public OptionsDialog(IChartDataRowsModel model) {
       InitializeComponent();
 
       this.model = model;
-      this.propertiesModel = propertiesModel;
+      viewSettings = model.ViewSettings;
     }
 
@@ -75 +75 @@
 
     private void btnChangeTitleFont_Click(object sender, EventArgs e) {
-      fdFont.Font = propertiesModel.TitleFont;
-      fdFont.Color = propertiesModel.TitleColor;
+      fdFont.Font = viewSettings.TitleFont;
+      fdFont.Color = viewSettings.TitleColor;
 
       DialogResult dr = fdFont.ShowDialog();
 
       if(dr == DialogResult.OK) {
-        propertiesModel.TitleFont = fdFont.Font;
-        propertiesModel.TitleColor = fdFont.Color;
+        viewSettings.TitleFont = fdFont.Font;
+        viewSettings.TitleColor = fdFont.Color;
 
-        propertiesModel.UpdateView();
+        viewSettings.UpdateView();
       }
     }
 
     private void btnChangeLegendFont_Click(object sender, EventArgs e) {
-      fdFont.Font = propertiesModel.LegendFont;
-      fdFont.Color = propertiesModel.LegendColor;
+      fdFont.Font = viewSettings.LegendFont;
+      fdFont.Color = viewSettings.LegendColor;
 
       DialogResult dr = fdFont.ShowDialog();
 
       if (dr == DialogResult.OK) {
-        propertiesModel.LegendFont = fdFont.Font;
-        propertiesModel.LegendColor = fdFont.Color;
+        viewSettings.LegendFont = fdFont.Font;
+        viewSettings.LegendColor = fdFont.Color;
 
-        propertiesModel.UpdateView();
+        viewSettings.UpdateView();
       }
     }
 
     private void btnChangeXAxisFont_Click(object sender, EventArgs e) {
-      fdFont.Font = propertiesModel.XAxisFont;
-      fdFont.Color = propertiesModel.XAxisColor;
+      fdFont.Font = viewSettings.XAxisFont;
+      fdFont.Color = viewSettings.XAxisColor;
 
       DialogResult dr = fdFont.ShowDialog();
 
       if (dr == DialogResult.OK) {
-        propertiesModel.XAxisFont = fdFont.Font;
-        propertiesModel.XAxisColor = fdFont.Color;
+        viewSettings.XAxisFont = fdFont.Font;
+        viewSettings.XAxisColor = fdFont.Color;
 
-        propertiesModel.UpdateView();
+        viewSettings.UpdateView();
       }
     }