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

Explicitly mark overriding functions.

This commit is contained in:
Simon Richter 2016-09-24 14:53:15 -04:00 committed by Wayne Stambaugh
parent 360794b3a4
commit 59c81976dc
352 changed files with 2491 additions and 2491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.h
View File

@ -39,16 +39,16 @@ private:
void initDialog();
void OnAddAlias( wxCommandEvent& event );
void OnDelAlias( wxCommandEvent& event );
void OnAliasMoveUp( wxCommandEvent& event );
void OnAliasMoveDown( wxCommandEvent& event );
void OnConfigEnvVar( wxCommandEvent& event );
void OnHelp( wxCommandEvent& event );
void OnAddAlias( wxCommandEvent& event ) override;
void OnDelAlias( wxCommandEvent& event ) override;
void OnAliasMoveUp( wxCommandEvent& event ) override;
void OnAliasMoveDown( wxCommandEvent& event ) override;
void OnConfigEnvVar( wxCommandEvent& event ) override;
void OnHelp( wxCommandEvent& event ) override;
public:
DLG_3D_PATH_CONFIG( wxWindow* aParent, S3D_FILENAME_RESOLVER* aResolver );
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
private:
void updateEnvVars( void );

2
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h
View File

@ -64,7 +64,7 @@ public:
DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheManager, S3D_INFO* aModelItem,
wxString& prevModelSelectDir, int& prevModelWildcard );
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
void OnSelectionChanged( wxTreeEvent& event );
void OnFileActivated( wxTreeEvent& event );
void SetRootDir( wxCommandEvent& event );

20
3d-viewer/3d_cache/sg/scenegraph.h
View File

@ -57,8 +57,8 @@ private:
bool addNode( SGNODE* aNode, bool isChild );
public:
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
// note: order of transformation is Translate, Rotate, Offset
@ -73,16 +73,16 @@ public:
SCENEGRAPH( SGNODE* aParent );
virtual ~SCENEGRAPH();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
bool Prepare( const glm::dmat4* aTransform,
S3D::MATLIST& materials, std::vector< SMESH >& meshes );

20
3d-viewer/3d_cache/sg/sg_appearance.h
View File

@ -41,14 +41,14 @@ public:
SGCOLOR emissive; // default 0.0 0.0 0.0
SGCOLOR specular; // default 0.0 0.0 0.0
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGAPPEARANCE( SGNODE* aParent );
virtual ~SGAPPEARANCE();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
bool SetEmissive( float aRVal, float aGVal, float aBVal );
bool SetEmissive( const SGCOLOR* aRGBColor );
@ -66,15 +66,15 @@ public:
bool SetAmbient( const SGCOLOR* aRGBColor );
bool SetAmbient( const SGCOLOR& aRGBColor );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_APPEARANCE_H

20
3d-viewer/3d_cache/sg/sg_colors.h
View File

@ -37,29 +37,29 @@ class SGCOLORS : public SGNODE
public:
std::vector< SGCOLOR > colors;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGCOLORS( SGNODE* aParent );
virtual ~SGCOLORS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetColorList( size_t& aListSize, SGCOLOR*& aColorList );
void SetColorList( size_t aListSize, const SGCOLOR* aColorList );
void AddColor( double aRedValue, double aGreenValue, double aBlueValue );
void AddColor( const SGCOLOR& aColor );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_COLORS_H

20
3d-viewer/3d_cache/sg/sg_coords.h
View File

@ -39,18 +39,18 @@ class SGCOORDS : public SGNODE
public:
std::vector< SGPOINT > coords;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGCOORDS( SGNODE* aParent );
virtual ~SGCOORDS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetCoordsList( size_t& aListSize, SGPOINT*& aCoordsList );
void SetCoordsList( size_t aListSize, const SGPOINT* aCoordsList );
@ -64,11 +64,11 @@ public:
*/
bool CalcNormals( SGFACESET* callingNode, SGNODE** aPtr = NULL );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_COORDS_H

20
3d-viewer/3d_cache/sg/sg_faceset.h
View File

@ -60,8 +60,8 @@ public:
SGCOORDS* m_RCoords;
SGNORMALS* m_RNormals;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
// validate the data held by this face set
bool validate( void );
@ -69,19 +69,19 @@ public:
SGFACESET( SGNODE* aParent );
virtual ~SGFACESET();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode( const char *aNodeName, const SGNODE *aCaller );
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode( const char *aNodeName, const SGNODE *aCaller ) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool CalcNormals( SGNODE** aPtr );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
/**
* Function GatherCoordIndices

20
3d-viewer/3d_cache/sg/sg_index.h
View File

@ -42,18 +42,18 @@ protected:
public:
// for internal SG consumption only
std::vector< int > index;
void unlinkChildNode( const SGNODE* aCaller );
void unlinkRefNode( const SGNODE* aCaller );
void unlinkChildNode( const SGNODE* aCaller ) override;
void unlinkRefNode( const SGNODE* aCaller ) override;
public:
SGINDEX( SGNODE* aParent );
virtual ~SGINDEX();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
/**
* Function GetIndices
@ -88,11 +88,11 @@ public:
*/
void AddIndex( int aIndex );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_INDEX_H

20
3d-viewer/3d_cache/sg/sg_normals.h
View File

@ -37,29 +37,29 @@ class SGNORMALS : public SGNODE
public:
std::vector< SGVECTOR > norms;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGNORMALS( SGNODE* aParent );
virtual ~SGNORMALS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetNormalList( size_t& aListSize, SGVECTOR*& aNormalList );
void SetNormalList( size_t aListSize, const SGVECTOR* aNormalList );
void AddNormal( double aXValue, double aYValue, double aZValue );
void AddNormal( const SGVECTOR& aNormal );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_NORMALS_H

20
3d-viewer/3d_cache/sg/sg_shape.h
View File

@ -51,24 +51,24 @@ public:
SGAPPEARANCE* m_RAppearance;
SGFACESET* m_RFaceSet;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGSHAPE( SGNODE* aParent );
virtual ~SGSHAPE();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
bool Prepare( const glm::dmat4* aTransform,
S3D::MATLIST& materials, std::vector< SMESH >& meshes );

2
3d-viewer/3d_canvas/status_text_reporter.h
View File

@ -50,7 +50,7 @@ public:
m_hasMessage = false;
}
REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED ) override
{
if( !aText.IsEmpty() )
m_hasMessage = true;

6
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h
View File

@ -64,10 +64,10 @@ public:
~C3D_RENDER_OGL_LEGACY();
// Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize );
bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter );
void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter ) override;
int GetWaitForEditingTimeOut();
int GetWaitForEditingTimeOut() override;
private:
bool initializeOpenGL();

8
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h
View File

@ -118,10 +118,10 @@ public:
~CBVH_PBRT();
// Imported from CGENERICACCELERATOR
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo, unsigned int aAccNodeInfo ) const;
bool Intersect(const RAYPACKET &aRayPacket, HITINFO_PACKET *aHitInfoPacket ) const;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo, unsigned int aAccNodeInfo ) const override;
bool Intersect(const RAYPACKET &aRayPacket, HITINFO_PACKET *aHitInfoPacket ) const override;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const override;
private:

4
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h
View File

@ -76,8 +76,8 @@ private:
class CCONTAINER : public CGENERICCONTAINER
{
public:
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const override;
};
#endif // _CCONTAINER_H_

4
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h
View File

@ -80,7 +80,7 @@ public:
// Imported from CGENERICCONTAINER2D
void GetListObjectsIntersects( const CBBOX2D & aBBox,
CONST_LIST_OBJECT2D &aOutList ) const;
CONST_LIST_OBJECT2D &aOutList ) const override;
};
@ -117,7 +117,7 @@ public:
// Imported from CGENERICCONTAINER2D
void GetListObjectsIntersects( const CBBOX2D & aBBox,
CONST_LIST_OBJECT2D &aOutList ) const;
CONST_LIST_OBJECT2D &aOutList ) const override;
};
#endif // _CCONTAINER2D_H_

6
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h
View File

@ -64,10 +64,10 @@ public:
~C3D_RENDER_RAYTRACING();
// Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize );
bool Redraw(bool aIsMoving, REPORTER *aStatusTextReporter );
void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw(bool aIsMoving, REPORTER *aStatusTextReporter ) override;
int GetWaitForEditingTimeOut();
int GetWaitForEditingTimeOut() override;
private:
bool initializeOpenGL();

4
3d-viewer/3d_rendering/3d_render_raytracing/clight.h
View File

@ -83,7 +83,7 @@ public:
void GetLightParameters( const SFVEC3F &aHitPoint,
SFVEC3F &aOutVectorToLight,
SFVEC3F &aOutLightColor,
float &aOutDistance ) const
float &aOutDistance ) const override
{
const SFVEC3F vectorLight = m_position - aHitPoint;
@ -134,7 +134,7 @@ public:
void GetLightParameters( const SFVEC3F &aHitPoint,
SFVEC3F &aOutVectorToLight,
SFVEC3F &aOutLightColor,
float &aOutDistance ) const
float &aOutDistance ) const override
{
(void)aHitPoint; // unused

2
3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h
View File

@ -123,7 +123,7 @@ public:
const SFVEC3F &aDiffuseObjColor,
const SFVEC3F &aDirToLight,
const SFVEC3F &aLightColor,
float aShadowAttenuationFactor ) const;
float aShadowAttenuationFactor ) const override;
};
#endif // _CMATERIAL_H_

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h
View File

