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

5
pcbnew/pcb_general_settings.cpp
View File

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

8
pcbnew/pcb_general_settings.h
View File

@ -44,15 +44,11 @@ public:
void Load( wxConfigBase* aCfg ) override; void Load( wxConfigBase* aCfg ) override;
void Save( wxConfigBase* aCfg ) override; void Save( wxConfigBase* aCfg ) override;
COLORS_DESIGN_SETTINGS m_colorsSettings;
COLORS_DESIGN_SETTINGS& Colors() COLORS_DESIGN_SETTINGS& Colors()
{ {
return m_colorsSettings; return m_colorsSettings;
} }
FRAME_T m_frameType;
bool m_legacyDrcOn = true; // Not stored, always true when starting pcbnew, bool m_legacyDrcOn = true; // Not stored, always true when starting pcbnew,
// false only on request during routing, and // false only on request during routing, and
// always for temporary use // 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_magneticPads = CAPTURE_CURSOR_IN_TRACK_TOOL;
MAGNETIC_PAD_OPTION_VALUES m_magneticTracks = 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 #endif