Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/21/15 14:18:31 (9 years ago)
Author:
jkarder
Message:

#1265: merged changes from abeham

Location:
branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IChart.cs

    r12536 r13045  
    2727namespace HeuristicLab.Visualization {
    2828  public interface IChart {
    29     ChartMode Mode { get; set; }
     29    bool Enabled { get; set; }
     30
    3031    PointD LowerLeft { get; }
    3132    PointD UpperRight { get; }
    … …  
    3536    SizeD WorldToPixelRatio { get; }
    3637    IGroup Group { get; }
    37     bool UpdateEnabled { get; }
    3838
    3939    PointD TransformPixelToWorld(Point point);
    … …  
    4343
    4444    void SetPosition(PointD lowerLeft, PointD upperRight);
    45     void SetPosition(double x1, double y1, double x2, double y2);
    4645    void Move(Offset delta);
    47     void Move(double dx, double dy);
    4846
     47    void ZoomIn(Point mousePosition);
    4948    void ZoomIn(PointD lowerLeft, PointD upperRight);
    50     void ZoomIn(double x1, double y1, double x2, double y2);
    5149    void ZoomIn(Point lowerLeft, Point upperRight);
    52     void ZoomIn(int x1, int y1, int x2, int y2);
    5350    void ZoomOut();
    5451    void Unzoom();
    5552
     53    void IntoForeground(IPrimitive primitive);
     54    void IntoBackground(IPrimitive primitive);
     55    void OneLayerUp(IPrimitive primitive);
     56    void OneLayerDown(IPrimitive primitive);
     57
     58    string GetToolTipText(Point point);
     59    Cursor GetCursor(Point point);
     60
    5661    IPrimitive GetPrimitive(Point point);
    57     IPrimitive GetPrimitive(int x, int y);
    58     IList<IPrimitive> GetAllPrimitives(Point point);
    59     IList<IPrimitive> GetAllPrimitives(int x, int y);
    60 
    61     Cursor GetCursor(Point point);
    62     Cursor GetCursor(int x, int y);
    63     string GetToolTipText(Point point);
    64     string GetToolTipText(int x, int y);
    65 
    66     void MouseClick(Point point, MouseButtons button);
    67     void MouseClick(int x, int y, MouseButtons button);
    68     void MouseDoubleClick(Point point, MouseButtons button);
    69     void MouseDoubleClick(int x, int y, MouseButtons button);
    70     void MouseMove(Point start, Point end);
    71     void MouseMove(int x1, int y1, int x2, int y2);
    72     void MouseDrag(Point start, Point end, MouseButtons button);
    73     void MouseDrag(int x1, int y1, int x2, int y2, MouseButtons button);
     62    IEnumerable<IPrimitive> GetAllPrimitives(Point point);
    7463
    7564    void Render(Graphics graphics, int width, int height);
    7665
    77     event EventHandler Update;
    78     void EnforceUpdate();
     66    event EventHandler RedrawRequired;
     67    void RaiseRedrawRequired();
    7968  }
    8069}

  • branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IGroup.cs

    r12535 r13045  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Collections.ObjectModel;
    25 using System.Text;
    2624
    2725namespace HeuristicLab.Visualization {
    28   public interface IGroup : IPrimitive {
    29     ReadOnlyCollection<IPrimitive> Primitives { get; }
    30     ReadOnlyCollection<IPrimitive> SelectedPrimitives { get; }
     26  public interface IGroup : IPrimitive, IEnumerable<IPrimitive> {
     27    IEnumerable<IPrimitive> Primitives { get; }
     28    IEnumerable<IPrimitive> SelectedPrimitives { get; }
    3129
    3230    void Add(IPrimitive primitive);
    … …  
    3735
    3836    IPrimitive GetPrimitive(PointD point);
    39     IPrimitive GetPrimitive(double x, double y);
    40     IList<IPrimitive> GetAllPrimitives(PointD point);
    41     IList<IPrimitive> GetAllPrimitives(double x, double y);
     37    IEnumerable<IPrimitive> GetAllPrimitives(PointD point);
    4238
    4339    void OneLayerUp(IPrimitive primitive);

  • branches/HeuristicLab.Visualization/HeuristicLab.Visualization/3.3/Interfaces/IPrimitive.cs

    r12535 r13045  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Text;
    2523using System.Drawing;
    2624using System.Windows.Forms;
    … …  
    2826namespace HeuristicLab.Visualization {
    2927  public interface IPrimitive {
    30     IChart Chart { get; }
    31     IGroup Group { get; set; }
    3228    Pen Pen { get; set; }
    3329    Brush Brush { get; set; }
    34     bool UpdateEnabled { get; }
    3530    bool Selected { get; set; }
    3631    string ToolTipText { get; set; }
    … …  
    3833
    3934    void Move(Offset delta);
    40     void Move(double dx, double dy);
     35    void Move(PointD point, Offset delta);
     36
     37    void SnapToGrid(IGrid grid);
     38    void SnapToGrid(PointD point, IGrid grid);
    4139
    4240    bool ContainsPoint(PointD point);
    43     bool ContainsPoint(double x, double y);
    44 
    4541    Cursor GetCursor(PointD point);
    46     Cursor GetCursor(double x, double y);
    4742    string GetToolTipText(PointD point);
    48     string GetToolTipText(double x, double y);
    49 
    50     void OneLayerUp();
    51     void OneLayerDown();
    52     void IntoForeground();
    53     void IntoBackground();
    54 
    55     void MouseClick(PointD point, MouseButtons button);
    56     void MouseClick(double x, double y, MouseButtons button);
    57     void MouseDoubleClick(PointD point, MouseButtons button);
    58     void MouseDoubleClick(double x, double y, MouseButtons button);
    59     void MouseMove(PointD point, Offset offset);
    60     void MouseMove(double x, double y, double dx, double dy);
    61     void MouseDrag(PointD point, Offset offset, MouseButtons button);
    62     void MouseDrag(double x, double y, double dx, double dy, MouseButtons button);
    6343
    6444    void PreDraw(Graphics graphics);
    … …  
    6646    void PostDraw(Graphics graphics);
    6747
    68     event EventHandler Update;
    69     void EnforceUpdate();
     48    event EventHandler RedrawRequired;
    7049  }
    7150}
Note: See TracChangeset for help on using the changeset viewer.