Minot fixes: Minor coding style issues fix (tab -> spaces). Add missing GetClass to all classes derived from EDA_ITEM. Make debug method Show() only compiled in debug mode.

This commit is contained in:
unknown 2015-03-06 09:58:32 +01:00 committed by jean-pierre charras
parent 02c8d4db8a
commit c3e3ff3682
28 changed files with 118 additions and 29 deletions

View File

@ -65,6 +65,14 @@ public:
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
#endif #endif
/** Get class name
* @return string "S3D_MATERIAL"
*/
virtual wxString GetClass() const
{
return wxT( "S3D_MATERIAL" );
}
}; };
void SetOpenGlDefaultMaterial(); void SetOpenGlDefaultMaterial();

View File

@ -176,6 +176,14 @@ public:
return m_Shape3DName; return m_Shape3DName;
} }
/** Get class name
* @return string "S3D_MASTER"
*/
virtual wxString GetClass() const
{
return wxT( "S3D_MASTER" );
}
/** /**
* Function GetShape3DFullFilename * Function GetShape3DFullFilename
* @return the full filename of the 3D shape, * @return the full filename of the 3D shape,

View File

@ -98,7 +98,7 @@ private:
void OnDateApplyClick( wxCommandEvent& event ); void OnDateApplyClick( wxCommandEvent& event );
// .kicad_wks file description selection // .kicad_wks file description selection
void OnWksFileSelection( wxCommandEvent& event ); void OnWksFileSelection( wxCommandEvent& event );
// Save in the current title block the new page settings // Save in the current title block the new page settings
// return true if changes are made, or false if not // return true if changes are made, or false if not

View File

@ -48,7 +48,7 @@ private:
void OnOkClick( wxCommandEvent& event ); void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
void OnAddFiles( wxCommandEvent& event ); void OnAddFiles( wxCommandEvent& event );
void OnEditEquFile( wxCommandEvent& event ); void OnEditEquFile( wxCommandEvent& event );
void OnRemoveFiles( wxCommandEvent& event ); void OnRemoveFiles( wxCommandEvent& event );
void OnButtonMoveUp( wxCommandEvent& event ); void OnButtonMoveUp( wxCommandEvent& event );
void OnButtonMoveDown( wxCommandEvent& event ); void OnButtonMoveDown( wxCommandEvent& event );

View File

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

View File

@ -63,7 +63,7 @@ private:
void DeleteAllFootprintFilter(wxCommandEvent& event); void DeleteAllFootprintFilter(wxCommandEvent& event);
void DeleteOneFootprintFilter(wxCommandEvent& event); void DeleteOneFootprintFilter(wxCommandEvent& event);
void AddFootprintFilter(wxCommandEvent& event); void AddFootprintFilter(wxCommandEvent& event);
void EditOneFootprintFilter( wxCommandEvent& event ); void EditOneFootprintFilter( wxCommandEvent& event );
}; };
#endif #endif

View File

@ -117,8 +117,8 @@ private:
void deleteFieldButtonHandler( wxCommandEvent& event ); void deleteFieldButtonHandler( wxCommandEvent& event );
void moveUpButtonHandler( wxCommandEvent& event ); void moveUpButtonHandler( wxCommandEvent& event );
void showButtonHandler( wxCommandEvent& event ); void showButtonHandler( wxCommandEvent& event );
void OnTestChipName( wxCommandEvent& event ); void OnTestChipName( wxCommandEvent& event );
void OnSelectChipName( wxCommandEvent& event ); void OnSelectChipName( wxCommandEvent& event );
SCH_FIELD* findField( const wxString& aFieldName ); SCH_FIELD* findField( const wxString& aFieldName );

View File

@ -60,7 +60,7 @@ public:
private: private:
// Events handlers: // Events handlers:
void OnInitDialog( wxInitDialogEvent& event ); void OnInitDialog( wxInitDialogEvent& event );
void OnCloseDialog( wxCloseEvent& event ); void OnCloseDialog( wxCloseEvent& event );
void OnListItemDeselected( wxListEvent& event ); void OnListItemDeselected( wxListEvent& event );
void OnListItemSelected( wxListEvent& event ); void OnListItemSelected( wxListEvent& event );

View File

@ -65,7 +65,7 @@ protected:
* Process the wxWidgets @a event produced when the user click on * Process the wxWidgets @a event produced when the user click on
* the check box which controls the field visibility * the check box which controls the field visibility
*/ */
void OnVisibleFieldClick( wxCommandEvent& event ); void OnVisibleFieldClick( wxCommandEvent& event );
/** /**
* Function OnAddButtonClick * Function OnAddButtonClick

View File

@ -62,7 +62,7 @@ private:
void Init(); void Init();
// from DIALOG_ERC_BASE: // from DIALOG_ERC_BASE:
void OnCloseErcDialog( wxCloseEvent& event ); void OnCloseErcDialog( wxCloseEvent& event );
void OnErcCmpClick( wxCommandEvent& event ); void OnErcCmpClick( wxCommandEvent& event );
void OnEraseDrcMarkersClick( wxCommandEvent& event ); void OnEraseDrcMarkersClick( wxCommandEvent& event );
void OnButtonCloseClick( wxCommandEvent& event ); void OnButtonCloseClick( wxCommandEvent& event );

View File

@ -60,7 +60,7 @@ private:
void OnPageSetup( wxCommandEvent& event ); void OnPageSetup( wxCommandEvent& event );
void OnPrintPreview( wxCommandEvent& event ); void OnPrintPreview( wxCommandEvent& event );
void OnPrintButtonClick( wxCommandEvent& event ); void OnPrintButtonClick( wxCommandEvent& event );
void OnButtonCancelClick( wxCommandEvent& event ){ Close(); } void OnButtonCancelClick( wxCommandEvent& event ) { Close(); }
void GetPrintOptions(); void GetPrintOptions();
}; };

View File

@ -386,10 +386,7 @@ public:
* returns the class name. * returns the class name.
* @return wxString * @return wxString
*/ */
virtual wxString GetClass() const virtual wxString GetClass() const = 0;
{
return wxT( "EDA_ITEM" );
}
/** /**
* Function GetSelectMenuText * Function GetSelectMenuText

View File

@ -123,10 +123,20 @@ public:
/// @copydoc VIEW_ITEM::ViewGetLayers() /// @copydoc VIEW_ITEM::ViewGetLayers()
void ViewGetLayers( int aLayers[], int& aCount ) const; void ViewGetLayers( int aLayers[], int& aCount ) const;
#if defined(DEBUG)
/// @copydoc EDA_ITEM::Show() /// @copydoc EDA_ITEM::Show()
void Show( int x, std::ostream& st ) const void Show( int x, std::ostream& st ) const
{ {
} }
#endif
/** Get class name
* @return string "WORKSHEET_VIEWITEM"
*/
virtual wxString GetClass() const
{
return wxT( "WORKSHEET_VIEWITEM" );
}
protected: protected:
/// File name displayed in the title block /// File name displayed in the title block

