moving path and matrix to refcounting as well, switching filling rule default to odd-even as dc.h does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
@@ -109,13 +109,124 @@ private :
|
||||
extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont;
|
||||
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject
|
||||
class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
|
||||
{
|
||||
public :
|
||||
wxGraphicsPath(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {}
|
||||
virtual ~wxGraphicsPath() {}
|
||||
|
||||
virtual wxGraphicsPath *Clone() const = 0;
|
||||
wxGraphicsMatrixData( wxGraphicsRenderer* renderer) :
|
||||
wxGraphicsObjectRefData(renderer) {}
|
||||
|
||||
virtual ~wxGraphicsMatrixData() {}
|
||||
|
||||
// concatenates the matrix
|
||||
virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
|
||||
|
||||
// sets the matrix to the respective values
|
||||
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) = 0;
|
||||
|
||||
// makes this the inverse matrix
|
||||
virtual void Invert() = 0;
|
||||
|
||||
// returns true if the elements of the transformation matrix are equal ?
|
||||
virtual bool IsEqual( const wxGraphicsMatrixData* t) const = 0;
|
||||
|
||||
// return true if this is the identity matrix
|
||||
virtual bool IsIdentity() const = 0;
|
||||
|
||||
//
|
||||
// transformation
|
||||
//
|
||||
|
||||
// add the translation to this matrix
|
||||
virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
|
||||
|
||||
// add the scale to this matrix
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
|
||||
|
||||
// add the rotation to this matrix (radians)
|
||||
virtual void Rotate( wxDouble angle ) = 0;
|
||||
|
||||
//
|
||||
// apply the transforms
|
||||
//
|
||||
|
||||
// applies that matrix to the point
|
||||
virtual void TransformPoint( wxDouble *x, wxDouble *y ) const = 0;
|
||||
|
||||
// applies the matrix except for translations
|
||||
virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const =0;
|
||||
|
||||
// returns the native representation
|
||||
virtual void * GetNativeMatrix() const = 0;
|
||||
} ;
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject
|
||||
{
|
||||
public :
|
||||
wxGraphicsMatrix() {}
|
||||
|
||||
virtual ~wxGraphicsMatrix() {}
|
||||
|
||||
// concatenates the matrix
|
||||
virtual void Concat( const wxGraphicsMatrix *t );
|
||||
void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); }
|
||||
|
||||
// sets the matrix to the respective values
|
||||
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0);
|
||||
|
||||
// makes this the inverse matrix
|
||||
virtual void Invert();
|
||||
|
||||
// returns true if the elements of the transformation matrix are equal ?
|
||||
virtual bool IsEqual( const wxGraphicsMatrix* t) const;
|
||||
bool IsEqual( const wxGraphicsMatrix& t) const { return IsEqual( &t ); }
|
||||
|
||||
// return true if this is the identity matrix
|
||||
virtual bool IsIdentity() const;
|
||||
|
||||
//
|
||||
// transformation
|
||||
//
|
||||
|
||||
// add the translation to this matrix
|
||||
virtual void Translate( wxDouble dx , wxDouble dy );
|
||||
|
||||
// add the scale to this matrix
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale );
|
||||
|
||||
// add the rotation to this matrix (radians)
|
||||
virtual void Rotate( wxDouble angle );
|
||||
|
||||
//
|
||||
// apply the transforms
|
||||
//
|
||||
|
||||
// applies that matrix to the point
|
||||
virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
|
||||
|
||||
// applies the matrix except for translations
|
||||
virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
|
||||
|
||||
// returns the native representation
|
||||
virtual void * GetNativeMatrix() const;
|
||||
|
||||
const wxGraphicsMatrixData* GetMatrixData() const
|
||||
{ return (const wxGraphicsMatrixData*) GetRefData(); }
|
||||
wxGraphicsMatrixData* GetMatrixData()
|
||||
{ return (wxGraphicsMatrixData*) GetRefData(); }
|
||||
|
||||
private :
|
||||
DECLARE_DYNAMIC_CLASS(wxGraphicsMatrix)
|
||||
} ;
|
||||
|
||||
extern WXDLLEXPORT_DATA(wxGraphicsMatrix) wxNullGraphicsMatrix;
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData
|
||||
{
|
||||
public :
|
||||
wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {}
|
||||
virtual ~wxGraphicsPathData() {}
|
||||
|
||||
//
|
||||
// These are the path primitives from which everything else can be constructed
|
||||
@@ -123,28 +234,97 @@ public :
|
||||
|
||||
// begins a new subpath at (x,y)
|
||||
virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0;
|
||||
void MoveToPoint( const wxPoint2DDouble& p);
|
||||
|
||||
// adds a straight line from the current point to (x,y)
|
||||
virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0;
|
||||
void AddLineToPoint( const wxPoint2DDouble& p);
|
||||
|
||||
// adds a cubic Bezier curve from the current point, using two control points and an end point
|
||||
virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0;
|
||||
void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);
|
||||
|
||||
|
||||
// adds another path
|
||||
virtual void AddPath( const wxGraphicsPath* path ) =0;
|
||||
virtual void AddPath( const wxGraphicsPathData* path ) =0;
|
||||
|
||||
// closes the current sub-path
|
||||
virtual void CloseSubpath() = 0;
|
||||
|
||||
// gets the last point of the current path, (0,0) if not yet set
|
||||
virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) = 0;
|
||||
wxPoint2DDouble GetCurrentPoint();
|
||||
virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const = 0;
|
||||
|
||||
// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
|
||||
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
|
||||
|
||||
//
|
||||
// These are convenience functions which - if not available natively will be assembled
|
||||
// using the primitives from above
|
||||
//
|
||||
|
||||
// adds a quadratic Bezier curve from the current point, using a control point and an end point
|
||||
virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
|
||||
|
||||
// appends a rectangle as a new closed subpath
|
||||
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||
|
||||
// appends an ellipsis as a new closed subpath fitting the passed rectangle
|
||||
virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
|
||||
|
||||
// appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
|
||||
virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
|
||||
|
||||
// appends an ellipse
|
||||
virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
|
||||
|
||||
// appends a rounded rectangle
|
||||
virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);
|
||||
|
||||
// returns the native path
|
||||
virtual void * GetNativePath() const = 0;
|
||||
|
||||
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
|
||||
virtual void UnGetNativePath(void *p) const= 0;
|
||||
|
||||
// transforms each point of this path by the matrix
|
||||
virtual void Transform( const wxGraphicsMatrixData* matrix ) =0;
|
||||
|
||||
// gets the bounding box enclosing all points (possibly including control points)
|
||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0;
|
||||
|
||||
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const=0;
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject
|
||||
{
|
||||
public :
|
||||
wxGraphicsPath() {}
|
||||
virtual ~wxGraphicsPath() {}
|
||||
|
||||
//
|
||||
// These are the path primitives from which everything else can be constructed
|
||||
//
|
||||
|
||||
// begins a new subpath at (x,y)
|
||||
virtual void MoveToPoint( wxDouble x, wxDouble y );
|
||||
void MoveToPoint( const wxPoint2DDouble& p);
|
||||
|
||||
// adds a straight line from the current point to (x,y)
|
||||
virtual void AddLineToPoint( wxDouble x, wxDouble y );
|
||||
void AddLineToPoint( const wxPoint2DDouble& p);
|
||||
|
||||
// adds a cubic Bezier curve from the current point, using two control points and an end point
|
||||
virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) ;
|
||||
void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);
|
||||
|
||||
// adds another path
|
||||
virtual void AddPath( const wxGraphicsPath& path );
|
||||
|
||||
// closes the current sub-path
|
||||
virtual void CloseSubpath() ;
|
||||
|
||||
// gets the last point of the current path, (0,0) if not yet set
|
||||
virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
|
||||
wxPoint2DDouble GetCurrentPoint() const;
|
||||
|
||||
// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
|
||||
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;
|
||||
void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
|
||||
|
||||
//
|
||||
@@ -171,86 +351,33 @@ public :
|
||||
virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);
|
||||
|
||||
// returns the native path
|
||||
virtual void * GetNativePath() const = 0;
|
||||
virtual void * GetNativePath() const;
|
||||
|
||||
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
|
||||
virtual void UnGetNativePath(void *p) = 0;
|
||||
virtual void UnGetNativePath(void *p)const;
|
||||
|
||||
// transforms each point of this path by the matrix
|
||||
virtual void Transform( wxGraphicsMatrix* matrix ) =0;
|
||||
virtual void Transform( const wxGraphicsMatrix& matrix );
|
||||
|
||||
// gets the bounding box enclosing all points (possibly including control points)
|
||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) =0;
|
||||
wxRect2DDouble GetBox();
|
||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
|
||||
wxRect2DDouble GetBox()const;
|
||||
|
||||
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) =0;
|
||||
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxWINDING_RULE);
|
||||
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
|
||||
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxGraphicsPath)
|
||||
DECLARE_ABSTRACT_CLASS(wxGraphicsPath)
|
||||
};
|
||||
const wxGraphicsPathData* GetPathData() const
|
||||
{ return (const wxGraphicsPathData*) GetRefData(); }
|
||||
wxGraphicsPathData* GetPathData()
|
||||
{ return (wxGraphicsPathData*) GetRefData(); }
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject
|
||||
{
|
||||
public :
|
||||
wxGraphicsMatrix(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {}
|
||||
|
||||
virtual ~wxGraphicsMatrix() {}
|
||||
|
||||
virtual wxGraphicsMatrix *Clone() const = 0;
|
||||
|
||||
// concatenates the matrix
|
||||
virtual void Concat( const wxGraphicsMatrix *t ) = 0;
|
||||
void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); }
|
||||
|
||||
// copies the passed in matrix
|
||||
virtual void Copy( const wxGraphicsMatrix *t ) = 0;
|
||||
void Copy( const wxGraphicsMatrix &t ) { Copy( &t ); }
|
||||
|
||||
// sets the matrix to the respective values
|
||||
virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) = 0;
|
||||
|
||||
// makes this the inverse matrix
|
||||
virtual void Invert() = 0;
|
||||
|
||||
// returns true if the elements of the transformation matrix are equal ?
|
||||
virtual bool IsEqual( const wxGraphicsMatrix* t) const = 0;
|
||||
bool IsEqual( const wxGraphicsMatrix& t) const { return IsEqual( &t ); }
|
||||
|
||||
// return true if this is the identity matrix
|
||||
virtual bool IsIdentity() = 0;
|
||||
|
||||
//
|
||||
// transformation
|
||||
//
|
||||
|
||||
// add the translation to this matrix
|
||||
virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
|
||||
|
||||
// add the scale to this matrix
|
||||
virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
|
||||
|
||||
// add the rotation to this matrix (radians)
|
||||
virtual void Rotate( wxDouble angle ) = 0;
|
||||
|
||||
//
|
||||
// apply the transforms
|
||||
//
|
||||
|
||||
// applies that matrix to the point
|
||||
virtual void TransformPoint( wxDouble *x, wxDouble *y ) = 0;
|
||||
|
||||
// applies the matrix except for translations
|
||||
virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) =0;
|
||||
|
||||
// returns the native representation
|
||||
virtual void * GetNativeMatrix() const = 0;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxGraphicsMatrix)
|
||||
DECLARE_ABSTRACT_CLASS(wxGraphicsMatrix)
|
||||
private :
|
||||
DECLARE_DYNAMIC_CLASS(wxGraphicsPath)
|
||||
} ;
|
||||
|
||||
extern WXDLLEXPORT_DATA(wxGraphicsPath) wxNullGraphicsPath;
|
||||
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGraphicsContext : public wxGraphicsObject
|
||||
{
|
||||
public:
|
||||
@@ -266,27 +393,27 @@ public:
|
||||
|
||||
static wxGraphicsContext* Create( wxWindow* window ) ;
|
||||
|
||||
wxGraphicsPath * CreatePath();
|
||||
wxGraphicsPath CreatePath() const;
|
||||
|
||||
virtual wxGraphicsPen CreatePen(const wxPen& pen);
|
||||
virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
|
||||
|
||||
virtual wxGraphicsBrush CreateBrush(const wxBrush& brush );
|
||||
virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) const;
|
||||
|
||||
// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
|
||||
virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
|
||||
const wxColour&c1, const wxColour&c2);
|
||||
const wxColour&c1, const wxColour&c2) const;
|
||||
|
||||
// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)
|
||||
// with radius r and color cColor
|
||||
virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
|
||||
const wxColour &oColor, const wxColour &cColor);
|
||||
const wxColour &oColor, const wxColour &cColor) const;
|
||||
|
||||
// sets the font
|
||||
virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK );
|
||||
virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const;
|
||||
|
||||
// create a 'native' matrix corresponding to these values
|
||||
virtual wxGraphicsMatrix* CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0);
|
||||
virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) const;
|
||||
|
||||
// push the current state of the context, ie the transformation matrix on a stack
|
||||
virtual void PushState() = 0;
|
||||
@@ -320,13 +447,13 @@ public:
|
||||
virtual void Rotate( wxDouble angle ) = 0;
|
||||
|
||||
// concatenates this transform with the current transform of this context
|
||||
virtual void ConcatTransform( const wxGraphicsMatrix* matrix ) = 0;
|
||||
virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) = 0;
|
||||
|
||||
// sets the transform of this context
|
||||
virtual void SetTransform( const wxGraphicsMatrix* matrix ) = 0;
|
||||
virtual void SetTransform( const wxGraphicsMatrix& matrix ) = 0;
|
||||
|
||||
// gets the matrix of this context
|
||||
virtual void GetTransform( wxGraphicsMatrix* matrix ) = 0;
|
||||
virtual wxGraphicsMatrix GetTransform() const = 0;
|
||||
//
|
||||
// setting the paint
|
||||
//
|
||||
@@ -348,13 +475,13 @@ public:
|
||||
|
||||
|
||||
// strokes along a path with the current pen
|
||||
virtual void StrokePath( const wxGraphicsPath *path ) = 0;
|
||||
virtual void StrokePath( const wxGraphicsPath& path ) = 0;
|
||||
|
||||
// fills a path with the current brush
|
||||
virtual void FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ) = 0;
|
||||
virtual void FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ) = 0;
|
||||
|
||||
// draws a path by first filling and then stroking
|
||||
virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
|
||||
virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE );
|
||||
|
||||
//
|
||||
// text
|
||||
@@ -391,7 +518,7 @@ public:
|
||||
virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
|
||||
|
||||
// draws a polygon
|
||||
virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxWINDING_RULE );
|
||||
virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE );
|
||||
|
||||
// draws a polygon
|
||||
virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
|
||||
@@ -480,11 +607,11 @@ public :
|
||||
|
||||
// Path
|
||||
|
||||
virtual wxGraphicsPath * CreatePath() = 0;
|
||||
virtual wxGraphicsPath CreatePath() = 0;
|
||||
|
||||
// Matrix
|
||||
|
||||
virtual wxGraphicsMatrix * CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
||||
wxDouble tx=0.0, wxDouble ty=0.0) = 0;
|
||||
|
||||
// Paints
|
||||
|
||||
Reference in New Issue
Block a user