@ -48,11 +48,11 @@ public:
CFILLEDCIRCLE2D( const SFVEC2F &aCenter, float aRadius, const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h
View File

@ -91,11 +91,11 @@ public:
~CITEMLAYERCSG2D();
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

20
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h
View File

@ -102,11 +102,11 @@ public:
const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
@ -126,11 +126,11 @@ public:
CDUMMYBLOCK2D( const CBBOX2D &aBBox, const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
/**

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h
View File

@ -62,11 +62,11 @@ public:
const SFVEC2F &GetN3() const { return m_seg_normal[3]; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h
View File

@ -54,11 +54,11 @@ public:
const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h
View File

@ -78,11 +78,11 @@ public:
const SFVEC2F &GetRightDir() const { return m_rightDir; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
static const float s_min_dot = (FLT_EPSILON * 4.0f) ;

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h
View File

@ -60,11 +60,11 @@ public:
const SFVEC2F &GetP3() const { return p3; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h
View File

@ -50,10 +50,10 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
SFVEC2F m_center;

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.h
View File

@ -45,10 +45,10 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
SFVEC3F m_diffusecolor;
};

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.h
View File

@ -46,10 +46,10 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
SFVEC3F m_diffusecolor;

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.h
View File

@ -52,10 +52,10 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
SFVEC3F m_centerPoint;

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.h
View File

@ -48,10 +48,10 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
RAYSEG2D m_segment;

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.h
View File

@ -64,10 +64,10 @@ public:
void SetUV( const SFVEC2F &aUV1, const SFVEC2F &aUV2, const SFVEC2F &aUV3 );
// Imported from COBJECT
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const;
bool Intersects( const CBBOX &aBBox ) const;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP(const RAY &aRay , float aMaxDistance ) const override;
bool Intersects( const CBBOX &aBBox ) const override;
SFVEC3F GetDiffuseColor( const HITINFO &aHitInfo ) const override;
private:
void pre_calc_const();

2
3d-viewer/3d_rendering/cpostshader_ssao.h
View File

@ -41,7 +41,7 @@ public:
//~CPOSTSHADER_SSAO();
// Imported from CPOSTSHADER
SFVEC3F Shade(const SFVEC2I &aShaderPos ) const;
SFVEC3F Shade(const SFVEC2I &aShaderPos ) const override;
private:
SFVEC3F posFromDepth( const SFVEC2F &coord ) const;

18
3d-viewer/3d_rendering/ctrack_ball.h
View File

@ -40,23 +40,23 @@ class CTRACK_BALL : public CCAMERA
explicit CTRACK_BALL( float aRangeScale );
void Drag( const wxPoint &aNewMousePosition );
void Drag( const wxPoint &aNewMousePosition ) override;
void Pan( const wxPoint &aNewMousePosition );
void Pan( const wxPoint &aNewMousePosition ) override;
void Pan( const SFVEC3F &aDeltaOffsetInc );
void Pan( const SFVEC3F &aDeltaOffsetInc ) override;
void Pan_T1( const SFVEC3F &aDeltaOffsetInc );
void Pan_T1( const SFVEC3F &aDeltaOffsetInc ) override;
void SetLookAtPos( const SFVEC3F &aLookAtPos );
void SetLookAtPos( const SFVEC3F &aLookAtPos ) override;
void Reset();
void Reset() override;
void Reset_T1();
void Reset_T1() override;
void SetT0_and_T1_current_T();
void SetT0_and_T1_current_T() override;
void Interpolate( float t );
void Interpolate( float t ) override;
private:

6
3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
View File

@ -38,9 +38,9 @@ private:
void initDialog();
// Event functions:
void OnShowAllClick( wxCommandEvent& event );
void OnShowNoneClick( wxCommandEvent& event );
void OnOKClick( wxCommandEvent& event );
void OnShowAllClick( wxCommandEvent& event ) override;
void OnShowNoneClick( wxCommandEvent& event ) override;
void OnOKClick( wxCommandEvent& event ) override;
};

4
3d-viewer/3d_viewer/eda_3d_viewer.h
View File

@ -185,9 +185,9 @@ class EDA_3D_VIEWER : public KIWAY_PLAYER
void SetToolbars();
void SaveSettings( wxConfigBase *aCfg );
void SaveSettings( wxConfigBase *aCfg ) override;
void LoadSettings( wxConfigBase *aCfg );
void LoadSettings( wxConfigBase *aCfg ) override;
void OnLeftClick( wxDC *DC, const wxPoint &MousePos );

18
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -87,14 +87,14 @@ public:
~BM2CMP_FRAME();
// overload KIWAY_PLAYER virtual
bool OpenProjectFiles( const std::vector<wxString>& aFilenames, int aCtl=0 );
bool OpenProjectFiles( const std::vector<wxString>& aFilenames, int aCtl=0 ) override;
private:
// Event handlers
void OnPaint( wxPaintEvent& event );
void OnLoadFile( wxCommandEvent& event );
void OnExport( wxCommandEvent& event );
void OnPaint( wxPaintEvent& event ) override;
void OnLoadFile( wxCommandEvent& event ) override;
void OnExport( wxCommandEvent& event ) override;
/**
* Generate a schematic library which contains one component:
@ -119,9 +119,9 @@ private:
void OnExportLogo();
void Binarize( double aThreshold ); // aThreshold = 0.0 (black level) to 1.0 (white level)
void OnOptionsSelection( wxCommandEvent& event );
void OnThresholdChange( wxScrollEvent& event );
void OnResolutionChange( wxCommandEvent& event );
void OnOptionsSelection( wxCommandEvent& event ) override;
void OnThresholdChange( wxScrollEvent& event ) override;
void OnResolutionChange( wxCommandEvent& event ) override;
// called when texts controls which handle the image resolution
// lose the focus, to ensure the right values are displayed
@ -141,7 +141,7 @@ private:
void NegateGreyscaleImage( );
void ExportFile( FILE* aOutfile, OUTPUT_FMT_ID aFormat );
void updateImageInfo();
void OnFormatChange( wxCommandEvent& event );
void OnFormatChange( wxCommandEvent& event ) override;
};
@ -668,7 +668,7 @@ namespace BMP2CMP {
static struct IFACE : public KIFACE_I
{
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits );
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 )
{

4
common/confirm.cpp
View File

@ -50,8 +50,8 @@ public:
};
private:
void OnSaveAndExit( wxCommandEvent& event ) { EndModal( wxID_YES ); }
void OnExitNoSave( wxCommandEvent& event ) { EndModal( wxID_NO ); }
void OnSaveAndExit( wxCommandEvent& event ) override { EndModal( wxID_YES ); }
void OnExitNoSave( wxCommandEvent& event ) override { EndModal( wxID_NO ); }
};

18
common/dialogs/dialog_image_editor.h
View File

@ -53,15 +53,15 @@ public:
void TransfertToImage( BITMAP_BASE* aItem );
private:
void OnUndoLastChange( wxCommandEvent& event );
void OnGreyScaleConvert( wxCommandEvent& event );
void OnHalfSize( wxCommandEvent& event );
void OnMirrorX_click( wxCommandEvent& event );
void OnMirrorY_click( wxCommandEvent& event );
void OnRotateClick( wxCommandEvent& event );
void OnOK_Button( wxCommandEvent& aEvent );
void OnCancel_Button( wxCommandEvent& aEvent );
void OnRedrawPanel( wxPaintEvent& event );
void OnUndoLastChange( wxCommandEvent& event ) override;
void OnGreyScaleConvert( wxCommandEvent& event ) override;
void OnHalfSize( wxCommandEvent& event ) override;
void OnMirrorX_click( wxCommandEvent& event ) override;
void OnMirrorY_click( wxCommandEvent& event ) override;
void OnRotateClick( wxCommandEvent& event ) override;
void OnOK_Button( wxCommandEvent& aEvent ) override;
void OnCancel_Button( wxCommandEvent& aEvent ) override;
void OnRedrawPanel( wxPaintEvent& event ) override;
bool CheckValues();
};

30
common/dialogs/dialog_page_settings.h
View File

@ -73,29 +73,29 @@ private:
void initDialog(); // Initialisation of member variables
// event handler for button OK
void OnOkClick( wxCommandEvent& event );
void OnOkClick( wxCommandEvent& event ) override;
// event handlers for page size choice
void OnPaperSizeChoice( wxCommandEvent& event );
void OnUserPageSizeXTextUpdated( wxCommandEvent& event );
void OnUserPageSizeYTextUpdated( wxCommandEvent& event );
void OnPageOrientationChoice( wxCommandEvent& event );
void OnPaperSizeChoice( wxCommandEvent& event ) override;
void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) override;
void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) override;
void OnPageOrientationChoice( wxCommandEvent& event ) override;
// event handler for texts in title block
void OnRevisionTextUpdated( wxCommandEvent& event );
void OnDateTextUpdated( wxCommandEvent& event );
void OnTitleTextUpdated( wxCommandEvent& event );
void OnCompanyTextUpdated( wxCommandEvent& event );
void OnComment1TextUpdated( wxCommandEvent& event );
void OnComment2TextUpdated( wxCommandEvent& event );
void OnComment3TextUpdated( wxCommandEvent& event );
void OnComment4TextUpdated( wxCommandEvent& event );
void OnRevisionTextUpdated( wxCommandEvent& event ) override;
void OnDateTextUpdated( wxCommandEvent& event ) override;
void OnTitleTextUpdated( wxCommandEvent& event ) override;
void OnCompanyTextUpdated( wxCommandEvent& event ) override;
void OnComment1TextUpdated( wxCommandEvent& event ) override;
void OnComment2TextUpdated( wxCommandEvent& event ) override;
void OnComment3TextUpdated( wxCommandEvent& event ) override;
void OnComment4TextUpdated( wxCommandEvent& event ) override;
// Handle button click for setting the date from the picker
void OnDateApplyClick( wxCommandEvent& event );
void OnDateApplyClick( wxCommandEvent& event ) override;
// .kicad_wks file description selection
void OnWksFileSelection( wxCommandEvent& event );
void OnWksFileSelection( wxCommandEvent& event ) override;
// Save in the current title block the new page settings
// return true if changes are made, or false if not

14
common/dialogs/wx_html_report_panel.h
View File

@ -59,7 +59,7 @@ public:
void Clear();
///> sets the frame label
void SetLabel( const wxString& aLabel );
void SetLabel( const wxString& aLabel ) override;
///> Sets the lasy update. If this mode is on, messages are stored but the display
///> is not updated (Updating display can be very time consumming if there are many messages)
@ -94,13 +94,13 @@ private:
void scrollToBottom();
void syncCheckboxes();
void onCheckBoxShowAll( wxCommandEvent& event );
void onCheckBoxShowWarnings( wxCommandEvent& event );
void onCheckBoxShowErrors( wxCommandEvent& event );
void onCheckBoxShowInfos( wxCommandEvent& event );
void onCheckBoxShowActions( wxCommandEvent& event );
void onCheckBoxShowAll( wxCommandEvent& event ) override;
void onCheckBoxShowWarnings( wxCommandEvent& event ) override;
void onCheckBoxShowErrors( wxCommandEvent& event ) override;
void onCheckBoxShowInfos( wxCommandEvent& event ) override;
void onCheckBoxShowActions( wxCommandEvent& event ) override;
void onBtnSaveToFile( wxCommandEvent& event );
void onBtnSaveToFile( wxCommandEvent& event ) override;
///> copy of the report, stored for filtering
REPORT_LINES m_report;

24
cvpcb/class_DisplayFootprintsFrame.h
View File

@ -45,15 +45,15 @@ public:
DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, CVPCB_MAINFRAME* aParent );
~DISPLAY_FOOTPRINTS_FRAME();
void OnCloseWindow( wxCloseEvent& Event );
void OnCloseWindow( wxCloseEvent& Event ) override;
/*
* Draws the current highlighted footprint.
*/
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void RedrawActiveWindow( wxDC* DC, bool EraseBg ) override;
void ReCreateHToolbar();
void ReCreateVToolbar();
void ReCreateHToolbar() override;
void ReCreateVToolbar() override;
void ReCreateOptToolbar();
void RecreateMenuBar();
@ -74,7 +74,7 @@ public:
* Function IsGridVisible() , virtual
* @return true if the grid must be shown
*/
virtual bool IsGridVisible() const;
virtual bool IsGridVisible() const override;
/**
* Function SetGridVisibility() , virtual
@ -82,17 +82,17 @@ public:
* if you want to store/retrieve the grid visibility in configuration.
* @param aVisible = true if the grid must be shown
*/
virtual void SetGridVisibility( bool aVisible );
virtual void SetGridVisibility( bool aVisible ) override;
/**
* Function GetGridColor() , virtual
* @return the color of the grid
*/
virtual EDA_COLOR_T GetGridColor() const;
virtual EDA_COLOR_T GetGridColor() const override;
void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
bool GeneralControl( wxDC* DC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 );
void OnLeftClick( wxDC* DC, const wxPoint& MousePos ) override;
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) override;
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ) override;
bool GeneralControl( wxDC* DC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override;
void InstallOptionsDisplay( wxCommandEvent& event );
MODULE* Get_Module( const wxString& CmpName );
@ -104,7 +104,7 @@ public:
/**
* Display 3D frame of current footprint selection.
*/
void Show3D_Frame( wxCommandEvent& event );
void Show3D_Frame( wxCommandEvent& event ) override;
/* SaveCopyInUndoList() virtual
* currently: do nothing in CvPcb.

4
cvpcb/cvpcb.cpp
View File

@ -65,9 +65,9 @@ static struct IFACE : public KIFACE_I
KIFACE_I( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits );
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
void OnKifaceEnd();
void OnKifaceEnd() override;
wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 )
{

2
cvpcb/cvpcb_mainframe.h
View File

@ -115,7 +115,7 @@ public:
void OnCloseWindow( wxCloseEvent& Event );
void OnSize( wxSizeEvent& SizeEvent );
void ReCreateHToolbar();
virtual void ReCreateMenuBar();
virtual void ReCreateMenuBar() override;
void ChangeFocus( bool aMoveRight );

14
cvpcb/dialogs/dialog_config_equfiles.h
View File

@ -44,13 +44,13 @@ private:
void Init();
// Virtual event handlers
void OnCloseWindow( wxCloseEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnAddFiles( wxCommandEvent& event );
void OnEditEquFile( wxCommandEvent& event );
void OnRemoveFiles( wxCommandEvent& event );
void OnButtonMoveUp( wxCommandEvent& event );
void OnButtonMoveDown( wxCommandEvent& event );
void OnCloseWindow( wxCloseEvent& event ) override;
void OnOkClick( wxCommandEvent& event ) override;
void OnAddFiles( wxCommandEvent& event ) override;
void OnEditEquFile( wxCommandEvent& event ) override;
void OnRemoveFiles( wxCommandEvent& event ) override;
void OnButtonMoveUp( wxCommandEvent& event ) override;
void OnButtonMoveDown( wxCommandEvent& event ) override;
int getEnvVarCount() // Get the number of rows in env var table
{

6
cvpcb/dialogs/dialog_display_options.h
View File

@ -49,9 +49,9 @@ public:
private:
void initDialog( );
void UpdateObjectSettings( void );
void OnApplyClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnApplyClick( wxCommandEvent& event ) override;
void OnCancelClick( wxCommandEvent& event ) override;
void OnOkClick( wxCommandEvent& event ) override;
};
#endif // _DIALOG_DISPLAY_OPTIONS_H_

6
cvpcb/dialogs/fp_conflict_assignment_selector.h
View File

@ -63,13 +63,13 @@ class DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR : public DIALOG_FP_CONFLICT_ASSIGNM
int GetSelection( const wxString& aReference );
private:
void OnSize( wxSizeEvent& event );
void OnSize( wxSizeEvent& event ) override;
// Virtual: called when clicking on the column title:
// when it is a column choice, set all item choices.
void OnColumnClick( wxListEvent& event );
void OnColumnClick( wxListEvent& event ) override;
void OnItemClicked( wxMouseEvent& event );
void OnItemClicked( wxMouseEvent& event ) override;
void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); }
void OnOKClick( wxCommandEvent& event ) { EndModal( wxID_OK ); }

6
cvpcb/listview_classes.h
View File

@ -131,7 +131,7 @@ public:
* this overloaded function MUST be provided for the wxLC_VIRTUAL mode
* because real data is not handled by ITEMS_LISTBOX_BASE
*/
wxString OnGetItemText( long item, long column ) const;
wxString OnGetItemText( long item, long column ) const override;
// Events functions:
void OnLeftClick( wxListEvent& event );
@ -161,7 +161,7 @@ public:
void SetLibraryList( const wxArrayString& aList );
wxString GetSelectedLibrary();
wxString OnGetItemText( long item, long column ) const;
wxString OnGetItemText( long item, long column ) const override;
// Events functions:
void OnLeftClick( wxListEvent& event );
@ -209,7 +209,7 @@ public:
* this overloaded function MUST be provided for the wxLC_VIRTUAL mode
* because real data is not handled by ITEMS_LISTBOX_BASE
*/
wxString OnGetItemText( long item, long column ) const;
wxString OnGetItemText( long item, long column ) const override;
/*
* Enable or disable an item

2
eeschema/class_sch_screen.h
View File

@ -342,7 +342,7 @@ public:
* items are removed from the beginning of the list.
* So this function can be called to remove old commands
*/
virtual void ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount = -1 );
virtual void ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount = -1 ) override;
/**
* Function Save

6
eeschema/dialogs/dialog_annotate.cpp
View File

@ -61,9 +61,9 @@ private:
/// Initialises member variables
void InitValues();
void OnCancelClick( wxCommandEvent& event );
void OnClearAnnotationCmpClick( wxCommandEvent& event );
void OnApplyClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ) override;
void OnClearAnnotationCmpClick( wxCommandEvent& event ) override;
void OnApplyClick( wxCommandEvent& event ) override;
// User functions:
bool GetLevel();

20
eeschema/dialogs/dialog_bom.cpp
View File

@ -185,16 +185,16 @@ public:
~DIALOG_BOM();
private:
void OnPluginSelected( wxCommandEvent& event );
void OnRunPlugin( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void OnHelp( wxCommandEvent& event );
void OnAddPlugin( wxCommandEvent& event );
void OnRemovePlugin( wxCommandEvent& event );
void OnEditPlugin( wxCommandEvent& event );
void OnCommandLineEdited( wxCommandEvent& event );
void OnNameEdited( wxCommandEvent& event );
void OnShowConsoleChanged( wxCommandEvent& event );
void OnPluginSelected( wxCommandEvent& event ) override;
void OnRunPlugin( wxCommandEvent& event ) override;
void OnCancelClick( wxCommandEvent& event ) override;
void OnHelp( wxCommandEvent& event ) override;
void OnAddPlugin( wxCommandEvent& event ) override;
void OnRemovePlugin( wxCommandEvent& event ) override;
void OnEditPlugin( wxCommandEvent& event ) override;
void OnCommandLineEdited( wxCommandEvent& event ) override;
void OnNameEdited( wxCommandEvent& event ) override;
void OnShowConsoleChanged( wxCommandEvent& event ) override;
void pluginInit();
void installPluginsList();

18
eeschema/dialogs/dialog_choose_component.h
View File

@ -71,17 +71,17 @@ public:
bool IsExternalBrowserSelected() const { return m_external_browser_requested; }
protected:
virtual void OnSearchBoxChange( wxCommandEvent& aEvent );
virtual void OnSearchBoxEnter( wxCommandEvent& aEvent );
virtual void OnInterceptSearchBoxKey( wxKeyEvent& aEvent );
virtual void OnSearchBoxChange( wxCommandEvent& aEvent ) override;
virtual void OnSearchBoxEnter( wxCommandEvent& aEvent ) override;
virtual void OnInterceptSearchBoxKey( wxKeyEvent& aEvent ) override;
virtual void OnTreeSelect( wxTreeEvent& aEvent );
virtual void OnDoubleClickTreeActivation( wxTreeEvent& aEvent );
virtual void OnInterceptTreeEnter( wxKeyEvent& aEvent );
virtual void OnTreeMouseUp( wxMouseEvent& aMouseEvent );
virtual void OnTreeSelect( wxTreeEvent& aEvent ) override;
virtual void OnDoubleClickTreeActivation( wxTreeEvent& aEvent ) override;
virtual void OnInterceptTreeEnter( wxKeyEvent& aEvent ) override;
virtual void OnTreeMouseUp( wxMouseEvent& aMouseEvent ) override;
virtual void OnStartComponentBrowser( wxMouseEvent& aEvent );
virtual void OnHandlePreviewRepaint( wxPaintEvent& aRepaintEvent );
virtual void OnStartComponentBrowser( wxMouseEvent& aEvent ) override;
virtual void OnHandlePreviewRepaint( wxPaintEvent& aRepaintEvent ) override;
private:
bool updateSelection();

22
eeschema/dialogs/dialog_edit_component_in_lib.h
View File

@ -50,20 +50,20 @@ private:
void initDlg();
void InitPanelDoc();
void InitBasicPanel();
void OnCancelClick( wxCommandEvent& event );
void OnOkClick(wxCommandEvent& event);
void DeleteAllAliasOfPart(wxCommandEvent& event);
void DeleteAliasOfPart(wxCommandEvent& event);
void AddAliasOfPart(wxCommandEvent& event);
void OnCancelClick( wxCommandEvent& event ) override;
void OnOkClick(wxCommandEvent& event) override;
void DeleteAllAliasOfPart(wxCommandEvent& event) override;
void DeleteAliasOfPart(wxCommandEvent& event) override;
void AddAliasOfPart(wxCommandEvent& event) override;
bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert();
void CopyDocFromRootToAlias(wxCommandEvent& event);
void BrowseAndSelectDocFile(wxCommandEvent& event);
void CopyDocFromRootToAlias(wxCommandEvent& event) override;
void BrowseAndSelectDocFile(wxCommandEvent& event) override;
void DeleteAllFootprintFilter(wxCommandEvent& event);
void DeleteOneFootprintFilter(wxCommandEvent& event);
void AddFootprintFilter(wxCommandEvent& event);
void EditOneFootprintFilter( wxCommandEvent& event );
void DeleteAllFootprintFilter(wxCommandEvent& event) override;
void DeleteOneFootprintFilter(wxCommandEvent& event) override;
void AddFootprintFilter(wxCommandEvent& event) override;
void EditOneFootprintFilter( wxCommandEvent& event ) override;
};
#endif

24
eeschema/dialogs/dialog_edit_component_in_schematic.cpp
View File

@ -118,18 +118,18 @@ private:
}
// event handlers
void OnCloseDialog( wxCloseEvent& event );
void OnListItemDeselected( wxListEvent& event );
void OnListItemSelected( wxListEvent& event );
void OnCancelButtonClick( wxCommandEvent& event );
void OnOKButtonClick( wxCommandEvent& event );
void SetInitCmp( wxCommandEvent& event );
void addFieldButtonHandler( wxCommandEvent& event );
void deleteFieldButtonHandler( wxCommandEvent& event );
void moveUpButtonHandler( wxCommandEvent& event );
void showButtonHandler( wxCommandEvent& event );
void OnTestChipName( wxCommandEvent& event );
void OnSelectChipName( wxCommandEvent& event );
void OnCloseDialog( wxCloseEvent& event ) override;
void OnListItemDeselected( wxListEvent& event ) override;
void OnListItemSelected( wxListEvent& event ) override;
void OnCancelButtonClick( wxCommandEvent& event ) override;
void OnOKButtonClick( wxCommandEvent& event ) override;
void SetInitCmp( wxCommandEvent& event ) override;
void addFieldButtonHandler( wxCommandEvent& event ) override;
void deleteFieldButtonHandler( wxCommandEvent& event ) override;
void moveUpButtonHandler( wxCommandEvent& event ) override;
void showButtonHandler( wxCommandEvent& event ) override;
void OnTestChipName( wxCommandEvent& event ) override;
void OnSelectChipName( wxCommandEvent& event ) override;
void OnInitDlg( wxInitDialogEvent& event )
{
TransferDataToWindow();

8
eeschema/dialogs/dialog_edit_label.cpp
View File

@ -76,10 +76,10 @@ public:
}
private:
void InitDialog( );
virtual void OnEnterKey( wxCommandEvent& aEvent );
virtual void OnOkClick( wxCommandEvent& aEvent );
virtual void OnCancelClick( wxCommandEvent& aEvent );
void InitDialog( ) override;
virtual void OnEnterKey( wxCommandEvent& aEvent ) override;
virtual void OnOkClick( wxCommandEvent& aEvent ) override;
virtual void OnCancelClick( wxCommandEvent& aEvent ) override;
void TextPropertiesAccept( wxCommandEvent& aEvent );
SCH_EDIT_FRAME* m_Parent;

20
eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
View File

@ -60,12 +60,12 @@ public:
private:
// Events handlers:
void OnInitDialog( wxInitDialogEvent& event );
void OnCloseDialog( wxCloseEvent& event );
void OnInitDialog( wxInitDialogEvent& event ) override;
void OnCloseDialog( wxCloseEvent& event ) override;
void OnListItemDeselected( wxListEvent& event );
void OnListItemSelected( wxListEvent& event );
void addFieldButtonHandler( wxCommandEvent& event );
void OnListItemDeselected( wxListEvent& event ) override;
void OnListItemSelected( wxListEvent& event ) override;
void addFieldButtonHandler( wxCommandEvent& event ) override;
/**
* Function deleteFieldButtonHandler
@ -74,12 +74,12 @@ private:
* If a field is empty, it is removed.
* if not empty, the text is removed.
*/
void deleteFieldButtonHandler( wxCommandEvent& event );
void deleteFieldButtonHandler( wxCommandEvent& event ) override;
void moveUpButtonHandler( wxCommandEvent& event );
void OnCancelButtonClick( wxCommandEvent& event );
void OnOKButtonClick( wxCommandEvent& event );
void showButtonHandler( wxCommandEvent& event );
void moveUpButtonHandler( wxCommandEvent& event ) override;
void OnCancelButtonClick( wxCommandEvent& event ) override;
void OnOKButtonClick( wxCommandEvent& event ) override;
void showButtonHandler( wxCommandEvent& event ) override;
// internal functions:
void setSelectedFieldNdx( int aFieldNdx );

