From b58c2a0554facd3940985a9e69af14543ec0f2e9 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Thu, 6 Mar 2008 01:45:39 +0000 Subject: [PATCH] beautify --- include/dcsvg.h | 570 ++++++++++++++++++++++++++++-------------------- 1 file changed, 339 insertions(+), 231 deletions(-) diff --git a/include/dcsvg.h b/include/dcsvg.h index 1dc06358b6..5974c4028e 100644 --- a/include/dcsvg.h +++ b/include/dcsvg.h @@ -3,7 +3,7 @@ #include "wx/wfstream.h" #include "wx/string.h" -#define wxSVGVersion wxT("v0101") +#define wxSVGVersion wxT( "v0101" ) #ifdef __BORLANDC__ #pragma warn -rch #pragma warn -ccc @@ -11,293 +11,401 @@ class wxSVGFileDC : public wxDC { +private: + wxFileOutputStream* m_outfile; + wxString m_filename; - private: - wxFileOutputStream * m_outfile ; - wxString m_filename ; - //holds number of png format images we have - int m_sub_images ; - bool m_OK, m_graphics_changed ; - int m_width, m_height ; + //holds number of png format images we have + int m_sub_images; + bool m_OK, m_graphics_changed; + int m_width, m_height; - double - m_logicalScaleX, - m_logicalScaleY, - m_userScaleX, - m_userScaleY, - m_scaleX, - m_scaleY, - m_OriginX, - m_OriginY, - m_mm_to_pix_x, - m_mm_to_pix_y; + double + m_logicalScaleX, + m_logicalScaleY, + m_userScaleX, + m_userScaleY, + m_scaleX, + m_scaleY, + m_OriginX, + m_OriginY, + m_mm_to_pix_x, + m_mm_to_pix_y; - bool - m_needComputeScaleX, - m_needComputeScaleY; // not yet used + bool + m_needComputeScaleX, + m_needComputeScaleY; // not yet used - bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; }; + bool DoGetPixel( wxCoord, wxCoord, class wxColour* ) const + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::DoGetPixel Call not implemented" ) ); return true; + }; - virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *, - wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ; + virtual bool DoBlit( wxCoord, wxCoord, wxCoord, wxCoord, class wxDC*, + wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1 ); - void DoCrossHair(wxCoord, wxCoord) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; }; + void DoCrossHair( wxCoord, wxCoord ) + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::CrossHair Call not implemented" ) ); return; + }; - void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord); + void DoDrawArc( wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord ); - void DoDrawBitmap(const class wxBitmap &, wxCoord, wxCoord, bool = 0) ; + void DoDrawBitmap( const class wxBitmap&, wxCoord, wxCoord, bool = 0 ); - void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ; + void DoDrawCheckMark( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ; + void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) ; + void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea ); - void DoDrawIcon(const class wxIcon &, wxCoord, wxCoord) ; + void DoDrawIcon( const class wxIcon&, wxCoord, wxCoord ); - void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ; + void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); - void DoDrawPoint(wxCoord, wxCoord) ; + void DoDrawPoint( wxCoord, wxCoord ); - void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) ; + void DoDrawPolygon( int n, + wxPoint points[], + wxCoord xoffset, + wxCoord yoffset, + int fillStyle ); - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ; + void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) ; + void DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ); - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20) ; + void DoDrawRoundedRectangle( wxCoord x, + wxCoord y, + wxCoord width, + wxCoord height, + double radius = 20 ); - void DoDrawText(const wxString& text, wxCoord x, wxCoord y); + void DoDrawText( const wxString& text, wxCoord x, wxCoord y ); - bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col), - int WXUNUSED(style) = wxFLOOD_SURFACE) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; }; + bool DoFloodFill( wxCoord WXUNUSED (x), wxCoord WXUNUSED (y), const wxColour& WXUNUSED (col), + int WXUNUSED (style) = wxFLOOD_SURFACE ) + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::DoFloodFill Call not implemented" ) ); + return false; + }; - void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ; + void DoGetSize( int* x, int* y ) const + { + *x = m_width; *y = m_height; return; + }; - void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ; + void DoGetTextExtent( const wxString& string, + wxCoord* w, + wxCoord* h, + wxCoord* descent = NULL, + wxCoord* externalLeading = NULL, + wxFont* font = NULL ) const; - void DoSetClippingRegionAsRegion(const class wxRegion &) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; }; + void DoSetClippingRegionAsRegion( const class wxRegion& ) + { + wxASSERT_MSG( false, + wxT( "wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented" ) ); return; + }; - void Init (wxString f, int Width, int Height, float dpi); + void Init( wxString f, int Width, int Height, float dpi ); - void NewGraphics () ; + void NewGraphics(); #ifdef XDEV2LOG #undef XDEV2LOG #endif - wxCoord XDEV2LOG(wxCoord x) const - { - wxCoord new_x = x - m_deviceOriginX; - if (new_x > 0) - return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; - else - return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; - } + wxCoord XDEV2LOG( wxCoord x ) const + { + wxCoord new_x = x - m_deviceOriginX; + + if( new_x > 0 ) + return (wxCoord) ( (double) (new_x) / m_scaleX + 0.5 ) * m_signX + m_logicalOriginX; + else + return (wxCoord) ( (double) (new_x) / m_scaleX - 0.5 ) * m_signX + m_logicalOriginX; + } + + #ifdef XDEV2LOGREL #undef XDEV2LOGREL #endif - wxCoord XDEV2LOGREL(wxCoord x) const - { - if (x > 0) - return (wxCoord)((double)(x) / m_scaleX + 0.5); - else - return (wxCoord)((double)(x) / m_scaleX - 0.5); - } + wxCoord XDEV2LOGREL( wxCoord x ) const + { + if( x > 0 ) + return (wxCoord) ( (double) (x) / m_scaleX + 0.5 ); + else + return (wxCoord) ( (double) (x) / m_scaleX - 0.5 ); + } + + #ifdef YDEV2LOG #undef YDEV2LOG #endif - wxCoord YDEV2LOG(wxCoord y) const - { - wxCoord new_y = y - m_deviceOriginY; - if (new_y > 0) - return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; - else - return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; - } + wxCoord YDEV2LOG( wxCoord y ) const + { + wxCoord new_y = y - m_deviceOriginY; + + if( new_y > 0 ) + return (wxCoord) ( (double) (new_y) / m_scaleY + 0.5 ) * m_signY + m_logicalOriginY; + else + return (wxCoord) ( (double) (new_y) / m_scaleY - 0.5 ) * m_signY + m_logicalOriginY; + } + + #ifdef YDEV2LOGREL #undef YDEV2LOGREL #endif - wxCoord YDEV2LOGREL(wxCoord y) const - { - if (y > 0) - return (wxCoord)((double)(y) / m_scaleY + 0.5); - else - return (wxCoord)((double)(y) / m_scaleY - 0.5); - } + wxCoord YDEV2LOGREL( wxCoord y ) const + { + if( y > 0 ) + return (wxCoord) ( (double) (y) / m_scaleY + 0.5 ); + else + return (wxCoord) ( (double) (y) / m_scaleY - 0.5 ); + } + + #ifdef XLOG2DEV #undef XLOG2DEV #endif - wxCoord XLOG2DEV(wxCoord x) const - { - wxCoord new_x = x - m_logicalOriginX; - if (new_x > 0) - return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; - else - return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX; - } + wxCoord XLOG2DEV( wxCoord x ) const + { + wxCoord new_x = x - m_logicalOriginX; + + if( new_x > 0 ) + return (wxCoord) ( (double) (new_x) * m_scaleX + 0.5 ) * m_signX + m_deviceOriginX; + else + return (wxCoord) ( (double) (new_x) * m_scaleX - 0.5 ) * m_signX + m_deviceOriginX; + } + + #ifdef XLOG2DEVREL #undef XLOG2DEVREL #endif - wxCoord XLOG2DEVREL(wxCoord x) const - { - if (x > 0) - return (wxCoord)((double)(x) * m_scaleX + 0.5); - else - return (wxCoord)((double)(x) * m_scaleX - 0.5); - } + wxCoord XLOG2DEVREL( wxCoord x ) const + { + if( x > 0 ) + return (wxCoord) ( (double) (x) * m_scaleX + 0.5 ); + else + return (wxCoord) ( (double) (x) * m_scaleX - 0.5 ); + } + + #ifdef YLOG2DEV #undef YLOG2DEV #endif - wxCoord YLOG2DEV(wxCoord y) const - { - wxCoord new_y = y - m_logicalOriginY; - if (new_y > 0) - return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; - else - return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY; - } + wxCoord YLOG2DEV( wxCoord y ) const + { + wxCoord new_y = y - m_logicalOriginY; + + if( new_y > 0 ) + return (wxCoord) ( (double) (new_y) * m_scaleY + 0.5 ) * m_signY + m_deviceOriginY; + else + return (wxCoord) ( (double) (new_y) * m_scaleY - 0.5 ) * m_signY + m_deviceOriginY; + } + + #ifdef YLOG2DEVREL #undef YLOG2DEVREL #endif - wxCoord YLOG2DEVREL(wxCoord y) const - { - if (y > 0) - return (wxCoord)((double)(y) * m_scaleY + 0.5); - else - return (wxCoord)((double)(y) * m_scaleY - 0.5); - } - - void write(const wxString &s); - - public: - - wxSVGFileDC (wxString f); - wxSVGFileDC (wxString f, int Width, int Height); - wxSVGFileDC (wxString f, int Width, int Height, float dpi); - ~wxSVGFileDC(); + wxCoord YLOG2DEVREL( wxCoord y ) const + { + if( y > 0 ) + return (wxCoord) ( (double) (y) * m_scaleY + 0.5 ); + else + return (wxCoord) ( (double) (y) * m_scaleY - 0.5 ); + } - bool CanDrawBitmap() const { return true; }; + void write( const wxString& s ); - bool CanGetTextExtent() const { return true; }; +public: - int GetDepth() const - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; }; - - void BeginDrawing() { return;}; - - bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false) - { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); }; - - void Clear() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; }; - - void CrossHair(wxCoord x, wxCoord y) - { DoCrossHair (x,y); return; }; - - virtual void ComputeScaleAndOrigin(); - - void DestroyClippingRegion() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; }; - - wxCoord DeviceToLogicalX(wxCoord x) const ; - - wxCoord DeviceToLogicalXRel(wxCoord x) const ; - - wxCoord DeviceToLogicalY(wxCoord y) const ; - - wxCoord DeviceToLogicalYRel(wxCoord y) const ; - - void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) - { DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;}; - - void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) - {DoDrawIcon(icon, x, y) ; return ; }; - - void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ; - - void EndDoc() - { return ; }; - - void EndDrawing() - { return ; }; - - void EndPage() - { return ; }; - - void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE) - { DoFloodFill (x, y, *colour, style); return ;} ; - - wxCoord GetCharHeight() const; - - wxCoord GetCharWidth() const; - - void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; }; - - int GetLogicalFunction() - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; }; - - int GetMapMode() ; - - bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) - { return DoGetPixel (x, y, colour) ; } ; - - void GetUserScale(double *x, double *y) const ; - - wxCoord LogicalToDeviceX(wxCoord x) const ; - - wxCoord LogicalToDeviceXRel(wxCoord x) const ; - - wxCoord LogicalToDeviceY(wxCoord y) const ; - - wxCoord LogicalToDeviceYRel(wxCoord y) const ; - - bool Ok() const {return m_OK;}; - - void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ; - - void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; }; - - void SetPalette(const wxPalette& WXUNUSED(palette)) - { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; }; - - void SetBackground( const wxBrush &brush ) ; - - void SetBackgroundMode( int mode ) ; - - void SetBrush(const wxBrush& brush) ; - - void SetFont(const wxFont& font) ; - - void SetLogicalFunction(int WXUNUSED(function)) - { /*wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); */ return ; }; - - void SetLogicalScale( double x, double y ) ; - - void SetLogicalOrigin( wxCoord x, wxCoord y ) ; - - void SetDeviceOrigin( wxCoord x, wxCoord y ) ; - - void SetMapMode(int anint) ; - - void SetPen(const wxPen& pen) ; - - void SetUserScale(double xScale, double yScale) ; - - bool StartDoc(const wxString& WXUNUSED(message)) - { return false; }; - - void StartPage() - { return ; }; + wxSVGFileDC( wxString f ); + wxSVGFileDC( wxString f, int Width, int Height ); + wxSVGFileDC( wxString f, int Width, int Height, float dpi ); + ~wxSVGFileDC(); + bool CanDrawBitmap() const + { + return true; + }; + + bool CanGetTextExtent() const + { + return true; + }; + + int GetDepth() const + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetDepth Call not implemented" ) ); return -1; + }; + + void BeginDrawing() + { + return; + }; + + bool Blit( wxCoord xdest, + wxCoord ydest, + wxCoord width, + wxCoord height, + wxDC* source, + wxCoord xsrc, + wxCoord ysrc, + int logicalFunc = wxCOPY, + bool useMask = false ) + { + return DoBlit( xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask ); + }; + + void Clear() + { + wxASSERT_MSG( false, + wxT( "wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?" ) ); + return; + }; + + void CrossHair( wxCoord x, wxCoord y ) + { + DoCrossHair( x, y ); return; + }; + + virtual void ComputeScaleAndOrigin(); + + void DestroyClippingRegion() + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::void Call not yet implemented" ) ); return; + }; + + wxCoord DeviceToLogicalX( wxCoord x ) const; + + wxCoord DeviceToLogicalXRel( wxCoord x ) const; + + wxCoord DeviceToLogicalY( wxCoord y ) const; + + wxCoord DeviceToLogicalYRel( wxCoord y ) const; + + void DrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent ) + { + DoDrawBitmap( bitmap, x, y, transparent ); return; + }; + + void DrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) + { + DoDrawIcon( icon, x, y ); return; + }; + + void DoDrawLines( int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0 ); + + void EndDoc() + { + return; + }; + + void EndDrawing() + { + return; + }; + + void EndPage() + { + return; + }; + + void FloodFill( wxCoord x, wxCoord y, wxColour* colour, int style = wxFLOOD_SURFACE ) + { + DoFloodFill( x, y, *colour, style ); return; + }; + + wxCoord GetCharHeight() const; + + wxCoord GetCharWidth() const; + + void GetClippingBox( wxCoord* WXUNUSED (x), wxCoord* WXUNUSED (y), wxCoord* WXUNUSED (width), + wxCoord* WXUNUSED (height) ) + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetClippingBox Call not yet implemented" ) ); + return; + }; + + int GetLogicalFunction() + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetLogicalFunction() Call not implemented" ) ); + return wxCOPY; + }; + + int GetMapMode(); + + bool GetPixel( wxCoord x, wxCoord y, wxColour* colour ) + { + return DoGetPixel( x, y, colour ); + }; + + void GetUserScale( double* x, double* y ) const; + + wxCoord LogicalToDeviceX( wxCoord x ) const; + + wxCoord LogicalToDeviceXRel( wxCoord x ) const; + + wxCoord LogicalToDeviceY( wxCoord y ) const; + + wxCoord LogicalToDeviceYRel( wxCoord y ) const; + + bool Ok() const + { + return m_OK; + }; + + void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); + + void SetClippingRegion( wxCoord WXUNUSED (x), wxCoord WXUNUSED (y), wxCoord WXUNUSED (width), + wxCoord WXUNUSED (height) ) + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::SetClippingRegion Call not yet implemented" ) ); + return; + }; + + void SetPalette( const wxPalette& WXUNUSED (palette) ) + { + wxASSERT_MSG( false, wxT( "wxSVGFILEDC::SetPalette Call not yet implemented" ) ); return; + }; + + void SetBackground( const wxBrush& brush ); + + void SetBackgroundMode( int mode ); + + void SetBrush( const wxBrush& brush ); + + void SetFont( const wxFont& font ); + + void SetLogicalFunction( int WXUNUSED (function) ) + { /*wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); */ + return; + }; + + void SetLogicalScale( double x, double y ); + + void SetLogicalOrigin( wxCoord x, wxCoord y ); + + void SetDeviceOrigin( wxCoord x, wxCoord y ); + + void SetMapMode( int anint ); + + void SetPen( const wxPen& pen ); + + void SetUserScale( double xScale, double yScale ); + + bool StartDoc( const wxString& WXUNUSED (message) ) + { + return false; + }; + + void StartPage() + { + return; + }; }; #ifdef __BORLANDC__