beautify (b58c2a05) · Commits · Elphel / kicad-source-mirror

include/dcsvg.h

+301 −193

Original line number	Original line	Diff line number	Diff line
	@@ -11,10 +11,10 @@

	class wxSVGFileDC : public wxDC		class wxSVGFileDC : public wxDC
	{		{

	private:		private:
	wxFileOutputStream* m_outfile;		wxFileOutputStream* m_outfile;
	wxString m_filename;		wxString m_filename;

	//holds number of png format images we have		//holds number of png format images we have
	int m_sub_images;		int m_sub_images;
	bool m_OK, m_graphics_changed;		bool m_OK, m_graphics_changed;
	@@ -38,13 +38,17 @@ class wxSVGFileDC : public wxDC


	bool DoGetPixel( wxCoord, wxCoord, class wxColour* ) const		bool DoGetPixel( wxCoord, wxCoord, class wxColour* ) const
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; };		{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::DoGetPixel Call not implemented" ) ); return true;
			};

	virtual bool DoBlit( wxCoord, wxCoord, wxCoord, wxCoord, class wxDC*,		virtual bool DoBlit( wxCoord, wxCoord, wxCoord, wxCoord, class wxDC*,
	wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1 );		wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1 );

	void DoCrossHair( wxCoord, wxCoord )		void DoCrossHair( wxCoord, wxCoord )
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; };		{
			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 );

	@@ -62,26 +66,48 @@ class wxSVGFileDC : public wxDC

	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),		bool DoFloodFill( wxCoord WXUNUSED (x), wxCoord WXUNUSED (y), const wxColour& WXUNUSED (col),
	int WXUNUSED (style) = wxFLOOD_SURFACE )		int WXUNUSED (style) = wxFLOOD_SURFACE )
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; };		{
			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& )		void DoSetClippingRegionAsRegion( const class wxRegion& )
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; };		{
			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 );

	@@ -93,11 +119,14 @@ class wxSVGFileDC : public wxDC
	wxCoord XDEV2LOG( wxCoord x ) const		wxCoord XDEV2LOG( wxCoord x ) const
	{		{
	wxCoord new_x = x - m_deviceOriginX;		wxCoord new_x = x - m_deviceOriginX;

	if( new_x > 0 )		if( new_x > 0 )
	return (wxCoord) ( (double) (new_x) / m_scaleX + 0.5 ) * m_signX + m_logicalOriginX;		return (wxCoord) ( (double) (new_x) / m_scaleX + 0.5 ) * m_signX + m_logicalOriginX;
	else		else
	return (wxCoord) ( (double) (new_x) / m_scaleX - 0.5 ) * m_signX + m_logicalOriginX;		return (wxCoord) ( (double) (new_x) / m_scaleX - 0.5 ) * m_signX + m_logicalOriginX;
	}		}


	#ifdef XDEV2LOGREL		#ifdef XDEV2LOGREL
	#undef XDEV2LOGREL		#undef XDEV2LOGREL
	#endif		#endif
	@@ -108,17 +137,22 @@ class wxSVGFileDC : public wxDC
	else		else
	return (wxCoord) ( (double) (x) / m_scaleX - 0.5 );		return (wxCoord) ( (double) (x) / m_scaleX - 0.5 );
	}		}


	#ifdef YDEV2LOG		#ifdef YDEV2LOG
	#undef YDEV2LOG		#undef YDEV2LOG
	#endif		#endif
	wxCoord YDEV2LOG( wxCoord y ) const		wxCoord YDEV2LOG( wxCoord y ) const
	{		{
	wxCoord new_y = y - m_deviceOriginY;		wxCoord new_y = y - m_deviceOriginY;

	if( new_y > 0 )		if( new_y > 0 )
	return (wxCoord) ( (double) (new_y) / m_scaleY + 0.5 ) * m_signY + m_logicalOriginY;		return (wxCoord) ( (double) (new_y) / m_scaleY + 0.5 ) * m_signY + m_logicalOriginY;
	else		else
	return (wxCoord) ( (double) (new_y) / m_scaleY - 0.5 ) * m_signY + m_logicalOriginY;		return (wxCoord) ( (double) (new_y) / m_scaleY - 0.5 ) * m_signY + m_logicalOriginY;
	}		}


	#ifdef YDEV2LOGREL		#ifdef YDEV2LOGREL
	#undef YDEV2LOGREL		#undef YDEV2LOGREL
	#endif		#endif
	@@ -129,17 +163,22 @@ class wxSVGFileDC : public wxDC
	else		else
	return (wxCoord) ( (double) (y) / m_scaleY - 0.5 );		return (wxCoord) ( (double) (y) / m_scaleY - 0.5 );
	}		}


	#ifdef XLOG2DEV		#ifdef XLOG2DEV
	#undef XLOG2DEV		#undef XLOG2DEV
	#endif		#endif
	wxCoord XLOG2DEV( wxCoord x ) const		wxCoord XLOG2DEV( wxCoord x ) const
	{		{
	wxCoord new_x = x - m_logicalOriginX;		wxCoord new_x = x - m_logicalOriginX;

	if( new_x > 0 )		if( new_x > 0 )
	return (wxCoord) ( (double) (new_x) * m_scaleX + 0.5 ) * m_signX + m_deviceOriginX;		return (wxCoord) ( (double) (new_x) * m_scaleX + 0.5 ) * m_signX + m_deviceOriginX;
	else		else
	return (wxCoord) ( (double) (new_x) * m_scaleX - 0.5 ) * m_signX + m_deviceOriginX;		return (wxCoord) ( (double) (new_x) * m_scaleX - 0.5 ) * m_signX + m_deviceOriginX;
	}		}


	#ifdef XLOG2DEVREL		#ifdef XLOG2DEVREL
	#undef XLOG2DEVREL		#undef XLOG2DEVREL
	#endif		#endif
	@@ -150,17 +189,22 @@ class wxSVGFileDC : public wxDC
	else		else
	return (wxCoord) ( (double) (x) * m_scaleX - 0.5 );		return (wxCoord) ( (double) (x) * m_scaleX - 0.5 );
	}		}


	#ifdef YLOG2DEV		#ifdef YLOG2DEV
	#undef YLOG2DEV		#undef YLOG2DEV
	#endif		#endif
	wxCoord YLOG2DEV( wxCoord y ) const		wxCoord YLOG2DEV( wxCoord y ) const
	{		{
	wxCoord new_y = y - m_logicalOriginY;		wxCoord new_y = y - m_logicalOriginY;

	if( new_y > 0 )		if( new_y > 0 )
	return (wxCoord) ( (double) (new_y) * m_scaleY + 0.5 ) * m_signY + m_deviceOriginY;		return (wxCoord) ( (double) (new_y) * m_scaleY + 0.5 ) * m_signY + m_deviceOriginY;
	else		else
	return (wxCoord) ( (double) (new_y) * m_scaleY - 0.5 ) * m_signY + m_deviceOriginY;		return (wxCoord) ( (double) (new_y) * m_scaleY - 0.5 ) * m_signY + m_deviceOriginY;
	}		}


	#ifdef YLOG2DEVREL		#ifdef YLOG2DEVREL
	#undef YLOG2DEVREL		#undef YLOG2DEVREL
	#endif		#endif
	@@ -172,6 +216,7 @@ class wxSVGFileDC : public wxDC
	return (wxCoord) ( (double) (y) * m_scaleY - 0.5 );		return (wxCoord) ( (double) (y) * m_scaleY - 0.5 );
	}		}


	void write( const wxString& s );		void write( const wxString& s );

	public:		public:
	@@ -182,28 +227,57 @@ class wxSVGFileDC : public wxDC
	~wxSVGFileDC();		~wxSVGFileDC();


	bool CanDrawBitmap() const { return true; };		bool CanDrawBitmap() const
			{
			return true;
			};

	bool CanGetTextExtent() const { return true; };		bool CanGetTextExtent() const
			{
			return true;
			};

	int GetDepth() const		int GetDepth() const
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };		{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetDepth Call not implemented" ) ); return -1;
			};

	void BeginDrawing() { return;};		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)		bool Blit( wxCoord xdest,
	{ return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); };		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()		void Clear()
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };		{
			wxASSERT_MSG( false,
			wxT( "wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?" ) );
			return;
			};

	void CrossHair( wxCoord x, wxCoord y )		void CrossHair( wxCoord x, wxCoord y )
	{ DoCrossHair (x,y); return; };		{
			DoCrossHair( x, y ); return;
			};

	virtual void ComputeScaleAndOrigin();		virtual void ComputeScaleAndOrigin();

	void DestroyClippingRegion()		void DestroyClippingRegion()
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };		{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::void Call not yet implemented" ) ); return;
			};

	wxCoord DeviceToLogicalX( wxCoord x ) const;		wxCoord DeviceToLogicalX( wxCoord x ) const;

	@@ -214,39 +288,60 @@ class wxSVGFileDC : public wxDC
	wxCoord DeviceToLogicalYRel( wxCoord y ) const;		wxCoord DeviceToLogicalYRel( wxCoord y ) const;

	void DrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent )		void DrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent )
	{ DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};		{
			DoDrawBitmap( bitmap, x, y, transparent ); return;
			};

	void DrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )		void DrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
	{DoDrawIcon(icon, x, y) ; return ; };		{
			DoDrawIcon( icon, x, y ); return;
			};

	void DoDrawLines( int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0 );		void DoDrawLines( int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0 );

	void EndDoc()		void EndDoc()
	{ return ; };		{
			return;
			};

	void EndDrawing()		void EndDrawing()
	{ return ; };		{
			return;
			};

	void EndPage()		void EndPage()
	{ return ; };		{
			return;
			};

	void FloodFill( wxCoord x, wxCoord y, wxColour* colour, int style = wxFLOOD_SURFACE )		void FloodFill( wxCoord x, wxCoord y, wxColour* colour, int style = wxFLOOD_SURFACE )
	{ DoFloodFill (x, y, *colour, style); return ;} ;		{
			DoFloodFill( x, y, *colour, style ); return;
			};

	wxCoord GetCharHeight() const;		wxCoord GetCharHeight() const;

	wxCoord GetCharWidth() const;		wxCoord GetCharWidth() const;

	void GetClippingBox(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))		void GetClippingBox( wxCoord* WXUNUSED (x), wxCoord* WXUNUSED (y), wxCoord* WXUNUSED (width),
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };		wxCoord* WXUNUSED (height) )
			{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetClippingBox Call not yet implemented" ) );
			return;
			};

	int GetLogicalFunction()		int GetLogicalFunction()
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; };		{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::GetLogicalFunction() Call not implemented" ) );
			return wxCOPY;
			};

	int GetMapMode();		int GetMapMode();

	bool GetPixel( wxCoord x, wxCoord y, wxColour* colour )		bool GetPixel( wxCoord x, wxCoord y, wxColour* colour )
	{ return DoGetPixel (x, y, colour) ; } ;		{
			return DoGetPixel( x, y, colour );
			};

	void GetUserScale( double* x, double* y ) const;		void GetUserScale( double* x, double* y ) const;

	@@ -258,15 +353,24 @@ class wxSVGFileDC : public wxDC

	wxCoord LogicalToDeviceYRel( wxCoord y ) const;		wxCoord LogicalToDeviceYRel( wxCoord y ) const;

	bool Ok() const {return m_OK;};		bool Ok() const
			{
			return m_OK;
			};

	void SetAxisOrientation( bool xLeftRight, bool yBottomUp );		void SetAxisOrientation( bool xLeftRight, bool yBottomUp );

	void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height))		void SetClippingRegion( wxCoord WXUNUSED (x), wxCoord WXUNUSED (y), wxCoord WXUNUSED (width),
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };		wxCoord WXUNUSED (height) )
			{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::SetClippingRegion Call not yet implemented" ) );
			return;
			};

	void SetPalette( const wxPalette& WXUNUSED (palette) )		void SetPalette( const wxPalette& WXUNUSED (palette) )
	{ wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };		{
			wxASSERT_MSG( false, wxT( "wxSVGFILEDC::SetPalette Call not yet implemented" ) ); return;
			};

	void SetBackground( const wxBrush& brush );		void SetBackground( const wxBrush& brush );

	@@ -277,7 +381,9 @@ class wxSVGFileDC : public wxDC
	void SetFont( const wxFont& font );		void SetFont( const wxFont& font );

	void SetLogicalFunction( int WXUNUSED (function) )		void SetLogicalFunction( int WXUNUSED (function) )
	{ /wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); / return ; };		{ /wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); /
			return;
			};

	void SetLogicalScale( double x, double y );		void SetLogicalScale( double x, double y );

	@@ -292,12 +398,14 @@ class wxSVGFileDC : public wxDC
	void SetUserScale( double xScale, double yScale );		void SetUserScale( double xScale, double yScale );

	bool StartDoc( const wxString& WXUNUSED (message) )		bool StartDoc( const wxString& WXUNUSED (message) )
	{ return false; };		{
			return false;
			};

	void StartPage()		void StartPage()
	{ return ; };		{
			return;
			};
	};		};

	#ifdef __BORLANDC__		#ifdef __BORLANDC__

Admin message