6
eeschema/dialogs/dialog_edit_one_field.h
View File

@ -52,9 +52,9 @@ public:
~DIALOG_EDIT_ONE_FIELD() {}
virtual bool TransferDataToWindow();
virtual bool TransferDataToWindow() override;
virtual bool TransferDataFromWindow();
virtual bool TransferDataFromWindow() override;
SCH_BASE_FRAME* GetParent() { return dynamic_cast< SCH_BASE_FRAME* >( wxDialog::GetParent() ); }
@ -75,7 +75,7 @@ protected:
*
* @param aEvent is the the wX event thrown when the button is clicked, this isn't used
*/
void OnTextValueSelectButtonClick( wxCommandEvent& aEvent );
void OnTextValueSelectButtonClick( wxCommandEvent& aEvent ) override;
/// @todo Update DIALOG_SHIM to handle this transparently so no matter what mode the
/// dialogs is shown, everything is handled without this ugliness.

18
eeschema/dialogs/dialog_eeschema_config.cpp
View File

@ -65,12 +65,12 @@ private:
//------ event handlers, overiding the fbp handlers --------------
void OnCloseWindow( wxCloseEvent& event );
void OnCloseWindow( wxCloseEvent& event ) override;
/* Remove a library to the library list.
* The real list (m_Parent->m_ComponentLibFiles) is not changed, so the change can be canceled
*/
void OnRemoveLibClick( wxCommandEvent& event );
void OnRemoveLibClick( wxCommandEvent& event ) override;
/* Insert or add a library to the library list:
* The new library is put in list before (insert button) the selection,
@ -78,14 +78,14 @@ private:
* The real list (m_Parent->m_ComponentLibFiles) is not changed, so the change
* can be canceled
*/
void OnAddOrInsertLibClick( wxCommandEvent& event );
void OnAddOrInsertLibClick( wxCommandEvent& event ) override;
void OnAddOrInsertPath( wxCommandEvent& event );
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void OnRemoveUserPath( wxCommandEvent& event );
void OnButtonUpClick( wxCommandEvent& event );
void OnButtonDownClick( wxCommandEvent& event );
void OnAddOrInsertPath( wxCommandEvent& event ) override;
void OnOkClick( wxCommandEvent& event ) override;
void OnCancelClick( wxCommandEvent& event ) override;
void OnRemoveUserPath( wxCommandEvent& event ) override;
void OnButtonUpClick( wxCommandEvent& event ) override;
void OnButtonDownClick( wxCommandEvent& event ) override;
};

