Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4637 for trunk/sources


Ignore:
Timestamp:
10/21/10 17:16:00 (14 years ago)
Author:
swagner
Message:

Worked on visual appearance of charts and added some minor corrections in HeuristicLab.Visualization.ChartControlsExtensions (#1237)

Location:
trunk/sources
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r4631 r4637  
    7373      chartArea1.Name = "Default";
    7474      this.chart.ChartAreas.Add(chartArea1);
     75      legend1.Alignment = System.Drawing.StringAlignment.Center;
    7576      legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
    7677      legend1.Name = "Default";
    … …  
    8182      this.chart.TabIndex = 0;
    8283      this.chart.Text = "chart";
     84      title1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    8385      title1.Name = "Default";
    8486      title1.Text = "Allele Frequencies";

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

    r4631 r4637  
    4242      InitializeComponent();
    4343      invisibleSeries = new List<Series>();
     44      chart.CustomizeAllChartAreas();
    4445    }
    4546

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

    r4636 r4637  
    4949      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    5050      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
     51      System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
    5152      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    5253      this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
    … …  
    7071      // chart
    7172      //
    72       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    73             | System.Windows.Forms.AnchorStyles.Left)
    74             | System.Windows.Forms.AnchorStyles.Right)));
     73      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     74                  | System.Windows.Forms.AnchorStyles.Left)
     75                  | System.Windows.Forms.AnchorStyles.Right)));
    7576      this.chart.BorderlineColor = System.Drawing.Color.Black;
    7677      this.chart.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid;
    … …  
    8283      this.chart.ChartAreas.Add(chartArea1);
    8384      this.chart.ContextMenuStrip = this.contextMenuStrip;
     85      legend1.Alignment = System.Drawing.StringAlignment.Center;
    8486      legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
    8587      legend1.Name = "Legend1";
    8688      this.chart.Legends.Add(legend1);
    87       this.chart.EnableDoubleClickResetsZoom = true;
    88       this.chart.EnableMiddleClickPanning = true;
    8989      this.chart.Location = new System.Drawing.Point(0, 52);
    9090      this.chart.Name = "chart";
    … …  
    9696      this.chart.TabIndex = 4;
    9797      this.chart.Text = "chart1";
     98      title1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     99      title1.Name = "Default";
     100      title1.Text = "Title";
     101      this.chart.Titles.Add(title1);
    98102      this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
    99103      this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);

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

    r4636 r4637  
    9191      base.OnContentChanged();
    9292      invisibleSeries.Clear();
    93       chart.Titles.Clear();
     93      chart.Titles[0].Text = string.Empty;
    9494      chart.Series.Clear();
    9595      if (Content != null) {
    96         chart.Titles.Add(new Title(Content.Name, Docking.Top));
     96        chart.Titles[0].Text = Content.Name;
    9797        foreach (DataRow row in Content.Rows)
    9898          AddDataRow(row);

  • trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs

    r4628 r4637  
    1 namespace HeuristicLab.Visualization.ChartControlsExtensions {
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22namespace HeuristicLab.Visualization.ChartControlsExtensions {
    223  partial class EnhancedChart {
    324    /// <summary>

  • trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs

    r4636 r4637  
    2525using System.Windows.Forms;
    2626using System.Windows.Forms.DataVisualization.Charting;
     27
    2728namespace HeuristicLab.Visualization.ChartControlsExtensions {
    2829  public partial class EnhancedChart : Chart {
    … …  
    4546        axis.MajorTickMark.TickMarkStyle = TickMarkStyle.AcrossAxis;
    4647        axis.ScrollBar.BackColor = Color.Transparent;
    47         axis.ScrollBar.LineColor = Color.Transparent;
     48        axis.ScrollBar.LineColor = Color.Gray;
    4849        axis.ScrollBar.ButtonColor = SystemColors.GradientInactiveCaption;
    49         axis.ScrollBar.ButtonStyle = ScrollBarButtonStyles.SmallScroll;
     50        axis.ScrollBar.ButtonStyle = ScrollBarButtonStyles.All;
    5051        axis.ScrollBar.Size = 12;
    5152        axis.TitleFont = new Font(axis.TitleFont.FontFamily, 10);
    5253      }
    53       chartArea.CursorX.Interval = 0;
    54       chartArea.CursorY.Interval = 0;
    5554      chartArea.CursorX.IsUserSelectionEnabled = true;
    5655      chartArea.CursorY.IsUserSelectionEnabled = true;
    5756      chartArea.CursorX.IsUserEnabled = false;
    5857      chartArea.CursorY.IsUserEnabled = false;
    59       chartArea.CursorX.SelectionColor = SystemColors.GradientActiveCaption;
    60       chartArea.CursorY.SelectionColor = SystemColors.GradientActiveCaption;
     58      chartArea.CursorX.SelectionColor = Color.Gray;
     59      chartArea.CursorY.SelectionColor = Color.Gray;
    6160    }
    6261
    … …  
    6766    }
    6867
    69     #region Mouse event ehancements
    70 
     68    #region Mouse Event Ehancements
    7169    protected override void OnMouseDoubleClick(MouseEventArgs e) {
    7270      if (EnableDoubleClickResetsZoom) {
    7371        HitTestResult result = HitTest(e.X, e.Y);
    74         if (result.ChartArea != null && result.ChartElementType == ChartElementType.PlottingArea) {
     72        if (result.ChartArea != null && (result.ChartElementType == ChartElementType.PlottingArea || result.ChartElementType == ChartElementType.Gridlines)) {
    7573          foreach (var axis in result.ChartArea.Axes)
    7674            axis.ScaleView.ZoomReset(int.MaxValue);
    … …  
    8078    }
    8179
    82     #region panning
     80    #region Panning
    8381    private class PanningSupport {
    8482      public ChartArea ChartArea { get; private set; }
    … …  
    140138    }
    141139    #endregion
    142 
    143140    #endregion
    144141

  • trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLabVisualizationChartControlsExtensionsPlugin.cs.frame

    r4614 r4637  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Tracing {
    25 
     24namespace HeuristicLab.Visualization.ChartControlsExtensions {
    2625  /// <summary>
    27   /// HeuristicLab Visualization ChartControls Extensions Plugin
     26  /// Plugin class for HeuristicLab.Visualization.ChartControlsExtensions plugin
    2827  /// </summary> 
    29   [Plugin("HeuristicLab.Visualization.ChartControlsExtensions", "3.3.1.$WCREV$")]
     28  [Plugin("HeuristicLab.Visualization.ChartControlsExtensions", "3.3.2.$WCREV$")]
    3029  [PluginFile("HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll", PluginFileType.Assembly)]
    31   public class HeuristicLabVisualizationChartControlsExtensions : PluginBase {}
    32 
     30  public class HeuristicLabVisualizationChartControlsExtensionsPlugin : PluginBase { }
    3331}

  • trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/Properties/AssemblyInfo.frame

    r4614 r4637  
    2828// associated with an assembly.
    2929[assembly: AssemblyTitle("HeuristicLab.Visualization.ChartControlsExtensions")]
    30 [assembly: AssemblyDescription("Extensions for the Microsoft ChartControls framework .")]
     30[assembly: AssemblyDescription("Extensions for the Microsoft Chart Controls.")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("")]
Note: See TracChangeset for help on using the changeset viewer.