View File

@ -43,8 +43,8 @@ public:
DIALOG_NEW_DATAITEM( PL_EDITOR_FRAME* aCaller, WORKSHEET_DATAITEM* aItem ); DIALOG_NEW_DATAITEM( PL_EDITOR_FRAME* aCaller, WORKSHEET_DATAITEM* aItem );
private: private:
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
void OnOKClick( wxCommandEvent& event ); void OnOKClick( wxCommandEvent& event );
void initDlg(); void initDlg();
}; };

View File

@ -57,6 +57,14 @@ public:
#if defined(DEBUG) #if defined(DEBUG)
virtual void Show( int nestLevel, std::ostream& os ) const {} virtual void Show( int nestLevel, std::ostream& os ) const {}
#endif #endif
/** Get class name
* @return string "PL_ITEM_LAYOUT"
*/
virtual wxString GetClass() const
{
return wxT( "PL_ITEM_LAYOUT" );
}
}; };
void PL_EDITOR_FRAME::SaveCopyInUndoList() void PL_EDITOR_FRAME::SaveCopyInUndoList()

View File

@ -48,8 +48,8 @@ public:
~PROPERTIES_FRAME(); ~PROPERTIES_FRAME();
// Event functions // Event functions
void OnAcceptPrms( wxCommandEvent& event ); void OnAcceptPrms( wxCommandEvent& event );
void OnSetDefaultValues( wxCommandEvent& event ); void OnSetDefaultValues( wxCommandEvent& event );
// Data transfert from general properties to widgets // Data transfert from general properties to widgets

View File

@ -124,6 +124,14 @@ public:
void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
#endif #endif
/** Get class name
* @return string "MARKER_PCB"
*/
virtual wxString GetClass() const
{
return wxT( "MARKER_PCB" );
}
protected: protected:
///> Pointer to BOARD_ITEM that causes DRC error. ///> Pointer to BOARD_ITEM that causes DRC error.
const BOARD_ITEM* m_item; const BOARD_ITEM* m_item;

View File

@ -111,7 +111,7 @@ private:
void OnMarkerSelectionEvent( wxCommandEvent& event ); void OnMarkerSelectionEvent( wxCommandEvent& event );
void OnUnconnectedSelectionEvent( wxCommandEvent& event ); void OnUnconnectedSelectionEvent( wxCommandEvent& event );
void OnChangingMarkerList( wxNotebookEvent& event ); void OnChangingMarkerList( wxNotebookEvent& event );
void DelDRCMarkers(); void DelDRCMarkers();
void RedrawDrawPanel(); void RedrawDrawPanel();

View File

@ -64,7 +64,7 @@ private:
Edit3DShapeFileName(); Edit3DShapeFileName();
} }
void Remove3DShape( wxCommandEvent& event ); void Remove3DShape( wxCommandEvent& event );
void Add3DShape( wxCommandEvent& event ) void Add3DShape( wxCommandEvent& event )
{ {
BrowseAndAdd3DShapeFile(); BrowseAndAdd3DShapeFile();
} }