8
eeschema/dialogs/dialog_eeschema_options.h
View File

@ -56,7 +56,7 @@ protected:
*
* Adds a new template fieldname (with default values) to the template fieldnames data
*/
void OnAddButtonClick( wxCommandEvent& event );
void OnAddButtonClick( wxCommandEvent& event ) override;
/**
* Function OnDeleteButtonClick
@ -67,19 +67,19 @@ protected:
*
* Deletes the selected template fieldname from the template fieldnames data
*/
void OnDeleteButtonClick( wxCommandEvent& event );
void OnDeleteButtonClick( wxCommandEvent& event ) override;
/**
* Function TransferDataToWindow
* Transfer data into the GUI.
*/
bool TransferDataToWindow();
bool TransferDataToWindow() override;
/**
* Function TransferDataFromWindow
* Transfer data out of the GUI.
*/
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
public:
/**

14
eeschema/dialogs/dialog_erc.h
View File

@ -58,17 +58,17 @@ private:
void Init();
// from DIALOG_ERC_BASE:
void OnCloseErcDialog( wxCloseEvent& event );
void OnErcCmpClick( wxCommandEvent& event );
void OnEraseDrcMarkersClick( wxCommandEvent& event );
void OnButtonCloseClick( wxCommandEvent& event );
void OnResetMatrixClick( wxCommandEvent& event );
void OnCloseErcDialog( wxCloseEvent& event ) override;
void OnErcCmpClick( wxCommandEvent& event ) override;
void OnEraseDrcMarkersClick( wxCommandEvent& event ) override;
void OnButtonCloseClick( wxCommandEvent& event ) override;
void OnResetMatrixClick( wxCommandEvent& event ) override;
// Click on a marker info:
void OnLeftClickMarkersList( wxHtmlLinkEvent& event );
void OnLeftClickMarkersList( wxHtmlLinkEvent& event ) override;
// Double click on a marker info:
void OnLeftDblClickMarkersList( wxMouseEvent& event );
void OnLeftDblClickMarkersList( wxMouseEvent& event ) override;
void TestErc( wxArrayString* aMessagesList );
void DisplayERC_MarkersList();

12
eeschema/dialogs/dialog_lib_edit_pin.h
View File

@ -46,13 +46,13 @@ public:
DIALOG_LIB_EDIT_PIN( EDA_DRAW_FRAME* parent, LIB_PIN* aPin );
~DIALOG_LIB_EDIT_PIN();
void OnInitDialog( wxInitDialogEvent& event);
void OnInitDialog( wxInitDialogEvent& event) override;
void OnCloseDialog( wxCloseEvent& event );
void OnCancelButtonClick( wxCommandEvent& event );
void OnOKButtonClick( wxCommandEvent& event );
void OnPaintShowPanel( wxPaintEvent& event );
void OnPropertiesChange( wxCommandEvent& event );
void OnCloseDialog( wxCloseEvent& event ) override;
void OnCancelButtonClick( wxCommandEvent& event ) override;
void OnOKButtonClick( wxCommandEvent& event ) override;
void OnPaintShowPanel( wxPaintEvent& event ) override;
void OnPropertiesChange( wxCommandEvent& event ) override;
void SetOrientationList( const wxArrayString& list, const BITMAP_DEF* aBitmaps );
void SetOrientation( int orientation )

24
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -48,14 +48,14 @@ public:
DataViewModel( LIB_PART& aPart );
// wxDataViewModel
virtual unsigned int GetColumnCount() const;
virtual wxString GetColumnType( unsigned int col ) const;
virtual void GetValue( wxVariant&, const wxDataViewItem&, unsigned int ) const;
virtual bool SetValue( const wxVariant&, const wxDataViewItem&, unsigned int );
virtual wxDataViewItem GetParent( const wxDataViewItem& ) const;
virtual bool IsContainer( const wxDataViewItem& ) const;
virtual bool HasContainerColumns( const wxDataViewItem& ) const;
virtual unsigned int GetChildren( const wxDataViewItem&, wxDataViewItemArray& ) const;
virtual unsigned int GetColumnCount() const override;
virtual wxString GetColumnType( unsigned int col ) const override;
virtual void GetValue( wxVariant&, const wxDataViewItem&, unsigned int ) const override;
virtual bool SetValue( const wxVariant&, const wxDataViewItem&, unsigned int ) override;
virtual wxDataViewItem GetParent( const wxDataViewItem& ) const override;
virtual bool IsContainer( const wxDataViewItem& ) const override;
virtual bool HasContainerColumns( const wxDataViewItem& ) const override;
virtual unsigned int GetChildren( const wxDataViewItem&, wxDataViewItemArray& ) const override;
virtual int Compare( const wxDataViewItem& lhs,
const wxDataViewItem& rhs,
@ -118,8 +118,8 @@ class DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Group :
public:
Group( unsigned int aGroupingColumn ) : m_GroupingColumn( aGroupingColumn ) {}
virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const;
virtual wxString GetString( unsigned int aCol ) const;
virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const override;
virtual wxString GetString( unsigned int aCol ) const override;
virtual wxDataViewItem GetParent() const { return wxDataViewItem(); }
virtual bool IsContainer() const { return true; }
virtual unsigned int GetChildren( wxDataViewItemArray& aItems ) const
@ -146,8 +146,8 @@ public:
Pin( DataViewModel& aModel,
LIB_PIN* aBacking ) : m_Model( aModel ), m_Backing( aBacking ), m_Group( 0 ) {}
virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const;
virtual wxString GetString( unsigned int aCol ) const;
virtual void GetValue( wxVariant& aValue, unsigned int aCol ) const override;
virtual wxString GetString( unsigned int aCol ) const override;
virtual wxDataViewItem GetParent() const { return wxDataViewItem( m_Group ); }
virtual bool IsContainer() const { return false; }
virtual unsigned int GetChildren( wxDataViewItemArray& ) const { return 0; }

2
eeschema/dialogs/dialog_lib_edit_pin_table.h
View File

@ -11,7 +11,7 @@ public:
void UpdateSummary();
virtual void OnColumnHeaderRightClicked( wxDataViewEvent& aEvent );
virtual void OnColumnHeaderRightClicked( wxDataViewEvent& aEvent ) override;
private:
class DataViewModel;

4
eeschema/dialogs/dialog_lib_edit_text.h
View File

@ -46,8 +46,8 @@ public:
private:
void initDlg( );
void OnOkClick( wxCommandEvent& aEvent );
void OnCancelClick( wxCommandEvent& aEvent );
void OnOkClick( wxCommandEvent& aEvent ) override;
void OnCancelClick( wxCommandEvent& aEvent ) override;
};

12
eeschema/dialogs/dialog_netlist.cpp
View File

@ -142,23 +142,23 @@ private:
const wxString & aCommandString,
NETLIST_TYPE_ID aNetTypeId );
void InstallPageSpice();
void GenNetlist( wxCommandEvent& event );
void GenNetlist( wxCommandEvent& event ) override;
void RunSimulator( wxCommandEvent& event );
void NetlistUpdateOpt();
void OnNetlistTypeSelection( wxNotebookEvent& event );
void OnNetlistTypeSelection( wxNotebookEvent& event ) override;
void SelectDefaultNetlistType( wxCommandEvent& event );
/**
* Function OnAddPlugin
* Add a new panel for a new netlist plugin
*/
void OnAddPlugin( wxCommandEvent& event );
void OnAddPlugin( wxCommandEvent& event ) override;
/**
* Function OnDelPlugin
* Remove a panel relative to a netlist plugin
*/
void OnDelPlugin( wxCommandEvent& event );
void OnDelPlugin( wxCommandEvent& event ) override;
/**
* Function WriteCurrentNetlistSetup
@ -219,12 +219,12 @@ private:
* Function OnOKClick
* Validate info relative to a new netlist plugin
*/
void OnOKClick( wxCommandEvent& event );
void OnOKClick( wxCommandEvent& event ) override;
/*
* Browse plugin files, and set m_CommandStringCtrl field
*/
void OnBrowsePlugins( wxCommandEvent& event );
void OnBrowsePlugins( wxCommandEvent& event ) override;
};

