Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1964


Ignore:
Timestamp:
05/30/09 10:11:25 (16 years ago)
Author:
mstoeger
Message:

moved the canvas and the basic types of shapes to their own namespace. #498

Location:
trunk/sources
Files:
1 added
16 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Visualization.Test/3.2/LegendForm.Designer.cs

    r1530 r1964  
    1 namespace HeuristicLab.Visualization.Test {
     1using HeuristicLab.Visualization.Drawing;
     2
     3namespace HeuristicLab.Visualization.Test {
    24  partial class LegendForm {
    35    /// <summary>
    … …  
    2426    /// </summary>
    2527    private void InitializeComponent() {
    26       this.canvasUI = new HeuristicLab.Visualization.CanvasUI();
     28      this.canvasUI = new CanvasUI();
    2729      this.SuspendLayout();
    2830      //

  • trunk/sources/HeuristicLab.Visualization.Test/3.2/MainForm.Designer.cs

    r1530 r1964  
    1 namespace HeuristicLab.Visualization.Test {
     1using HeuristicLab.Visualization.Drawing;
     2
     3namespace HeuristicLab.Visualization.Test {
    24  partial class MainForm {
    35    /// <summary>
    … …  
    2426    /// </summary>
    2527    private void InitializeComponent() {
    26       this.canvasUI = new HeuristicLab.Visualization.CanvasUI();
     28      this.canvasUI = new CanvasUI();
    2729      this.label2 = new System.Windows.Forms.Label();
    2830      this.legendButton = new System.Windows.Forms.Button();
    … …  
    7375    #endregion
    7476
    75     private HeuristicLab.Visualization.CanvasUI canvasUI;
     77    private CanvasUI canvasUI;
    7678    private System.Windows.Forms.Label label2;
    7779    private System.Windows.Forms.Button legendButton;

  • trunk/sources/HeuristicLab.Visualization.Test/3.2/MainForm.cs

    r1530 r1964  
    22using System.Drawing;
    33using System.Windows.Forms;
     4using HeuristicLab.Visualization.Drawing;
    45
    56namespace HeuristicLab.Visualization.Test {

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/Canvas.cs

    r1884 r1964  
    44using System.Drawing.Drawing2D;
    55
    6 namespace HeuristicLab.Visualization {
     6namespace HeuristicLab.Visualization.Drawing {
    77  public class Canvas : IShape {
    88    private readonly WorldShape worldShape;

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/CanvasUI.Designer.cs

    r1884 r1964  
    1 namespace HeuristicLab.Visualization
    2 {
    3     partial class CanvasUI
     1namespace HeuristicLab.Visualization.Drawing {
     2  partial class CanvasUI
     3  {
     4    /// <summary>
     5    /// Required designer variable.
     6    /// </summary>
     7    private System.ComponentModel.IContainer components = null;
     8
     9    /// <summary>
     10    /// Clean up any resources being used.
     11    /// </summary>
     12    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     13    protected override void Dispose(bool disposing)
    414    {
    5         /// <summary>
    6         /// Required designer variable.
    7         /// </summary>
    8         private System.ComponentModel.IContainer components = null;
     15      if (disposing && (components != null))
     16      {
     17        components.Dispose();
     18      }
     19      base.Dispose(disposing);
     20    }
    921
    10         /// <summary>
    11         /// Clean up any resources being used.
    12         /// </summary>
    13         /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
    14         protected override void Dispose(bool disposing)
    15         {
    16             if (disposing && (components != null))
    17             {
    18                 components.Dispose();
    19             }
    20             base.Dispose(disposing);
    21         }
     22    #region Component Designer generated code
    2223
    23         #region Component Designer generated code
     24    /// <summary>
     25    /// Required method for Designer support - do not modify
     26    /// the contents of this method with the code editor.
     27    /// </summary>
     28    private void InitializeComponent()
     29    {
     30      this.SuspendLayout();
     31      //
     32      // CanvasUI
     33      //
     34      this.ResumeLayout(false);
    2435
    25         /// <summary>
    26         /// Required method for Designer support - do not modify
    27         /// the contents of this method with the code editor.
    28         /// </summary>
    29         private void InitializeComponent()
    30         {
    31           this.SuspendLayout();
    32           //
    33           // CanvasUI
    34           //
    35           this.ResumeLayout(false);
     36    }
    3637
    37         }
    38 
    39         #endregion
    40     }
     38    #endregion
     39  }
    4140}

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/CanvasUI.cs

    r1884 r1964  
    44using System.Windows.Forms;
    55
    6 namespace HeuristicLab.Visualization {
     6namespace HeuristicLab.Visualization.Drawing {
    77  public partial class CanvasUI : Control {
    88    private readonly Canvas canvas = new Canvas();
    … …  
    3131        base.OnPaint(pe);
    3232      } catch (Exception e) {
    33        Trace.WriteLine(e);
     33        Trace.WriteLine(e);
    3434      }
    3535    }

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/CompositeShape.cs

    r1884 r1964  
    33using System.Drawing;
    44
    5 namespace HeuristicLab.Visualization {
     5namespace HeuristicLab.Visualization.Drawing {
    66  public class CompositeShape : IShape {
    77    private IShape parent;
    … …  
    8585      foreach (var shape in shapes) {
    8686        boundingBox = new RectangleD(Math.Min(boundingBox.X1, shape.BoundingBox.X1),
    87                                     Math.Min(boundingBox.Y1, shape.BoundingBox.Y1),
    88                                     Math.Max(boundingBox.X2, shape.BoundingBox.X2),
    89                                     Math.Max(boundingBox.Y2, shape.BoundingBox.Y2));
     87                                     Math.Min(boundingBox.Y1, shape.BoundingBox.Y1),
     88                                     Math.Max(boundingBox.X2, shape.BoundingBox.X2),
     89                                     Math.Max(boundingBox.Y2, shape.BoundingBox.Y2));
    9090      }
    9191    }

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/IShape.cs

    r1884 r1964  
    11using System.Drawing;
    22
    3 namespace HeuristicLab.Visualization {
     3namespace HeuristicLab.Visualization.Drawing {
    44  /// <summary>
    55  /// This is the base interface that has to be implemented by all shapes.

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/Transform.cs

    r1884 r1964  
    11using System.Drawing;
    22
    3 namespace HeuristicLab.Visualization {
     3namespace HeuristicLab.Visualization.Drawing {
    44  /// <summary>
    55  /// GDI (or screen) coordinate system

  • trunk/sources/HeuristicLab.Visualization/3.2/Drawing/WorldShape.cs

    r1884 r1964  
    33using System.Drawing.Drawing2D;
    44
    5 namespace HeuristicLab.Visualization {
     5namespace HeuristicLab.Visualization.Drawing {
    66  /// <summary>
    77  /// World shapes are composite shapes that have their own coordinate system

  • trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

    r1962 r1964  
    8989    <Compile Include="AxisPosition.cs" />
    9090    <Compile Include="AxisTicks.cs" />
    91     <Compile Include="Canvas.cs" />
    92     <Compile Include="CanvasUI.cs">
     91    <Compile Include="Drawing\Canvas.cs" />
     92    <Compile Include="Drawing\CanvasUI.cs">
    9393      <SubType>Component</SubType>
    9494    </Compile>
    95     <Compile Include="CanvasUI.Designer.cs">
     95    <Compile Include="Drawing\CanvasUI.Designer.cs">
    9696      <DependentUpon>CanvasUI.cs</DependentUpon>
    9797    </Compile>
    … …  
    9999    <Compile Include="ChartDataRowsModel.cs" />
    100100    <Compile Include="ChartDataRowsModelDummy.cs" />
    101     <Compile Include="CompositeShape.cs" />
     101    <Compile Include="Drawing\CompositeShape.cs" />
    102102    <Compile Include="ChartDataRowsModelDataCollector.cs" />
    103103    <Compile Include="DataExport\CSVDataExport.cs" />
    … …  
    152152    <Compile Include="IChartDataRowsModel.cs" />
    153153    <Compile Include="IDataRow.cs" />
    154     <Compile Include="IShape.cs" />
     154    <Compile Include="Drawing\IShape.cs" />
    155155    <Compile Include="LineChart.cs">
    156156      <SubType>UserControl</SubType>
    … …  
    167167    <Compile Include="SizeD.cs" />
    168168    <Compile Include="TooltipListener.cs" />
    169     <Compile Include="Transform.cs" />
     169    <Compile Include="Drawing\Transform.cs" />
    170170    <Compile Include="Translate.cs" />
    171     <Compile Include="WorldShape.cs" />
     171    <Compile Include="Drawing\WorldShape.cs" />
    172172    <Compile Include="XAxis.cs" />
    173173    <Compile Include="XAxisGrid.cs" />

  • trunk/sources/HeuristicLab.Visualization/3.2/Legend/LegendShape.cs

    r1877 r1964  
    11using System.Collections.Generic;
    22using System.Drawing;
     3using HeuristicLab.Visualization.Drawing;
    34
    45namespace HeuristicLab.Visualization.Legend {

  • trunk/sources/HeuristicLab.Visualization/3.2/LineChart.Designer.cs

    r1781 r1964  
    11using System.Windows.Forms;
     2using HeuristicLab.Visualization.Drawing;
    23
    34namespace HeuristicLab.Visualization
    … …  
    3233        {
    3334          this.components = new System.ComponentModel.Container();
    34           this.canvasUI = new HeuristicLab.Visualization.CanvasUI();
     35          this.canvasUI = new CanvasUI();
    3536          this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
    3637          this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

  • trunk/sources/HeuristicLab.Visualization/3.2/LineChart.cs

    r1962 r1964  
    66using HeuristicLab.Core;
    77using HeuristicLab.Visualization.DataExport;
     8using HeuristicLab.Visualization.Drawing;
    89using HeuristicLab.Visualization.Legend;
    910using HeuristicLab.Visualization.Options;

  • trunk/sources/HeuristicLab.Visualization/3.2/LineShape.cs

    r1530 r1964  
    11using System.Drawing;
    22using System.Drawing.Drawing2D;
     3using HeuristicLab.Visualization.Drawing;
    34
    45namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/MarkerShape.cs

    r1559 r1964  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Drawing;
     1using System.Drawing;
    42using System.Drawing.Drawing2D;
    5 using System.Linq;
    6 using System.Text;
     3using HeuristicLab.Visualization.Drawing;
    74
    85namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/RectangleShape.cs

    r1530 r1964  
    11using System.Drawing;
     2using HeuristicLab.Visualization.Drawing;
    23
    34namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/TextShape.cs

    r1530 r1964  
    22using System.Drawing;
    33using System.Drawing.Drawing2D;
     4using HeuristicLab.Visualization.Drawing;
    45
    56namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/Translate.cs

    r1530 r1964  
    11using System.Drawing;
     2using HeuristicLab.Visualization.Drawing;
    23
    34namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/XAxis.cs

    r1530 r1964  
     1
    12using System.Drawing;
     3using HeuristicLab.Visualization.Drawing;
    24using HeuristicLab.Visualization.LabelProvider;
    35

  • trunk/sources/HeuristicLab.Visualization/3.2/XAxisGrid.cs

    r1876 r1964  
    11using System.Drawing;
     2using HeuristicLab.Visualization.Drawing;
    23
    34namespace HeuristicLab.Visualization {

  • trunk/sources/HeuristicLab.Visualization/3.2/YAxis.cs

    r1604 r1964  
    11using System;
    22using System.Drawing;
     3using HeuristicLab.Visualization.Drawing;
    34using HeuristicLab.Visualization.LabelProvider;
    45using HeuristicLab.Visualization.Test;

  • trunk/sources/HeuristicLab.Visualization/3.2/YAxisGrid.cs

    r1876 r1964  
    11using System.Drawing;
     2using HeuristicLab.Visualization.Drawing;
    23
    34namespace HeuristicLab.Visualization {
Note: See TracChangeset for help on using the changeset viewer.