View File

@ -41,7 +41,7 @@ public:
private: private:
void OnCellWizardClick( wxGridEvent& event ); void OnCellWizardClick( wxGridEvent& event );
void OnOpenButtonClick( wxCommandEvent& event ); void OnOpenButtonClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
}; };
#endif // _DIALOG_FOOTPRINT_WIZARD_LIST_H_ #endif // _DIALOG_FOOTPRINT_WIZARD_LIST_H_

View File

@ -660,7 +660,7 @@ private:
} }
} }
void OnClickLibraryWizard( wxCommandEvent& event ); void OnClickLibraryWizard( wxCommandEvent& event );
void onCancelButtonClick( wxCommandEvent& event ) void onCancelButtonClick( wxCommandEvent& event )
{ {

View File

@ -43,8 +43,8 @@ public:
DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent ); DIALOG_MODEDIT_OPTIONS( FOOTPRINT_EDIT_FRAME* aParent );
private: private:
void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); } void OnCancelClick( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); }
void OnOkClick( wxCommandEvent& event ); void OnOkClick( wxCommandEvent& event );
void initValues( ); void initValues( );
}; };

View File

@ -186,11 +186,11 @@ private:
void OnRemoveFpLibs( wxCommandEvent& event ); void OnRemoveFpLibs( wxCommandEvent& event );
void OnPathManagementSelection( wxCommandEvent& event ); void OnPathManagementSelection( wxCommandEvent& event );
void OnSelectEnvVarCell( wxGridEvent& event ); void OnSelectEnvVarCell( wxGridEvent& event );
void OnPluginSelection( wxCommandEvent& event ); void OnPluginSelection( wxCommandEvent& event );
#ifdef BUILD_GITHUB_PLUGIN #ifdef BUILD_GITHUB_PLUGIN
void OnGithubLibsList( wxCommandEvent& event ); void OnGithubLibsList( wxCommandEvent& event );
#endif #endif
bool ValidateOptions(); bool ValidateOptions();
}; };

View File

@ -52,10 +52,20 @@ public:
/// @copydoc VIEW_ITEM::ViewGetLayers() /// @copydoc VIEW_ITEM::ViewGetLayers()
void ViewGetLayers( int aLayers[], int& aCount ) const; void ViewGetLayers( int aLayers[], int& aCount ) const;
#if defined(DEBUG)
/// @copydoc EDA_ITEM::Show() /// @copydoc EDA_ITEM::Show()
void Show( int x, std::ostream& st ) const void Show( int x, std::ostream& st ) const
{ {
} }
#endif
/** Get class name
* @return string "RATSNEST_VIEWITEM"
*/
virtual wxString GetClass() const
{
return wxT( "RATSNEST_VIEWITEM" );
}
protected: protected:
///> Object containing ratsnest data. ///> Object containing ratsnest data.

View File

@ -72,7 +72,17 @@ public:
m_clearance = aClearance; m_clearance = aClearance;
} }
#if defined(DEBUG)
void Show( int aA, std::ostream& aB ) const {}; void Show( int aA, std::ostream& aB ) const {};
#endif
/** Get class name
* @return string "ROUTER_PREVIEW_ITEM"
*/
virtual wxString GetClass() const
{
return wxT( "ROUTER_PREVIEW_ITEM" );
}
const BOX2I ViewBBox() const; const BOX2I ViewBBox() const;

View File

@ -55,9 +55,19 @@ public:
aCount = 1; aCount = 1;
} }
#if defined(DEBUG)
void Show( int x, std::ostream& st ) const void Show( int x, std::ostream& st ) const
{ {
} }
#endif
/** Get class name
* @return string "BRIGHT_BOX"
*/
virtual wxString GetClass() const
{
return wxT( "BRIGHT_BOX" );
}
private: private:
static const KIGFX::COLOR4D BOX_COLOR; static const KIGFX::COLOR4D BOX_COLOR;

View File

@ -503,9 +503,19 @@ public:
aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY ); aLayers[0] = ITEM_GAL_LAYER( GP_OVERLAY );
} }
#if defined(DEBUG)
void Show( int x, std::ostream& st ) const void Show( int x, std::ostream& st ) const
{ {
} }
#endif
/** Get class name
* @return string "EDIT_POINTS"
*/
virtual wxString GetClass() const
{
return wxT( "EDIT_POINTS" );
}
private: private:
EDA_ITEM* m_parent; ///< Parent of the EDIT_POINTs EDA_ITEM* m_parent; ///< Parent of the EDIT_POINTs

View File

@ -63,9 +63,19 @@ public:
m_end = aEnd; m_end = aEnd;
} }
#if defined(DEBUG)
void Show( int x, std::ostream& st ) const void Show( int x, std::ostream& st ) const
{ {
} }
#endif
/** Get class name
* @return string "SELECTION_AREA"
*/
virtual wxString GetClass() const
{
return wxT( "SELECTION_AREA" );
}
private: private:
VECTOR2I m_origin, m_end; VECTOR2I m_origin, m_end;