10
eeschema/dialogs/dialog_plot_schematic.h
View File

@ -63,10 +63,10 @@ public:
// and therefore should be saved
private:
void OnPlotFormatSelection( wxCommandEvent& event );
void OnButtonPlotCurrentClick( wxCommandEvent& event );
void OnButtonPlotAllClick( wxCommandEvent& event );
void OnButtonCancelClick( wxCommandEvent& event );
void OnPlotFormatSelection( wxCommandEvent& event ) override;
void OnButtonPlotCurrentClick( wxCommandEvent& event ) override;
void OnButtonPlotAllClick( wxCommandEvent& event ) override;
void OnButtonCancelClick( wxCommandEvent& event ) override;
void initDlg();
@ -82,7 +82,7 @@ private:
/**
* Set the m_outputDirectoryName variable to the selected directory from directory dialog.
*/
void OnOutputDirectoryBrowseClicked( wxCommandEvent& event );
void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) override;
PlotFormat GetPlotFileFormat();

16
eeschema/dialogs/dialog_print_using_printer.cpp
View File

@ -58,10 +58,10 @@ public:
}
private:
void OnCloseWindow( wxCloseEvent& event );
void OnPageSetup( wxCommandEvent& event );
void OnPrintPreview( wxCommandEvent& event );
void OnPrintButtonClick( wxCommandEvent& event );
void OnCloseWindow( wxCloseEvent& event ) override;
void OnPageSetup( wxCommandEvent& event ) override;
void OnPrintPreview( wxCommandEvent& event ) override;
void OnPrintButtonClick( wxCommandEvent& event ) override;
void OnButtonCancelClick( wxCommandEvent& event ) { Close(); }
void initDialog();
@ -85,10 +85,10 @@ public:
wxASSERT( aParent != NULL );
m_parent = aParent;
}
bool OnPrintPage( int page );
bool HasPage( int page );
bool OnBeginDocument( int startPage, int endPage );
void GetPageInfo( int* minPage, int* maxPage, int* selPageFrom, int* selPageTo );
bool OnPrintPage( int page ) override;
bool HasPage( int page ) override;
bool OnBeginDocument( int startPage, int endPage ) override;
void GetPageInfo( int* minPage, int* maxPage, int* selPageFrom, int* selPageTo ) override;
void DrawPage( SCH_SCREEN* aScreen );
};

16
eeschema/dialogs/dialog_rescue_each.cpp
View File

@ -55,16 +55,16 @@ private:
RESCUER* m_Rescuer;
bool m_AskShowAgain;
bool TransferDataToWindow();
bool TransferDataFromWindow();
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
void PopulateConflictList();
void PopulateInstanceList();
void OnConflictSelect( wxDataViewEvent& event );
void OnNeverShowClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
void OnHandleCachePreviewRepaint( wxPaintEvent& aRepaintEvent );
void OnHandleLibraryPreviewRepaint( wxPaintEvent& aRepaintEvent );
void OnDialogResize( wxSizeEvent& aSizeEvent );
void OnConflictSelect( wxDataViewEvent& event ) override;
void OnNeverShowClick( wxCommandEvent& event ) override;
void OnCancelClick( wxCommandEvent& event ) override;
void OnHandleCachePreviewRepaint( wxPaintEvent& aRepaintEvent ) override;
void OnHandleLibraryPreviewRepaint( wxPaintEvent& aRepaintEvent ) override;
void OnDialogResize( wxSizeEvent& aSizeEvent ) override;
void renderPreview( LIB_PART* aComponent, int aUnit, wxPanel* panel );
};

18
eeschema/dialogs/dialog_schematic_find.h
View File

@ -154,16 +154,16 @@ class DIALOG_SCH_FIND : public DIALOG_SCH_FIND_BASE
{
protected:
// Handlers for DIALOG_SCH_FIND_BASE events.
void OnClose( wxCloseEvent& aEvent );
void OnUpdateFindUI( wxUpdateUIEvent& aEvent );
void OnUpdateReplaceUI( wxUpdateUIEvent& aEvent );
void OnUpdateReplaceAllUI( wxUpdateUIEvent& aEvent );
void OnUpdateWholeWordUI( wxUpdateUIEvent& aEvent );
void OnUpdateWildcardUI( wxUpdateUIEvent& aEvent );
void OnClose( wxCloseEvent& aEvent ) override;
void OnUpdateFindUI( wxUpdateUIEvent& aEvent ) override;
void OnUpdateReplaceUI( wxUpdateUIEvent& aEvent ) override;
void OnUpdateReplaceAllUI( wxUpdateUIEvent& aEvent ) override;
void OnUpdateWholeWordUI( wxUpdateUIEvent& aEvent ) override;
void OnUpdateWildcardUI( wxUpdateUIEvent& aEvent ) override;
void OnFind( wxCommandEvent& aEvent );
void OnReplace( wxCommandEvent& aEvent );
void OnCancel( wxCommandEvent& aEvent );
void OnFind( wxCommandEvent& aEvent ) override;
void OnReplace( wxCommandEvent& aEvent ) override;
void OnCancel( wxCommandEvent& aEvent ) override;
void SendEvent( const wxEventType& aEventType );

4
eeschema/eeschema.cpp
View File

@ -65,9 +65,9 @@ static struct IFACE : public KIFACE_I
KIFACE_I( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits );
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
void OnKifaceEnd();
void OnKifaceEnd() override;
wxWindow* CreateWindow( wxWindow* aParent, int aClassId, KIWAY* aKiway, int aCtlBits = 0 )
{

40
eeschema/lib_arc.h
View File

@ -67,7 +67,7 @@ class LIB_ARC : public LIB_ITEM
/**
* Draw the graphics when the arc is being edited.
*/
void drawEditGraphics( EDA_RECT* aClipBox, wxDC* aDC, EDA_COLOR_T aColor );
void drawEditGraphics( EDA_RECT* aClipBox, wxDC* aDC, EDA_COLOR_T aColor ) override;
/**
* Calculates the center, radius, and angles at \a aPosition when the arc is being edited.
@ -76,7 +76,7 @@ class LIB_ARC : public LIB_ITEM
*
* @param aPosition - The current mouse position in drawing coordinates.
*/
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
/**
* Calculate the radius and angle of an arc using the start, end, and center points.
@ -96,39 +96,39 @@ public:
}
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint& aPosition, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint& aPosition, int aThreshold, const TRANSFORM& aTransform ) const override;
const EDA_RECT GetBoundingBox() const; // Virtual
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
int GetPenSize() const;
int GetPenSize() const override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -153,11 +153,11 @@ public:
void SetEnd( const wxPoint& aPoint ) { m_ArcEnd = aPoint; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_arc_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -170,7 +170,7 @@ private:
* - Arc start angle.
* - Arc end angle.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

28
eeschema/lib_bezier.h
View File

@ -59,36 +59,36 @@ public:
}
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
void AddPoint( const wxPoint& aPoint ) { m_BezierPoints.push_back( aPoint ); }
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
/**
* @return the number of corners
*/
unsigned GetCornerCount() const { return m_PolyPoints.size(); }
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint& aPosRef, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint& aPosRef, int aThreshold, const TRANSFORM& aTransform ) const override;
const EDA_RECT GetBoundingBox() const; // Virtual
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_PolyPoints[0]; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -97,11 +97,11 @@ public:
void SetWidth( int aWidth ) { m_Width = aWidth; }
int GetPenSize( ) const;
int GetPenSize( ) const override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -112,7 +112,7 @@ private:
* - Bezier horizontal (X) point position.
* - Bezier vertical (Y) point position.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

38
eeschema/lib_circle.h
View File

@ -42,7 +42,7 @@ class LIB_CIRCLE : public LIB_ITEM
EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData,
const TRANSFORM& aTransform );
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
public:
LIB_CIRCLE( LIB_PART * aParent );
@ -57,39 +57,39 @@ public:
}
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint& aPosRef, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint& aPosRef, int aThreshold, const TRANSFORM& aTransform ) const override;
int GetPenSize( ) const;
int GetPenSize( ) const override;
const EDA_RECT GetBoundingBox() const; // Virtual
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -102,11 +102,11 @@ public:
int GetRadius() const { return m_Radius; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_circle_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -118,7 +118,7 @@ private:
* - Circle vertical (Y) position.
* - Circle radius.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

2
eeschema/lib_draw_item.h
View File

@ -274,7 +274,7 @@ public:
* </p>
* @param aList is the list to populate.
*/
virtual void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
virtual void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
/**
* Test LIB_ITEM objects for equivalence.

44
eeschema/lib_field.h
View File

@ -82,7 +82,7 @@ class LIB_FIELD : public LIB_ITEM, public EDA_TEXT
*
* @param aPosition - The position to edit the circle in drawing coordinates.
*/
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
friend class SCH_LEGACY_PLUGIN_CACHE; // Required to access m_name.
@ -137,11 +137,11 @@ public:
void SetId( int aId ) { m_id = aId; }
int GetPenSize( ) const;
int GetPenSize( ) const override;
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& errorMsg );
bool Load( LINE_READER& aLineReader, wxString& errorMsg ) override;
/**
* Copy parameters of this field to another field. Pointers are not copied.
@ -172,11 +172,11 @@ public:
const EDA_RECT GetBoundingBox() const; // Virtual
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const override;
void operator=( const LIB_FIELD& field )
{
@ -210,15 +210,15 @@ public:
*/
wxString GetFullText( int unit = 1 );
EDA_COLOR_T GetDefaultColor();
EDA_COLOR_T GetDefaultColor() override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void Rotate();
void Rotate() override;
/**
* Sets the field text to \a aText.
@ -231,21 +231,21 @@ public:
*
* @param aText - New text value.
*/
void SetText( const wxString& aText );
void SetText( const wxString& aText ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -254,11 +254,11 @@ public:
void SetWidth( int aWidth ) { m_Thickness = aWidth; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return move_field_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -274,7 +274,7 @@ private:
* - Field width.
* - Field height.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};
typedef std::vector< LIB_FIELD > LIB_FIELDS;

38
eeschema/lib_pin.h
View File

@ -108,17 +108,17 @@ public:
void Show( int nestLevel, std::ostream& os ) const; // virtual override
#endif
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint &aPosRef, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint &aPosRef, int aThreshold, const TRANSFORM& aTransform ) const override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
/* Cannot use a default parameter here as it will not be compatible with the virtual. */
const EDA_RECT GetBoundingBox() const { return GetBoundingBox( false ); }
@ -230,7 +230,7 @@ public:
*/
void SetOrientation( int aOrientation );
void Rotate();
void Rotate() override;
GRAPHIC_PINSHAPE GetShape() const { return m_shape; }
@ -363,7 +363,7 @@ public:
*/
bool IsPowerConnection() const { return !IsVisible() && GetType() == PIN_POWER_IN; }
int GetPenSize() const;
int GetPenSize() const override;
/**
* Function DrawPinSymbol
@ -440,32 +440,32 @@ public:
*/
static int GetOrientationCodeIndex( int aCode );
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_position; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
int GetWidth() const { return m_width; }
void SetWidth( int aWidth );
void SetWidth( int aWidth ) override;
BITMAP_DEF GetMenuImage() const;
BITMAP_DEF GetMenuImage() const override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -478,7 +478,7 @@ private:
* - Pin horizontal (X) position.
* - Pin vertical (Y) position.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

