Changeset 8942


Ignore:
Timestamp:
11/26/12 13:19:00 (10 years ago)
Author:
mkommend
Message:

#1763: Merged changes from TreeSimplifier branch to Encodings.symbolicExpressionTreeEncoding.Views.

Location:
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/Properties

    • Property svn:ignore
      --- 
      +++ 
      
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.Designer.cs

    r7967 r8942  
    2121
    2222namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
    23   partial class SymbolicExpressionTreeChart {
     23  public partial class SymbolicExpressionTreeChart {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    7070      //
    7171      this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|EMF (*.emf)|*.emf";
    72       this.saveFileDialog.FilterIndex = 1;     
     72      this.saveFileDialog.FilterIndex = 1;
    7373      // SymbolicExpressionTreeChart
    7474      //
     
    8989    #endregion
    9090
    91     private System.Windows.Forms.ToolTip toolTip;
    92     private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
    93     private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem;
    94     private System.Windows.Forms.SaveFileDialog saveFileDialog;
     91    protected System.Windows.Forms.ToolTip toolTip;
     92    protected System.Windows.Forms.ContextMenuStrip contextMenuStrip;
     93    protected System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem;
     94    protected System.Windows.Forms.SaveFileDialog saveFileDialog;
    9595  }
    9696}
  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

    r7259 r8942  
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
    29   public sealed partial class SymbolicExpressionTreeChart : UserControl {
     29  public partial class SymbolicExpressionTreeChart : UserControl {
    3030    private Image image;
    3131    private StringFormat stringFormat;
     
    3636      InitializeComponent();
    3737      this.image = new Bitmap(Width, Height);
    38       this.stringFormat = new StringFormat();
    39       this.stringFormat.Alignment = StringAlignment.Center;
    40       this.stringFormat.LineAlignment = StringAlignment.Center;
     38      this.stringFormat = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
    4139      this.spacing = 5;
    4240      this.lineColor = Color.Black;
     
    157155    #region events
    158156    public event MouseEventHandler SymbolicExpressionTreeNodeClicked;
    159     private void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
     157    protected virtual void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
    160158      var clicked = SymbolicExpressionTreeNodeClicked;
    161159      if (clicked != null)
     
    165163    private void SymbolicExpressionTreeChart_MouseClick(object sender, MouseEventArgs e) {
    166164      VisualSymbolicExpressionTreeNode visualTreeNode = FindVisualSymbolicExpressionTreeNodeAt(e.X, e.Y);
    167       if (visualTreeNode != null)
     165      if (visualTreeNode != null) {
    168166        OnSymbolicExpressionTreeNodeClicked(visualTreeNode, e);
     167      }
    169168    }
    170169
    171170    public event MouseEventHandler SymbolicExpressionTreeNodeDoubleClicked;
    172     private void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
     171    protected virtual void OnSymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
    173172      var doubleClicked = SymbolicExpressionTreeNodeDoubleClicked;
    174173      if (doubleClicked != null)
     
    183182
    184183    public event ItemDragEventHandler SymbolicExpressionTreeNodeDrag;
    185     private void OnSymbolicExpressionTreeNodeDragDrag(object sender, ItemDragEventArgs e) {
     184    protected virtual void OnSymbolicExpressionTreeNodeDragDrag(object sender, ItemDragEventArgs e) {
    186185      var dragged = SymbolicExpressionTreeNodeDrag;
    187186      if (dragged != null)
     
    234233    ///
    235234    /// </summary>
    236     /// <param name="functionTree"> functiontree to draw</param>
     235    /// <param name="functionTree"> function tree to draw</param>
    237236    /// <param name="graphics">graphics object to draw on</param>
    238237    /// <param name="x">x coordinate of drawing area</param>
Note: See TracChangeset for help on using the changeset viewer.