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

Code formatting

This commit is contained in:
Maciej Suminski 2018-03-01 16:31:48 +01:00
parent 98616da017
commit 9127e09815
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/core/settings.h
View File

@ -90,24 +90,24 @@ class SETTINGS
#endif
void Add ( const wxString& name, int* aPtr, int aDefaultValue )
void Add( const wxString& name, int* aPtr, int aDefaultValue )
{
m_params.push_back ( new PARAM_CFG_INT ( m_prefix+name, aPtr, aDefaultValue ) );
m_params.push_back( new PARAM_CFG_INT ( m_prefix+name, aPtr, aDefaultValue ) );
}
void Add ( const wxString& name, bool* aPtr, bool aDefaultValue )
void Add( const wxString& name, bool* aPtr, bool aDefaultValue )
{
m_params.push_back ( new PARAM_CFG_BOOL ( m_prefix+name, aPtr, aDefaultValue ) );
m_params.push_back( new PARAM_CFG_BOOL ( m_prefix+name, aPtr, aDefaultValue ) );
}
void Add ( const wxString& name, KIGFX::COLOR4D* aPtr, KIGFX::COLOR4D aDefaultValue )
void Add( const wxString& name, KIGFX::COLOR4D* aPtr, KIGFX::COLOR4D aDefaultValue )
{
m_params.push_back ( new PARAM_CFG_SETCOLOR ( m_prefix+name, aPtr, aDefaultValue ) );
m_params.push_back( new PARAM_CFG_SETCOLOR ( m_prefix+name, aPtr, aDefaultValue ) );
}
void Add ( const wxString& name, KIGFX::COLOR4D* aPtr, EDA_COLOR_T aDefaultValue )
void Add( const wxString& name, KIGFX::COLOR4D* aPtr, EDA_COLOR_T aDefaultValue )
{
m_params.push_back ( new PARAM_CFG_SETCOLOR ( m_prefix+name, aPtr, aDefaultValue ) );
m_params.push_back( new PARAM_CFG_SETCOLOR ( m_prefix+name, aPtr, aDefaultValue ) );
}

5
pcbnew/pcb_general_settings.cpp
View File

@ -24,10 +24,8 @@
#include <pcb_general_settings.h>
PCB_GENERAL_SETTINGS::PCB_GENERAL_SETTINGS( FRAME_T aFrameType )
: m_colorsSettings( aFrameType )
: m_frameType( aFrameType ), m_colorsSettings( aFrameType )
{
m_frameType = aFrameType;
if( m_frameType == FRAME_PCB )
{
Add( "LegacyAutoDeleteOldTrack", &m_legacyAutoDeleteOldTrack, true );
@ -41,6 +39,7 @@ PCB_GENERAL_SETTINGS::PCB_GENERAL_SETTINGS( FRAME_T aFrameType )
}
}
void PCB_GENERAL_SETTINGS::Load( wxConfigBase* aCfg )
{
m_colorsSettings.Load( aCfg );

10
pcbnew/pcb_general_settings.h
View File

@ -41,18 +41,14 @@ class PCB_GENERAL_SETTINGS : public SETTINGS
public:
PCB_GENERAL_SETTINGS( FRAME_T aFrameType );
void Load ( wxConfigBase* aCfg ) override;
void Load( wxConfigBase* aCfg ) override;
void Save( wxConfigBase* aCfg ) override;
COLORS_DESIGN_SETTINGS m_colorsSettings;
COLORS_DESIGN_SETTINGS& Colors()
{
return m_colorsSettings;
}
FRAME_T m_frameType;
bool m_legacyDrcOn = true; // Not stored, always true when starting pcbnew,
// false only on request during routing, and
// always for temporary use
@ -67,6 +63,10 @@ public:
MAGNETIC_PAD_OPTION_VALUES m_magneticPads = CAPTURE_CURSOR_IN_TRACK_TOOL;
MAGNETIC_PAD_OPTION_VALUES m_magneticTracks = CAPTURE_CURSOR_IN_TRACK_TOOL;
protected:
const FRAME_T m_frameType;
COLORS_DESIGN_SETTINGS m_colorsSettings;
};
#endif