38
eeschema/lib_polyline.h
View File

@ -43,7 +43,7 @@ class LIB_POLYLINE : public LIB_ITEM
EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData,
const TRANSFORM& aTransform );
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
public:
LIB_POLYLINE( LIB_PART * aParent );
@ -58,9 +58,9 @@ public:
}
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
void AddPoint( const wxPoint& aPoint );
@ -74,35 +74,35 @@ public:
*/
unsigned GetCornerCount() const { return m_PolyPoints.size(); }
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const override;
const EDA_RECT GetBoundingBox() const; // Virtual
int GetPenSize( ) const;
int GetPenSize( ) const override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_PolyPoints[0]; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -111,11 +111,11 @@ public:
void SetWidth( int aWidth ) { m_Width = aWidth; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_polygon_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -126,7 +126,7 @@ private:
* - Line segment point horizontal (X) position.
* - Line segment point vertical (Y) position.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

38
eeschema/lib_rectangle.h
View File

@ -45,7 +45,7 @@ class LIB_RECTANGLE : public LIB_ITEM
EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData,
const TRANSFORM& aTransform );
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
public:
LIB_RECTANGLE( LIB_PART * aParent );
@ -61,39 +61,39 @@ public:
void SetEndPosition( const wxPoint& aPosition ) { m_End = aPosition; }
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint &aPosRef, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint &aPosRef, int aThreshold, const TRANSFORM& aTransform ) const override;
int GetPenSize( ) const;
int GetPenSize( ) const override;
const EDA_RECT GetBoundingBox() const; // Virtual
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -106,11 +106,11 @@ public:
wxPoint GetEnd() const { return m_End; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_rectangle_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -123,7 +123,7 @@ private:
* - Rectangle horizontal (X) end position.
* - Rectangle vertical (Y) end position.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

42
eeschema/lib_text.h
View File

@ -52,7 +52,7 @@ class LIB_TEXT : public LIB_ITEM, public EDA_TEXT
EDA_COLOR_T aColor, GR_DRAWMODE aDrawMode, void* aData,
const TRANSFORM& aTransform );
void calcEdit( const wxPoint& aPosition );
void calcEdit( const wxPoint& aPosition ) override;
public:
LIB_TEXT( LIB_PART * aParent );
@ -76,15 +76,15 @@ public:
*
* @param aText - New text value.
*/
void SetText( const wxString& aText );
void SetText( const wxString& aText ) override;
bool Save( OUTPUTFORMATTER& aFormatter );
bool Save( OUTPUTFORMATTER& aFormatter ) override;
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg );
bool Load( LINE_READER& aLineReader, wxString& aErrorMsg ) override;
bool HitTest( const wxPoint& aPosition ) const;
bool HitTest( const wxPoint& aPosition ) const override;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const;
bool HitTest( const wxPoint &aPosition, int aThreshold, const TRANSFORM& aTransform ) const override;
bool HitTest( const EDA_RECT& aRect ) const
{
@ -92,33 +92,33 @@ public:
}
int GetPenSize( ) const;
int GetPenSize( ) const override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
const EDA_RECT GetBoundingBox() const; // virtual
void Rotate();
void Rotate() override;
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) );
void BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aStartPoint = wxPoint( 0, 0 ) ) override;
bool ContinueEdit( const wxPoint aNextPoint );
bool ContinueEdit( const wxPoint aNextPoint ) override;
void EndEdit( const wxPoint& aPosition, bool aAbort = false );
void EndEdit( const wxPoint& aPosition, bool aAbort = false ) override;
void SetOffset( const wxPoint& aOffset );
void SetOffset( const wxPoint& aOffset ) override;
bool Inside( EDA_RECT& aRect ) const;
bool Inside( EDA_RECT& aRect ) const override;
void Move( const wxPoint& aPosition );
void Move( const wxPoint& aPosition ) override;
wxPoint GetPosition() const { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter );
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter );
void MirrorVertical( const wxPoint& aCenter ) override;
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true );
void Rotate( const wxPoint& aCenter, bool aRotateCCW = true ) override;
void Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
const TRANSFORM& aTransform );
@ -127,11 +127,11 @@ public:
void SetWidth( int aWidth ) { m_Thickness = aWidth; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
@ -145,7 +145,7 @@ private:
* - Text width.
* - Text height.
*/
int compare( const LIB_ITEM& aOther ) const;
int compare( const LIB_ITEM& aOther ) const override;
};

32
eeschema/libeditframe.h
View File

@ -180,7 +180,7 @@ public:
void SetRepeatPinStep( int aStep) { m_repeatPinStep = aStep; }
void ReCreateMenuBar();
void ReCreateMenuBar() override;
/**
* Function EnsureActiveLibExists
@ -313,27 +313,27 @@ public:
* Display reference like in schematic (a reference U is shown U? or U?A)
* update status bar and info shown in the bottom of the window
*/
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void RedrawActiveWindow( wxDC* DC, bool EraseBg ) override;
void OnCloseWindow( wxCloseEvent& Event );
void ReCreateHToolbar();
void ReCreateVToolbar();
void ReCreateHToolbar() override;
void ReCreateVToolbar() override;
void CreateOptionToolbar();
void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
void OnLeftClick( wxDC* DC, const wxPoint& MousePos ) override;
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ) override;
double BestZoom(); // Returns the best zoom
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos );
void OnLeftDClick( wxDC* DC, const wxPoint& MousePos ) override;
///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription()
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const;
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const override;
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL );
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL ) override;
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override;
void LoadSettings( wxConfigBase* aCfg );
void LoadSettings( wxConfigBase* aCfg ) override;
void SaveSettings( wxConfigBase* aCfg );
void SaveSettings( wxConfigBase* aCfg ) override;
/**
* Function CloseWindow
@ -429,7 +429,7 @@ private:
* The library list can be changed by the schematic editor after reloading a new schematic
* and the current library can point a non existent lib.
*/
virtual void OnActivate( wxActivateEvent& event );
virtual void OnActivate( wxActivateEvent& event ) override;
// General:
@ -609,13 +609,13 @@ public:
* returns the block command (BLOCK_MOVE, BLOCK_COPY...) corresponding to
* the \a aKey (ALT, SHIFT ALT ..)
*/
virtual int BlockCommand( EDA_KEY aKey );
virtual int BlockCommand( EDA_KEY aKey ) override;
/**
* Function HandleBlockPlace
* handles the block place command.
*/
virtual void HandleBlockPlace( wxDC* DC );
virtual void HandleBlockPlace( wxDC* DC ) override;
/**
* Function HandleBlockEnd
@ -623,7 +623,7 @@ public:
* @return If command finished (zoom, delete ...) false is returned otherwise true
* is returned indicating more processing is required.
*/
virtual bool HandleBlockEnd( wxDC* DC );
virtual bool HandleBlockEnd( wxDC* DC ) override;
/**
* Function PlacePin

2
eeschema/netlist_exporters/netlist_exporter_cadstar.h
View File

@ -56,7 +56,7 @@ public:
* Function WriteList
* writes to specified output file
*/
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) override;
};
#endif

2
eeschema/netlist_exporters/netlist_exporter_generic.h
View File

@ -63,7 +63,7 @@ public:
* Function WriteNetlist
* writes to specified output file
*/
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) override;
#define GNL_ALL ( GNL_LIBRARIES | GNL_COMPONENTS | GNL_PARTS | GNL_HEADER | GNL_NETS )

2
eeschema/netlist_exporters/netlist_exporter_orcadpcb2.h
View File

@ -40,7 +40,7 @@ public:
{
}
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) override;
};
#endif

2
eeschema/netlist_exporters/netlist_exporter_pspice.h
View File

@ -126,7 +126,7 @@ public:
* Function WriteNetlist
* writes to specified output file
*/
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions );
bool WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) override;
///> @copydoc NETLIST_EXPORTER::Format()
bool Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl );

6
eeschema/sch_base_frame.h
View File

@ -96,7 +96,7 @@ public:
* level indicator in dialogs.
* Virtual from the base class
*/
const wxString GetZoomLevelIndicator() const;
const wxString GetZoomLevelIndicator() const override;
void SetPageSettings( const PAGE_INFO& aPageSettings ); // overload EDA_DRAW_FRAME
const PAGE_INFO& GetPageSettings () const; // overload EDA_DRAW_FRAME
@ -114,8 +114,8 @@ public:
// Virtual from EDA_DRAW_FRAME
// the background color of the draw canvas:
EDA_COLOR_T GetDrawBgColor() const;
void SetDrawBgColor( EDA_COLOR_T aColor);
EDA_COLOR_T GetDrawBgColor() const override;
void SetDrawBgColor( EDA_COLOR_T aColor) override;
const TITLE_BLOCK& GetTitleBlock() const; // overload EDA_DRAW_FRAME
void SetTitleBlock( const TITLE_BLOCK& aTitleBlock ); // overload EDA_DRAW_FRAME

22
eeschema/sch_bitmap.h
View File

