haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GalType -> GAL_TYPE

This commit is contained in:
Maciej Suminski 2015-08-07 18:24:43 +02:00
parent f43510739c
commit ddcdda1a59
4 changed files with 9 additions and 9 deletions

4
common/draw_panel_gal.cpp
View File

@ -51,7 +51,7 @@
EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId,
const wxPoint& aPosition, const wxSize& aSize, const wxPoint& aPosition, const wxSize& aSize,
GalType aGalType ) : GAL_TYPE aGalType ) :
wxScrolledCanvas( aParentWindow, aWindowId, aPosition, aSize ) wxScrolledCanvas( aParentWindow, aWindowId, aPosition, aSize )
{ {
m_parent = aParentWindow; m_parent = aParentWindow;
@ -266,7 +266,7 @@ double EDA_DRAW_PANEL_GAL::GetLegacyZoom() const
} }
bool EDA_DRAW_PANEL_GAL::SwitchBackend( GalType aGalType ) bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
{ {
// Do not do anything if the currently used GAL is correct // Do not do anything if the currently used GAL is correct
if( aGalType == m_backend && m_gal != NULL ) if( aGalType == m_backend && m_gal != NULL )

10
include/class_draw_panel_gal.h
View File

@ -52,14 +52,14 @@ class PAINTER;
class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas
{ {
public: public:
enum GalType { enum GAL_TYPE {
GAL_TYPE_NONE, ///< Not used GAL_TYPE_NONE, ///< Not used
GAL_TYPE_OPENGL, ///< OpenGL implementation GAL_TYPE_OPENGL, ///< OpenGL implementation
GAL_TYPE_CAIRO, ///< Cairo implementation GAL_TYPE_CAIRO, ///< Cairo implementation
}; };
EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition, EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition,
const wxSize& aSize, GalType aGalType = GAL_TYPE_OPENGL ); const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL );
~EDA_DRAW_PANEL_GAL(); ~EDA_DRAW_PANEL_GAL();
/** /**
@ -67,13 +67,13 @@ public:
* Switches method of rendering graphics. * Switches method of rendering graphics.
* @param aGalType is a type of rendering engine that you want to use. * @param aGalType is a type of rendering engine that you want to use.
*/ */
bool SwitchBackend( GalType aGalType ); bool SwitchBackend( GAL_TYPE aGalType );
/** /**
* Function GetBackend * Function GetBackend
* Returns the type of backend currently used by GAL canvas. * Returns the type of backend currently used by GAL canvas.
*/ */
inline GalType GetBackend() const inline GAL_TYPE GetBackend() const
{ {
return m_backend; return m_backend;
} }
@ -200,7 +200,7 @@ protected:
KIGFX::WX_VIEW_CONTROLS* m_viewControls; KIGFX::WX_VIEW_CONTROLS* m_viewControls;
/// Currently used GAL /// Currently used GAL
GalType m_backend; GAL_TYPE m_backend;
/// Processes and forwards events to tools /// Processes and forwards events to tools
TOOL_DISPATCHER* m_eventDispatcher; TOOL_DISPATCHER* m_eventDispatcher;

2
pcbnew/pcb_draw_panel_gal.cpp
View File

@ -99,7 +99,7 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
PCB_DRAW_PANEL_GAL::PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, PCB_DRAW_PANEL_GAL::PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId,
const wxPoint& aPosition, const wxSize& aSize, const wxPoint& aPosition, const wxSize& aSize,
GalType aGalType ) : GAL_TYPE aGalType ) :
EDA_DRAW_PANEL_GAL( aParentWindow, aWindowId, aPosition, aSize, aGalType ) EDA_DRAW_PANEL_GAL( aParentWindow, aWindowId, aPosition, aSize, aGalType )
{ {
m_worksheet = NULL; m_worksheet = NULL;

2
pcbnew/pcb_draw_panel_gal.h
View File

@ -38,7 +38,7 @@ class PCB_DRAW_PANEL_GAL : public EDA_DRAW_PANEL_GAL
{ {
public: public:
PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition, PCB_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindowId, const wxPoint& aPosition,
const wxSize& aSize, GalType aGalType = GAL_TYPE_OPENGL ); const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL );
virtual ~PCB_DRAW_PANEL_GAL(); virtual ~PCB_DRAW_PANEL_GAL();