@ -96,7 +96,7 @@ public:
const EDA_RECT GetBoundingBox() const; // Virtual
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
@ -110,9 +110,9 @@ public:
*/
bool ReadImageFile( const wxString& aFullFilename );
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
void Move( const wxPoint& aMoveVector )
{
@ -120,13 +120,13 @@ public:
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
wxString GetSelectMenuText() const { return wxString( _( "Image" ) ); }
@ -136,13 +136,13 @@ public:
void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override

40
eeschema/sch_bus_entry.h
View File

@ -80,7 +80,7 @@ public:
void SetSize( const wxSize& aSize ) { m_size = aSize; }
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
@ -95,23 +95,23 @@ public:
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override;
bool IsDanglingStateChanged( std::vector<DANGLING_END_ITEM>& aItemList );
bool IsDanglingStateChanged( std::vector<DANGLING_END_ITEM>& aItemList ) override;
bool IsDangling() const;
bool IsDangling() const override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const { return true; }
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
BITMAP_DEF GetMenuImage() const { return add_entry_xpm; }
@ -119,11 +119,11 @@ public:
void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
@ -147,13 +147,13 @@ public:
return wxT( "SCH_BUS_WIRE_ENTRY" );
}
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
int GetPenSize() const;
int GetPenSize() const override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
};
/**
@ -173,13 +173,13 @@ public:
return wxT( "SCH_BUS_BUS_ENTRY" );
}
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
int GetPenSize() const;
int GetPenSize() const override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
};
#endif // _SCH_BUS_ENTRY_H_

40
eeschema/sch_component.h
View File

@ -210,9 +210,9 @@ public:
*/
int GetUnitCount() const;
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
/**
* Function SetOrientation
@ -247,7 +247,7 @@ public:
*/
wxPoint GetScreenCoord( const wxPoint& aPoint );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
/**
* Function ClearAnnotation
@ -397,7 +397,7 @@ public:
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor,
bool aDrawPinText );
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
// returns a unique ID, in the form of a path.
wxString GetPath( const SCH_SHEET_PATH* sheet ) const;
@ -461,15 +461,15 @@ public:
SetModified();
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList );
void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList ) override;
/**
* Test if the component's dangling state has changed for one given pin index. As
@ -490,17 +490,17 @@ public:
* @param aItemList - list of all DANGLING_END_ITEMs to be tested
* @return true if any pin's state has changed.
*/
bool IsDanglingStateChanged( std::vector<DANGLING_END_ITEM>& aItemList );
bool IsDanglingStateChanged( std::vector<DANGLING_END_ITEM>& aItemList ) override;
/**
* Return whether any pin has dangling status. Does NOT update the internal status,
* only checks the existing status.
*/
bool IsDangling() const;
bool IsDangling() const override;
wxPoint GetPinPhysicalPosition( LIB_PIN* Pin );
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const { return true; }
@ -511,7 +511,7 @@ public:
*/
bool IsInNetlist() const;
void GetConnectionPoints( std::vector<wxPoint>& aPoints ) const;
void GetConnectionPoints( std::vector<wxPoint>& aPoints ) const override;
SEARCH_RESULT Visit( INSPECTOR inspector, void* testData, const KICAD_T scanTypes[] ) override;
@ -525,14 +525,14 @@ public:
*/
LIB_ITEM* GetDrawItem( const wxPoint& aPosition, KICAD_T aType = TYPE_NOT_INIT );
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_component_xpm; }
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
SCH_SHEET_PATH* aSheetPath );
bool operator <( const SCH_ITEM& aItem ) const;
bool operator <( const SCH_ITEM& aItem ) const override;
bool operator==( const SCH_COMPONENT& aComponent) const;
bool operator!=( const SCH_COMPONENT& aComponent) const;
@ -545,20 +545,20 @@ public:
void SetPosition( const wxPoint& aPosition ) { Move( aPosition - m_Pos ); }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override
#endif
private:
bool doIsConnected( const wxPoint& aPosition ) const;
bool doIsConnected( const wxPoint& aPosition ) const override;
};

28
eeschema/sch_field.h
View File

@ -120,7 +120,7 @@ public:
return len == 0 || ( len == 1 && m_Text[0] == wxChar( '~' ) );
}
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
/**
* Function ImportValues
@ -130,7 +130,7 @@ public:
*/
void ImportValues( const LIB_FIELD& aSource );
int GetPenSize() const;
int GetPenSize() const override;
/**
* Function IsVisible
@ -144,7 +144,7 @@ public:
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
// Geometric transforms (used in block operations):
@ -154,7 +154,7 @@ public:
}
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
/**
* @copydoc SCH_ITEM::MirrorX()
@ -178,29 +178,29 @@ public:
{
}
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL );
bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const;
BITMAP_DEF GetMenuImage() const override;
bool IsReplaceable() const { return true; }
wxPoint GetLibPosition() const { return m_Pos; }
wxPoint GetPosition() const;
wxPoint GetPosition() const override;
void SetPosition( const wxPoint& aPosition );
void SetPosition( const wxPoint& aPosition ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override

28
eeschema/sch_junction.h
View File

@ -53,60 +53,60 @@ public:
static int GetSymbolSize() { return m_symbolSize; }
static void SetSymbolSize( int aSize ) { m_symbolSize = aSize; }
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
const EDA_RECT GetBoundingBox() const; // Virtual
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
void Move( const wxPoint& aMoveVector )
{
m_pos += aMoveVector;
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const { return true; }
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); }
BITMAP_DEF GetMenuImage() const { return add_junction_xpm; }
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath );
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
wxPoint GetPosition() const { return m_pos; }
void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false,
int aAccuracy = 0 ) const;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override
#endif
private:
bool doIsConnected( const wxPoint& aPosition ) const;
bool doIsConnected( const wxPoint& aPosition ) const override;
};

44
eeschema/sch_line.h
View File

@ -87,19 +87,19 @@ public:
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
int GetPenSize() const;
int GetPenSize() const override;
void Move( const wxPoint& aMoveVector );
void Move( const wxPoint& aMoveVector ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
/**
* Check line against \a aLine to see if it overlaps and merge if it does.
@ -113,44 +113,44 @@ public:
*/
bool MergeOverlap( SCH_LINE* aLine );
void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList );
void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList ) override;
bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override;
bool IsDangling() const { return m_startIsDangling || m_endIsDangling; }
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const;
bool IsConnectable() const override;
void GetConnectionPoints(std::vector< wxPoint >& aPoints ) const;
void GetConnectionPoints(std::vector< wxPoint >& aPoints ) const override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const;
BITMAP_DEF GetMenuImage() const override;
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath );
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
bool operator <( const SCH_ITEM& aItem ) const;
bool operator <( const SCH_ITEM& aItem ) const override;
wxPoint GetPosition() const { return m_start; }
void SetPosition( const wxPoint& aPosition );
void SetPosition( const wxPoint& aPosition ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override
#endif
private:
bool doIsConnected( const wxPoint& aPosition ) const;
bool doIsConnected( const wxPoint& aPosition ) const override;
};

18
eeschema/sch_marker.h
View File

@ -63,7 +63,7 @@ public:
(void) aPlotter;
}
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
EDA_RECT const GetBoundingBox() const; // Virtual
@ -75,11 +75,11 @@ public:
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
/**
* Function Matches, virtual from the base class EDA_ITEM
@ -91,11 +91,11 @@ public:
* @param aFindLocation - a wxPoint where to put the location of matched item. can be NULL.
* @return True if the DRC main or auxiliary text matches the search criteria.
*/
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
wxString GetSelectMenuText() const { return wxString( _( "ERC Marker" ) ); }
@ -105,9 +105,9 @@ public:
void SetPosition( const wxPoint& aPosition ) { m_Pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override

32
eeschema/sch_no_connect.h
View File

@ -51,18 +51,18 @@ public:
return wxT( "SCH_NO_CONNECT" );
}
int GetPenSize() const;
int GetPenSize() const override;
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList );
void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override;
const EDA_RECT GetBoundingBox() const; // Virtual
@ -73,42 +73,42 @@ public:
m_pos += aMoveVector;
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const { return true; }
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); }
BITMAP_DEF GetMenuImage() const { return noconn_xpm; }
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath );
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
wxPoint GetPosition() const { return m_pos; }
void SetPosition( const wxPoint& aPosition ) { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
#endif
private:
bool doIsConnected( const wxPoint& aPosition ) const;
bool doIsConnected( const wxPoint& aPosition ) const override;
};

70
eeschema/sch_sheet.h
View File

@ -121,11 +121,11 @@ public:
* @param aPoints = a buffer to fill with polygon corners coordinates
* @param aPos = Position of the shape
*/
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos );
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos ) override;
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
int GetPenSize() const;
int GetPenSize() const override;
/**
* Get the sheet label number.
@ -160,9 +160,9 @@ public:
*/
SCH_SHEET* GetParent() const { return (SCH_SHEET*) m_Parent; }
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override
@ -175,13 +175,13 @@ public:
m_Pos += aMoveVector;
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL )
{
@ -190,19 +190,19 @@ public:
bool IsReplaceable() const { return true; }
void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList );
void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override;
bool IsConnectable() const { return true; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_hierar_pin_xpm; }
void SetPosition( const wxPoint& aPosition ) { ConstrainOnEdge( aPosition ); }
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
};
@ -323,11 +323,11 @@ public:
*/
int GetScreenCount() const;
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
/* there is no member for orientation in sch_sheet, to preserve file
* format, we detect orientation based on pin edges
@ -426,12 +426,12 @@ public:
*/
int GetMinHeight() const;
int GetPenSize() const;
int GetPenSize() const override;
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );
EDA_RECT const GetBoundingBox() const;
EDA_RECT const GetBoundingBox() const override;
/**
* Function GetResizePos
@ -441,7 +441,7 @@ public:
*/
wxPoint GetResizePosition() const;
void SwapData( SCH_ITEM* aItem );
void SwapData( SCH_ITEM* aItem ) override;
/**
* Function ComponentCount
@ -525,15 +525,15 @@ public:
}
}
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL );
bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override;
bool IsReplaceable() const { return true; }
@ -556,21 +556,21 @@ public:
*/
wxPoint GetFileNamePosition();
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override;
bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override;
bool IsDangling() const;
bool IsDangling() const override;
bool IsSelectStateChanged( const wxRect& aRect );
bool IsSelectStateChanged( const wxRect& aRect ) override;
bool IsConnectable() const { return true; }
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
SEARCH_RESULT Visit( INSPECTOR inspector, void* testData, const KICAD_T scanTypes[] ) override;
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; }
@ -581,15 +581,15 @@ public:
wxPoint GetPosition() const { return m_pos; }
void SetPosition( const wxPoint& aPosition );
void SetPosition( const wxPoint& aPosition ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const;
bool HitTest( const EDA_RECT& aRect, bool aContained = false, int aAccuracy = 0 ) const override;
void Plot( PLOTTER* aPlotter );
void Plot( PLOTTER* aPlotter ) override;
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override

92
eeschema/sch_text.h
View File

@ -147,15 +147,15 @@ public:
aPoints.clear();
}
virtual void SwapData( SCH_ITEM* aItem );
virtual void SwapData( SCH_ITEM* aItem ) override;
virtual const EDA_RECT GetBoundingBox() const;
virtual const EDA_RECT GetBoundingBox() const override;
virtual bool Save( FILE* aFile ) const;
virtual bool Save( FILE* aFile ) const override;
virtual bool Load( LINE_READER& aLine, wxString& aErrorMsg );
virtual bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
virtual int GetPenSize() const;
virtual int GetPenSize() const override;
// Geometric transforms (used in block operations):
@ -164,13 +164,13 @@ public:
m_Pos += aMoveVector;
}
virtual void MirrorY( int aYaxis_position );
virtual void MirrorY( int aYaxis_position ) override;
virtual void MirrorX( int aXaxis_position );
virtual void MirrorX( int aXaxis_position ) override;
virtual void Rotate( wxPoint aPosition );
virtual void Rotate( wxPoint aPosition ) override;
virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
virtual bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL )
{
@ -179,19 +179,19 @@ public:
virtual bool IsReplaceable() const { return true; }
virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList );
virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override;
virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) override;
virtual bool IsDangling() const { return m_isDangling; }
virtual bool IsSelectStateChanged( const wxRect& aRect );
virtual bool IsSelectStateChanged( const wxRect& aRect ) override;
virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
virtual bool CanIncrementLabel() const { return true; }
virtual wxString GetSelectMenuText() const;
virtual wxString GetSelectMenuText() const override;
virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
@ -202,16 +202,16 @@ public:
virtual void SetPosition( const wxPoint& aPosition ) { m_Pos = aPosition; }
virtual bool HitTest( const wxPoint& aPosition, int aAccuracy ) const;
virtual bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
virtual bool HitTest( const EDA_RECT& aRect, bool aContained = false,
int aAccuracy = 0 ) const;
virtual void Plot( PLOTTER* aPlotter );
virtual void Plot( PLOTTER* aPlotter ) override;
virtual EDA_ITEM* Clone() const;
virtual EDA_ITEM* Clone() const override;
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
#if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; // override
@ -236,29 +236,29 @@ public:
return wxT( "SCH_LABEL" );
}
void SetOrientation( int aSchematicOrientation );
void SetOrientation( int aSchematicOrientation ) override;
wxPoint GetSchematicTextOffset() const;
wxPoint GetSchematicTextOffset() const override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
const EDA_RECT GetBoundingBox() const; // Virtual
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
bool IsConnectable() const { return true; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_line_label_xpm; }
bool IsReplaceable() const { return true; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; }
@ -282,31 +282,31 @@ public:
return wxT( "SCH_GLOBALLABEL" );
}
void SetOrientation( int aSchematicOrientation );
void SetOrientation( int aSchematicOrientation ) override;
wxPoint GetSchematicTextOffset() const;
wxPoint GetSchematicTextOffset() const override;
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
const EDA_RECT GetBoundingBox() const; // Virtual
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos );
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos ) override;
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool IsConnectable() const { return true; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_glabel_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; }
@ -332,31 +332,31 @@ public:
return wxT( "SCH_HIERLABEL" );
}
void SetOrientation( int aSchematicOrientation );
void SetOrientation( int aSchematicOrientation ) override;
wxPoint GetSchematicTextOffset() const;
wxPoint GetSchematicTextOffset() const override;
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& Pos );
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& Pos ) override;
bool Save( FILE* aFile ) const;
bool Save( FILE* aFile ) const override;
bool Load( LINE_READER& aLine, wxString& aErrorMsg );
bool Load( LINE_READER& aLine, wxString& aErrorMsg ) override;
const EDA_RECT GetBoundingBox() const; // Virtual
void MirrorY( int aYaxis_position );
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position );
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition );
void Rotate( wxPoint aPosition ) override;
bool IsConnectable() const { return true; }
wxString GetSelectMenuText() const;
wxString GetSelectMenuText() const override;
BITMAP_DEF GetMenuImage() const { return add_hierarchical_label_xpm; }
EDA_ITEM* Clone() const;
EDA_ITEM* Clone() const override;
private:
bool doIsConnected( const wxPoint& aPosition ) const { return m_Pos == aPosition; }

2
eeschema/sch_validators.h
View File

@ -65,7 +65,7 @@ public:
* @param aParent - a pointer to the parent window of the error message dialog.
* @return true if the text in the control is valid otherwise false.
*/
virtual bool Validate( wxWindow *aParent );
virtual bool Validate( wxWindow *aParent ) override;
};

44
eeschema/schframe.h
View File

@ -192,13 +192,13 @@ protected:
*
* @return true if the auto save was successful otherwise false.
*/
virtual bool doAutoSave();
virtual bool doAutoSave() override;
/**
* Function autoSaveRequired
* returns true if the schematic has been modified.
*/
virtual bool isAutoSaveRequired() const;
virtual bool isAutoSaveRequired() const override;
/**
* Function addCurrentItemToList
@ -266,7 +266,7 @@ public:
void Process_Config( wxCommandEvent& event );
void OnSelectTool( wxCommandEvent& aEvent );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override;
/**
* Function GetProjectFileParametersList
@ -284,7 +284,7 @@ public:
* saves changes to the project settings to the project (.pro) file.
* @param aAskForSave = true to open a dialog before saving the settings
*/
void SaveProjectSettings( bool aAskForSave );
void SaveProjectSettings( bool aAskForSave ) override;
/**
* Function LoadProjectFile
@ -361,21 +361,21 @@ public:
*/
PARAM_CFG_ARRAY& GetConfigurationSettings();
void LoadSettings( wxConfigBase* aCfg );
void SaveSettings( wxConfigBase* aCfg );
void LoadSettings( wxConfigBase* aCfg ) override;
void SaveSettings( wxConfigBase* aCfg ) override;
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void RedrawActiveWindow( wxDC* DC, bool EraseBg ) override;
void CreateScreens();
void ReCreateHToolbar();
void ReCreateVToolbar();
void ReCreateHToolbar() override;
void ReCreateVToolbar() override;
void ReCreateOptToolbar();
void ReCreateMenuBar();
void ReCreateMenuBar() override;
///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription()
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const;
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const override;
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL );
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL ) override;
/**
* Function OnModify
@ -385,7 +385,7 @@ public:
*/
void OnModify();
virtual wxString GetScreenDesc() const;
virtual wxString GetScreenDesc() const override;
void InstallConfigFrame( wxCommandEvent& event );
@ -395,15 +395,15 @@ public:
* this is a virtual function called by EDA_DRAW_FRAME::OnSockRequest().
* @param cmdline = received command from socket
*/
virtual void ExecuteRemoteCommand( const char* cmdline );
virtual void ExecuteRemoteCommand( const char* cmdline ) override;
void KiwayMailIn( KIWAY_EXPRESS& aEvent ); // override virtual from KIWAY_PLAYER
void OnLeftClick( wxDC* aDC, const wxPoint& aPosition );
void OnLeftDClick( wxDC* aDC, const wxPoint& aPosition );
bool OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu );
void OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) override;
void OnLeftDClick( wxDC* aDC, const wxPoint& aPosition ) override;
bool OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) override;
void OnSelectOptionToolbar( wxCommandEvent& event );
double BestZoom();
double BestZoom() override;
/**
* Function LocateAndShowItem
@ -1216,7 +1216,7 @@ public:
* Function InitBlockPasteInfos
* initializes the parameters used by the block paste command.
*/
void InitBlockPasteInfos();
void InitBlockPasteInfos() override;
/**
* Function BlockCommand
@ -1226,7 +1226,7 @@ public:
* @param aKey = the key modifiers (Alt, Shift ...)
* @return the block command id (BLOCK_MOVE, BLOCK_COPY...)
*/
virtual int BlockCommand( EDA_KEY aKey );
virtual int BlockCommand( EDA_KEY aKey ) override;
/**
* Function HandleBlockPlace
@ -1235,7 +1235,7 @@ public:
* (bloc move, drag, copy .. )
* Parameters must be initialized in GetScreen()->m_BlockLocate
*/
virtual void HandleBlockPlace( wxDC* DC );
virtual void HandleBlockPlace( wxDC* DC ) override;
/**
* Function HandleBlockEnd
@ -1249,7 +1249,7 @@ public:
* @return false if no item selected, or command finished,
* true if some items found and HandleBlockPlace must be called later
*/
virtual bool HandleBlockEnd( wxDC* aDC );
virtual bool HandleBlockEnd( wxDC* aDC ) override;
/**
* Function RepeatDrawItem

28
eeschema/viewlib_frame.h
View File

@ -61,7 +61,7 @@ public:
~LIB_VIEW_FRAME();
void OnSize( wxSizeEvent& event );
void OnSize( wxSizeEvent& event ) override;
/**
* Function ReCreateListLib
@ -74,23 +74,23 @@ public:
void ReCreateListCmp();
void Process_Special_Functions( wxCommandEvent& event );
void DisplayLibInfos();
void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void RedrawActiveWindow( wxDC* DC, bool EraseBg ) override;
void OnCloseWindow( wxCloseEvent& Event );
void CloseLibraryViewer( wxCommandEvent& event );
void ReCreateHToolbar();
void ReCreateVToolbar();
void ReCreateMenuBar();
void ReCreateHToolbar() override;
void ReCreateVToolbar() override;
void ReCreateMenuBar() override;
void OnLeftClick( wxDC* DC, const wxPoint& MousePos );
double BestZoom();
void OnLeftClick( wxDC* DC, const wxPoint& MousePos ) override;
double BestZoom() override;
void ClickOnLibList( wxCommandEvent& event );
void ClickOnCmpList( wxCommandEvent& event );
void OnSetRelativeOffset( wxCommandEvent& event );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 );
bool GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KEY aHotKey = 0 ) override;
///> @copydoc EDA_DRAW_FRAME::GetHotKeyDescription()
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const;
EDA_HOTKEY* GetHotKeyDescription( int aCommand ) const override;
/**
* Function OnHotKey
@ -100,10 +100,10 @@ public:
* case insensitive
* </p>
*/
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL );
bool OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, EDA_ITEM* aItem = NULL ) override;
void LoadSettings( wxConfigBase* aCfg );
void SaveSettings( wxConfigBase* aCfg );
void LoadSettings( wxConfigBase* aCfg ) override;
void SaveSettings( wxConfigBase* aCfg ) override;
/**
* set a filter to display only libraries and/or components
@ -143,7 +143,7 @@ private:
* is called when the frame frame is activate to reload the libraries and component lists
* that can be changed by the schematic editor or the library editor.
*/
virtual void OnActivate( wxActivateEvent& event );
virtual void OnActivate( wxActivateEvent& event ) override;
void SelectCurrentLibrary();
void SelectAndViewLibraryPart( int option );
@ -154,7 +154,7 @@ private:
*/
void ExportToSchematicLibraryPart( wxCommandEvent& event );
void ViewOneLibraryContent( PART_LIB* Lib, int Flag );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu ) override;
void DClickOnCmpList( wxCommandEvent& event );
// Private members:

8
gerbview/class_gbr_layer_box_selector.h
View File

@ -42,18 +42,18 @@ public:
// Reload the Layers names and bitmaps
// Virtual function
void Resync();
void Resync() override;
// Returns a color index from the layer id
// Virtual function
EDA_COLOR_T GetLayerColor( int aLayer ) const;
EDA_COLOR_T GetLayerColor( int aLayer ) const override;
// Returns true if the layer id is enabled (i.e. is it should be displayed)
// Virtual function
bool IsLayerEnabled( int aLayer ) const { return true; };
bool IsLayerEnabled( int aLayer ) const override { return true; }
// Returns the name of the layer id
wxString GetLayerName( int aLayer ) const;
wxString GetLayerName( int aLayer ) const override;
};
#endif //CLASS_GBR_LAYER_BOX_SELECTOR_H

4
gerbview/class_gbr_screen.h
View File

@ -50,13 +50,13 @@ public:
GBR_SCREEN* Next() const { return static_cast<GBR_SCREEN*>( Pnext ); }
virtual int MilsToIuScalar();
virtual int MilsToIuScalar() override;
/**
* Function ClearUndoORRedoList
* virtual pure in BASE_SCREEN, so it must be defined here
*/
void ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount = -1 );
void ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount = -1 ) override;
};

4
gerbview/class_gerber_draw_item.h
View File

@ -227,7 +227,7 @@ public:
/* divers */
int Shape() const { return m_Shape; }
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList );
void GetMsgPanelInfo( std::vector< MSG_PANEL_ITEM >& aList ) override;
wxString ShowGBRShape();
@ -237,7 +237,7 @@ public:
* @param aRefPos a wxPoint to test
* @return bool - true if a hit, else false
*/
bool HitTest( const wxPoint& aRefPos ) const;
bool HitTest( const wxPoint& aRefPos ) const override;
/**
* Function HitTest (overloaded)

Some files were not shown because too many files have changed in this diff Show More