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

Naming conventions.

This commit is contained in:
Jeff Young 2020-11-16 11:16:44 +00:00
parent dff5173baf
commit a207bd97bb
137 changed files with 564 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
View File

@ -134,7 +134,7 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana
m_modelViewer->Refresh(); m_modelViewer->Refresh();
m_modelViewer->SetFocus(); m_modelViewer->SetFocus();
FinishDialogSettings(); finishDialogSettings();
} }
@ -216,14 +216,14 @@ void DLG_SELECT_3DMODEL::updateDirChoiceList( void )
// extract the current project dir // extract the current project dir
if( sL != md->end() ) if( sL != md->end() )
{ {
prjDir = sL->m_pathexp; prjDir = sL->m_Pathexp;
++sL; ++sL;
} }
while( sL != md->end() ) while( sL != md->end() )
{ {
if( !sL->m_pathexp.empty() && sL->m_pathexp.compare( prjDir ) ) if( !sL->m_Pathexp.empty() && sL->m_Pathexp.compare( prjDir ) )
cl.insert( sL->m_pathexp ); cl.insert( sL->m_Pathexp );
++sL; ++sL;
} }

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

@ -79,7 +79,7 @@ DIALOG_3D_VIEW_OPTIONS::DIALOG_3D_VIEW_OPTIONS( EDA_3D_VIEWER* aParent ) :
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
3d-viewer/3d_viewer/eda_3d_viewer.cpp
View File

@ -93,7 +93,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt
wxLogTrace( m_logTrace, "EDA_3D_VIEWER::EDA_3D_VIEWER %s", aTitle ); wxLogTrace( m_logTrace, "EDA_3D_VIEWER::EDA_3D_VIEWER %s", aTitle );
m_disable_ray_tracing = false; m_disable_ray_tracing = false;
m_AboutTitle = "3D Viewer"; m_aboutTitle = "3D Viewer";
// Give it an icon // Give it an icon
wxIcon icon; wxIcon icon;

4
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -179,9 +179,9 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_buttonExportFile->Enable( false ); m_buttonExportFile->Enable( false );
m_buttonExportClipboard->Enable( false ); m_buttonExportClipboard->Enable( false );
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
if ( m_FramePos == wxDefaultPosition ) if ( m_framePos == wxDefaultPosition )
Centre(); Centre();
} }

16
common/advanced_config.cpp
View File

@ -220,11 +220,11 @@ ADVANCED_CFG::ADVANCED_CFG()
// Init defaults - this is done in case the config doesn't exist, // Init defaults - this is done in case the config doesn't exist,
// then the values will remain as set here. // then the values will remain as set here.
m_realTimeConnectivity = true; m_RealTimeConnectivity = true;
m_coroutineStackSize = AC_STACK::default_stack; m_CoroutineStackSize = AC_STACK::default_stack;
m_ShowRouterDebugGraphics = false; m_ShowRouterDebugGraphics = false;
m_drawArcAccuracy = 10.0; m_DrawArcAccuracy = 10.0;
m_drawArcCenterMaxAngle = 50.0; m_DrawArcCenterMaxAngle = 50.0;
m_DrawTriangulationOutlines = false; m_DrawTriangulationOutlines = false;
m_PluginAltiumSch = false; m_PluginAltiumSch = false;
@ -281,7 +281,7 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
std::vector<PARAM_CFG*> configParams; std::vector<PARAM_CFG*> configParams;
configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity, configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity,
&m_realTimeConnectivity, true ) ); &m_RealTimeConnectivity, true ) );
configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::ExtraFillMargin, configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::ExtraFillMargin,
&m_ExtraClearance, 0.0005, 0.0, 1.0 ) ); &m_ExtraClearance, 0.0005, 0.0, 1.0 ) );
@ -293,7 +293,7 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
&m_HoleWallThickness, 0.020, 0.0, 1.0 ) ); &m_HoleWallThickness, 0.020, 0.0, 1.0 ) );
configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::CoroutineStackSize, configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::CoroutineStackSize,
&m_coroutineStackSize, AC_STACK::default_stack, &m_CoroutineStackSize, AC_STACK::default_stack,
AC_STACK::min_stack, AC_STACK::max_stack ) ); AC_STACK::min_stack, AC_STACK::max_stack ) );
configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowRouterDebugGraphics, configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowRouterDebugGraphics,
@ -303,10 +303,10 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
&m_CompactSave, false ) ); &m_CompactSave, false ) );
configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcAccuracy, configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcAccuracy,
&m_drawArcAccuracy, 10.0, 0.0, 100000.0 ) ); &m_DrawArcAccuracy, 10.0, 0.0, 100000.0 ) );
configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcCenterStartEndMaxAngle, configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcCenterStartEndMaxAngle,
&m_drawArcCenterMaxAngle, 50.0, 0.0, 100000.0 ) ); &m_DrawArcCenterMaxAngle, 50.0, 0.0, 100000.0 ) );
configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::StrokeTriangulation, configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::StrokeTriangulation,
&m_DrawTriangulationOutlines, false ) ); &m_DrawTriangulationOutlines, false ) );

4
common/base_screen.cpp
View File

@ -40,8 +40,8 @@ BASE_SCREEN::BASE_SCREEN( EDA_ITEM* aParent, KICAD_T aType ) :
m_pageCount = 1; // Hierarchy: Root: ScreenNumber = 1 m_pageCount = 1; // Hierarchy: Root: ScreenNumber = 1
m_Center = true; m_Center = true;
m_FlagModified = false; // Set when any change is made on board. m_flagModified = false; // Set when any change is made on board.
m_FlagSave = false; // Used in auto save set when an auto save is required. m_flagSave = false; // Used in auto save set when an auto save is required.
} }

16
common/board_printout.cpp
View File

@ -36,8 +36,8 @@
BOARD_PRINTOUT_SETTINGS::BOARD_PRINTOUT_SETTINGS( const PAGE_INFO& aPageInfo ) BOARD_PRINTOUT_SETTINGS::BOARD_PRINTOUT_SETTINGS( const PAGE_INFO& aPageInfo )
: PRINTOUT_SETTINGS( aPageInfo ) : PRINTOUT_SETTINGS( aPageInfo )
{ {
m_layerSet.set(); m_LayerSet.set();
m_mirror = false; m_Mirror = false;
} }
@ -45,10 +45,10 @@ void BOARD_PRINTOUT_SETTINGS::Load( APP_SETTINGS_BASE* aConfig )
{ {
PRINTOUT_SETTINGS::Load( aConfig ); PRINTOUT_SETTINGS::Load( aConfig );
m_layerSet.reset(); m_LayerSet.reset();
for( int layer : aConfig->m_Printing.layers ) for( int layer : aConfig->m_Printing.layers )
m_layerSet.set( layer, true ); m_LayerSet.set( layer, true );
} }
@ -58,8 +58,8 @@ void BOARD_PRINTOUT_SETTINGS::Save( APP_SETTINGS_BASE* aConfig )
aConfig->m_Printing.layers.clear(); aConfig->m_Printing.layers.clear();
for( unsigned layer = 0; layer < m_layerSet.size(); ++layer ) for( unsigned layer = 0; layer < m_LayerSet.size(); ++layer )
if( m_layerSet.test( layer ) ) if( m_LayerSet.test( layer ) )
aConfig->m_Printing.layers.push_back( layer ); aConfig->m_Printing.layers.push_back( layer );
} }
@ -126,7 +126,7 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
} }
} }
setupViewLayers( *view, m_settings.m_layerSet ); setupViewLayers( *view, m_settings.m_LayerSet );
setupPainter( *painter ); setupPainter( *painter );
auto sheetSizeMils = m_settings.m_pageInfo.GetSizeMils(); auto sheetSizeMils = m_settings.m_pageInfo.GetSizeMils();
@ -203,5 +203,5 @@ void BOARD_PRINTOUT::setupPainter( KIGFX::PAINTER& aPainter )
void BOARD_PRINTOUT::setupGal( KIGFX::GAL* aGal ) void BOARD_PRINTOUT::setupGal( KIGFX::GAL* aGal )
{ {
aGal->SetFlip( m_settings.m_mirror, false ); aGal->SetFlip( m_settings.m_Mirror, false );
} }

10
common/dialog_shim.cpp
View File

@ -144,7 +144,7 @@ DIALOG_SHIM::~DIALOG_SHIM()
} }
void DIALOG_SHIM::FinishDialogSettings() void DIALOG_SHIM::finishDialogSettings()
{ {
// must be called from the constructor of derived classes, // must be called from the constructor of derived classes,
// when all widgets are initialized, and therefore their size fixed // when all widgets are initialized, and therefore their size fixed
@ -155,21 +155,21 @@ void DIALOG_SHIM::FinishDialogSettings()
} }
void DIALOG_SHIM::SetSizeInDU( int x, int y ) void DIALOG_SHIM::setSizeInDU( int x, int y )
{ {
wxSize sz( x, y ); wxSize sz( x, y );
SetSize( ConvertDialogToPixels( sz ) ); SetSize( ConvertDialogToPixels( sz ) );
} }
int DIALOG_SHIM::HorizPixelsFromDU( int x ) int DIALOG_SHIM::horizPixelsFromDU( int x )
{ {
wxSize sz( x, 0 ); wxSize sz( x, 0 );
return ConvertDialogToPixels( sz ).x; return ConvertDialogToPixels( sz ).x;
} }
int DIALOG_SHIM::VertPixelsFromDU( int y ) int DIALOG_SHIM::vertPixelsFromDU( int y )
{ {
wxSize sz( 0, y ); wxSize sz( 0, y );
return ConvertDialogToPixels( sz ).y; return ConvertDialogToPixels( sz ).y;
@ -241,7 +241,7 @@ bool DIALOG_SHIM::Show( bool show )
} }
void DIALOG_SHIM::ResetSize() void DIALOG_SHIM::resetSize()
{ {
const char* hash_key; const char* hash_key;

2
common/dialogs/dialog_color_picker.cpp
View File

@ -142,7 +142,7 @@ bool DIALOG_COLOR_PICKER::TransferDataToWindow()
m_notebook->GetPage( 0 )->Layout(); m_notebook->GetPage( 0 )->Layout();
m_notebook->GetPage( 1 )->Layout(); m_notebook->GetPage( 1 )->Layout();
FinishDialogSettings(); finishDialogSettings();
return true; return true;
} }

16
common/dialogs/dialog_configure_paths.cpp
View File

@ -143,12 +143,12 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataToWindow()
for( auto it = paths->begin(); it != paths->end(); ++it ) for( auto it = paths->begin(); it != paths->end(); ++it )
{ {
if ( !( *it ).m_alias.StartsWith( "${" ) && !( *it ).m_alias.StartsWith( "$(" ) ) if ( !( *it ).m_Alias.StartsWith( "${" ) && !( *it ).m_Alias.StartsWith( "$(" ) )
{ {
AppendSearchPath( it->m_alias, it->m_pathvar, it->m_description ); AppendSearchPath( it->m_Alias, it->m_Pathvar, it->m_Description );
if( m_curdir.IsEmpty() ) if( m_curdir.IsEmpty() )
m_curdir = it->m_pathexp; m_curdir = it->m_Pathexp;
} }
} }
} }
@ -272,11 +272,11 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
for( int row = 0; row < m_SearchPaths->GetNumberRows(); ++row ) for( int row = 0; row < m_SearchPaths->GetNumberRows(); ++row )
{ {
alias.m_alias = m_SearchPaths->GetCellValue( row, SP_ALIAS_COL ); alias.m_Alias = m_SearchPaths->GetCellValue( row, SP_ALIAS_COL );
alias.m_pathvar = m_SearchPaths->GetCellValue( row, SP_PATH_COL ); alias.m_Pathvar = m_SearchPaths->GetCellValue( row, SP_PATH_COL );
alias.m_description = m_SearchPaths->GetCellValue( row, SP_DESC_COL ); alias.m_Description = m_SearchPaths->GetCellValue( row, SP_DESC_COL );
if( alias.m_alias.IsEmpty() ) if( alias.m_Alias.IsEmpty() )
{ {
m_errorGrid = m_SearchPaths; m_errorGrid = m_SearchPaths;
m_errorRow = row; m_errorRow = row;
@ -284,7 +284,7 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
m_errorMsg = _( "3D search path alias cannot be empty." ); m_errorMsg = _( "3D search path alias cannot be empty." );
return false; return false;
} }
else if( alias.m_pathvar.IsEmpty() ) else if( alias.m_Pathvar.IsEmpty() )
{ {
m_errorGrid = m_SearchPaths; m_errorGrid = m_SearchPaths;
m_errorRow = row; m_errorRow = row;

2
common/dialogs/dialog_edit_library_tables.cpp
View File

@ -57,7 +57,7 @@ void DIALOG_EDIT_LIBRARY_TABLES::InstallPanel( wxPanel* aPanel )
sdbSizerOK->SetDefault(); sdbSizerOK->SetDefault();
FinishDialogSettings(); finishDialogSettings();
// On some windows manager (Unity, XFCE), this dialog is not always raised, depending // On some windows manager (Unity, XFCE), this dialog is not always raised, depending
// on how the dialog is run. // on how the dialog is run.

2
common/dialogs/dialog_global_lib_table_config.cpp
View File

@ -74,7 +74,7 @@ DIALOG_GLOBAL_LIB_TABLE_CONFIG::DIALOG_GLOBAL_LIB_TABLE_CONFIG( wxWindow* aParen
if( okButton ) if( okButton )
okButton->SetDefault(); okButton->SetDefault();
FinishDialogSettings(); finishDialogSettings();
} }

2
common/dialogs/dialog_grid_settings.cpp
View File

@ -68,7 +68,7 @@ DIALOG_GRID_SETTINGS::DIALOG_GRID_SETTINGS( EDA_DRAW_FRAME* aParent ):
Layout(); Layout();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
common/dialogs/dialog_hotkey_list.cpp
View File

@ -50,7 +50,7 @@ DIALOG_LIST_HOTKEYS::DIALOG_LIST_HOTKEYS( EDA_BASE_FRAME* aParent, TOOL_MANAGER*
SetSizer( main_sizer ); SetSizer( main_sizer );
FinishDialogSettings(); finishDialogSettings();
} }

2
common/dialogs/dialog_image_editor.cpp
View File

@ -39,7 +39,7 @@ DIALOG_IMAGE_EDITOR::DIALOG_IMAGE_EDITOR( wxWindow* aParent, BITMAP_BASE* aItem
msg.Printf( wxT( "%f" ), m_workingImage->GetScale() ); msg.Printf( wxT( "%f" ), m_workingImage->GetScale() );
m_textCtrlScale->SetValue( msg ); m_textCtrlScale->SetValue( msg );
FinishDialogSettings(); finishDialogSettings();
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
} }

2
common/dialogs/dialog_print_generic.cpp
View File

@ -52,7 +52,7 @@ DIALOG_PRINT_GENERIC::DIALOG_PRINT_GENERIC( EDA_DRAW_FRAME* aParent, PRINTOUT_SE
m_sdbSizer1Apply->Hide(); m_sdbSizer1Apply->Hide();
#endif #endif
FinishDialogSettings(); finishDialogSettings();
Layout(); Layout();
initPrintData(); initPrintData();
} }

2
common/dialogs/html_messagebox.cpp
View File

@ -35,7 +35,7 @@ HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* aParent, const wxString& aTitle,
// Gives a default logical size (the actual size depends on the display definition) // Gives a default logical size (the actual size depends on the display definition)
if( aSize != wxDefaultSize ) if( aSize != wxDefaultSize )
SetSizeInDU( aSize.x, aSize.y ); setSizeInDU( aSize.x, aSize.y );
Center(); Center();

92
common/eda_base_frame.cpp
View File

@ -84,7 +84,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
wxFrame( aParent, wxID_ANY, aTitle, aPos, aSize, aStyle, aFrameName ), wxFrame( aParent, wxID_ANY, aTitle, aPos, aSize, aStyle, aFrameName ),
TOOLS_HOLDER(), TOOLS_HOLDER(),
KIWAY_HOLDER( aKiway, KIWAY_HOLDER::FRAME ), KIWAY_HOLDER( aKiway, KIWAY_HOLDER::FRAME ),
m_Ident( aFrameType ), m_ident( aFrameType ),
m_maximizeByDefault( false ), m_maximizeByDefault( false ),
m_infoBar( nullptr ), m_infoBar( nullptr ),
m_settingsManager( nullptr ), m_settingsManager( nullptr ),
@ -92,14 +92,14 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
m_hasAutoSave( false ), m_hasAutoSave( false ),
m_autoSaveState( false ), m_autoSaveState( false ),
m_autoSaveInterval(-1 ), m_autoSaveInterval(-1 ),
m_UndoRedoCountMax( DEFAULT_MAX_UNDO_ITEMS ), m_undoRedoCountMax( DEFAULT_MAX_UNDO_ITEMS ),
m_userUnits( EDA_UNITS::MILLIMETRES ), m_userUnits( EDA_UNITS::MILLIMETRES ),
m_isClosing( false ), m_isClosing( false ),
m_isNonUserClose( false ) m_isNonUserClose( false )
{ {
m_autoSaveTimer = new wxTimer( this, ID_AUTO_SAVE_TIMER ); m_autoSaveTimer = new wxTimer( this, ID_AUTO_SAVE_TIMER );
m_mruPath = wxStandardPaths::Get().GetDocumentsDir(); m_mruPath = wxStandardPaths::Get().GetDocumentsDir();
m_FrameSize = wxSize( s_defaultSize_x, s_defaultSize_y ); m_frameSize = wxSize( s_defaultSize_x, s_defaultSize_y );
m_auimgr.SetArtProvider( new WX_AUI_DOCK_ART() ); m_auimgr.SetArtProvider( new WX_AUI_DOCK_ART() );
@ -109,7 +109,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
SetSizeHints( s_minsize_x, s_minsize_y, -1, -1, -1, -1 ); SetSizeHints( s_minsize_x, s_minsize_y, -1, -1, -1, -1 );
// Store dimensions of the user area of the main window. // Store dimensions of the user area of the main window.
GetClientSize( &m_FrameSize.x, &m_FrameSize.y ); GetClientSize( &m_frameSize.x, &m_frameSize.y );
Connect( ID_AUTO_SAVE_TIMER, wxEVT_TIMER, Connect( ID_AUTO_SAVE_TIMER, wxEVT_TIMER,
wxTimerEventHandler( EDA_BASE_FRAME::onAutoSaveTimer ) ); wxTimerEventHandler( EDA_BASE_FRAME::onAutoSaveTimer ) );
@ -131,7 +131,7 @@ wxWindow* EDA_BASE_FRAME::findQuasiModalDialog()
// FIXME: CvPcb is currently implemented on top of KIWAY_PLAYER rather than DIALOG_SHIM, // FIXME: CvPcb is currently implemented on top of KIWAY_PLAYER rather than DIALOG_SHIM,
// so we have to look for it separately. // so we have to look for it separately.
if( m_Ident == FRAME_SCH ) if( m_ident == FRAME_SCH )
{ {
wxWindow* cvpcb = wxWindow::FindWindowByName( "CvpcbFrame" ); wxWindow* cvpcb = wxWindow::FindWindowByName( "CvpcbFrame" );
if( cvpcb ) if( cvpcb )
@ -450,22 +450,22 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
{ {
bool wasDefault = false; bool wasDefault = false;
m_FramePos.x = aState.pos_x; m_framePos.x = aState.pos_x;
m_FramePos.y = aState.pos_y; m_framePos.y = aState.pos_y;
m_FrameSize.x = aState.size_x; m_frameSize.x = aState.size_x;
m_FrameSize.y = aState.size_y; m_frameSize.y = aState.size_y;
wxLogTrace( traceDisplayLocation, "Config position (%d, %d) with size (%d, %d)", wxLogTrace( traceDisplayLocation, "Config position (%d, %d) with size (%d, %d)",
m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
// Ensure minimum size is set if the stored config was zero-initialized // Ensure minimum size is set if the stored config was zero-initialized
if( m_FrameSize.x < s_minsize_x || m_FrameSize.y < s_minsize_y ) if( m_frameSize.x < s_minsize_x || m_frameSize.y < s_minsize_y )
{ {
m_FrameSize.x = s_defaultSize_x; m_frameSize.x = s_defaultSize_x;
m_FrameSize.y = s_defaultSize_y; m_frameSize.y = s_defaultSize_y;
wasDefault = true; wasDefault = true;
wxLogTrace( traceDisplayLocation, "Using minimum size (%d, %d)", m_FrameSize.x, m_FrameSize.y ); wxLogTrace( traceDisplayLocation, "Using minimum size (%d, %d)", m_frameSize.x, m_frameSize.y );
} }
wxLogTrace( traceDisplayLocation, "Number of displays: %d", wxDisplay::GetCount() ); wxLogTrace( traceDisplayLocation, "Number of displays: %d", wxDisplay::GetCount() );
@ -480,19 +480,19 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
wxDisplay display( index ); wxDisplay display( index );
wxRect clientSize = display.GetGeometry(); wxRect clientSize = display.GetGeometry();
m_FramePos = wxDefaultPosition; m_framePos = wxDefaultPosition;
// Ensure the window fits on the display, since the other one could have been larger // Ensure the window fits on the display, since the other one could have been larger
if( m_FrameSize.x > clientSize.width ) if( m_frameSize.x > clientSize.width )
m_FrameSize.x = clientSize.width; m_frameSize.x = clientSize.width;
if( m_FrameSize.y > clientSize.height ) if( m_frameSize.y > clientSize.height )
m_FrameSize.y = clientSize.height; m_frameSize.y = clientSize.height;
} }
else else
{ {
wxPoint upperRight( m_FramePos.x + m_FrameSize.x, m_FramePos.y ); wxPoint upperRight( m_framePos.x + m_frameSize.x, m_framePos.y );
wxPoint upperLeft( m_FramePos.x, m_FramePos.y ); wxPoint upperLeft( m_framePos.x, m_framePos.y );
wxDisplay display( aState.display ); wxDisplay display( aState.display );
wxRect clientSize = display.GetClientArea(); wxRect clientSize = display.GetClientArea();
@ -509,7 +509,7 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
upperRight.x < xLimLeft || // Upper right corner too close to left edge of screen upperRight.x < xLimLeft || // Upper right corner too close to left edge of screen
upperRight.y > yLim ) // Upper corner too close to the bottom of the screen upperRight.y > yLim ) // Upper corner too close to the bottom of the screen
{ {
m_FramePos = wxDefaultPosition; m_framePos = wxDefaultPosition;
wxLogTrace( traceDisplayLocation, "Resetting to default position" ); wxLogTrace( traceDisplayLocation, "Resetting to default position" );
} }
} }
@ -521,25 +521,25 @@ void EDA_BASE_FRAME::LoadWindowState( const WINDOW_STATE& aState )
#else #else
int Ypos_min = 0; int Ypos_min = 0;
#endif #endif
if( m_FramePos.y < Ypos_min ) if( m_framePos.y < Ypos_min )
m_FramePos.y = Ypos_min; m_framePos.y = Ypos_min;
wxLogTrace( traceDisplayLocation, "Final window position (%d, %d) with size (%d, %d)", wxLogTrace( traceDisplayLocation, "Final window position (%d, %d) with size (%d, %d)",
m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
// Center the window if we reset to default // Center the window if we reset to default
if( m_FramePos.x == -1 ) if( m_framePos.x == -1 )
{ {
wxLogTrace( traceDisplayLocation, "Centering window" ); wxLogTrace( traceDisplayLocation, "Centering window" );
Center(); Center();
m_FramePos = GetPosition(); m_framePos = GetPosition();
} }
// Record the frame sizes in an un-maximized state // Record the frame sizes in an un-maximized state
m_NormalFrameSize = m_FrameSize; m_normalFrameSize = m_frameSize;
m_NormalFramePos = m_FramePos; m_normalFramePos = m_framePos;
// Maximize if we were maximized before // Maximize if we were maximized before
if( aState.maximized || ( wasDefault && m_maximizeByDefault ) ) if( aState.maximized || ( wasDefault && m_maximizeByDefault ) )
@ -576,25 +576,25 @@ void EDA_BASE_FRAME::SaveWindowSettings( WINDOW_SETTINGS* aCfg )
// If the window is maximized, we use the saved window size from before it was maximized // If the window is maximized, we use the saved window size from before it was maximized
if( IsMaximized() ) if( IsMaximized() )
{ {
m_FramePos = m_NormalFramePos; m_framePos = m_normalFramePos;
m_FrameSize = m_NormalFrameSize; m_frameSize = m_normalFrameSize;
} }
else else
{ {
m_FrameSize = GetWindowSize(); m_frameSize = GetWindowSize();
m_FramePos = GetPosition(); m_framePos = GetPosition();
} }
aCfg->state.pos_x = m_FramePos.x; aCfg->state.pos_x = m_framePos.x;
aCfg->state.pos_y = m_FramePos.y; aCfg->state.pos_y = m_framePos.y;
aCfg->state.size_x = m_FrameSize.x; aCfg->state.size_x = m_frameSize.x;
aCfg->state.size_y = m_FrameSize.y; aCfg->state.size_y = m_frameSize.y;
aCfg->state.maximized = IsMaximized(); aCfg->state.maximized = IsMaximized();
aCfg->state.display = wxDisplay::GetFromWindow( this ); aCfg->state.display = wxDisplay::GetFromWindow( this );
wxLogTrace( traceDisplayLocation, "Saving window maximized: %s", IsMaximized() ? "true" : "false" ); wxLogTrace( traceDisplayLocation, "Saving window maximized: %s", IsMaximized() ? "true" : "false" );
wxLogTrace( traceDisplayLocation, "Saving config position (%d, %d) with size (%d, %d)", wxLogTrace( traceDisplayLocation, "Saving config position (%d, %d) with size (%d, %d)",
m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
// TODO(JE) should auto-save in common settings be overwritten by every app? // TODO(JE) should auto-save in common settings be overwritten by every app?
if( m_hasAutoSave ) if( m_hasAutoSave )
@ -928,9 +928,9 @@ void EDA_BASE_FRAME::PushCommandToUndoList( PICKED_ITEMS_LIST* aNewitem )
m_undoList.PushCommand( aNewitem ); m_undoList.PushCommand( aNewitem );
// Delete the extra items, if count max reached // Delete the extra items, if count max reached
if( m_UndoRedoCountMax > 0 ) if( m_undoRedoCountMax > 0 )
{ {
int extraitems = GetUndoCommandCount() - m_UndoRedoCountMax; int extraitems = GetUndoCommandCount() - m_undoRedoCountMax;
if( extraitems > 0 ) if( extraitems > 0 )
ClearUndoORRedoList( UNDO_LIST, extraitems ); ClearUndoORRedoList( UNDO_LIST, extraitems );
@ -943,9 +943,9 @@ void EDA_BASE_FRAME::PushCommandToRedoList( PICKED_ITEMS_LIST* aNewitem )
m_redoList.PushCommand( aNewitem ); m_redoList.PushCommand( aNewitem );
// Delete the extra items, if count max reached // Delete the extra items, if count max reached
if( m_UndoRedoCountMax > 0 ) if( m_undoRedoCountMax > 0 )
{ {
int extraitems = GetRedoCommandCount() - m_UndoRedoCountMax; int extraitems = GetRedoCommandCount() - m_undoRedoCountMax;
if( extraitems > 0 ) if( extraitems > 0 )
ClearUndoORRedoList( REDO_LIST, extraitems ); ClearUndoORRedoList( REDO_LIST, extraitems );
@ -986,10 +986,10 @@ void EDA_BASE_FRAME::OnMaximize( wxMaximizeEvent& aEvent )
if( !IsMaximized() ) if( !IsMaximized() )
#endif #endif
{ {
m_NormalFrameSize = GetWindowSize(); m_normalFrameSize = GetWindowSize();
m_NormalFramePos = GetPosition(); m_normalFramePos = GetPosition();
wxLogTrace( traceDisplayLocation, "Maximizing window - Saving position (%d, %d) with size (%d, %d)", wxLogTrace( traceDisplayLocation, "Maximizing window - Saving position (%d, %d) with size (%d, %d)",
m_NormalFramePos.x, m_NormalFramePos.y, m_NormalFrameSize.x, m_NormalFrameSize.y ); m_normalFramePos.x, m_normalFramePos.y, m_normalFrameSize.x, m_normalFrameSize.y );
} }
// Skip event to actually maximize the window // Skip event to actually maximize the window

22
common/eda_draw_frame.cpp
View File

@ -135,12 +135,12 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
SetStatusWidths( arrayDim( dims ), dims ); SetStatusWidths( arrayDim( dims ), dims );
// Create child subwindows. // Create child subwindows.
GetClientSize( &m_FrameSize.x, &m_FrameSize.y ); GetClientSize( &m_frameSize.x, &m_frameSize.y );
m_FramePos.x = m_FramePos.y = 0; m_framePos.x = m_framePos.y = 0;
m_FrameSize.y -= m_msgFrameHeight; m_frameSize.y -= m_msgFrameHeight;
m_messagePanel = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_FrameSize.y ), m_messagePanel = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_frameSize.y ),
wxSize( m_FrameSize.x, m_msgFrameHeight ) ); wxSize( m_frameSize.x, m_msgFrameHeight ) );
m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() ); m_messagePanel->SetBackgroundColour( COLOR4D( LIGHTGRAY ).ToColour() );
} }
@ -460,7 +460,7 @@ void EDA_DRAW_FRAME::AddStandardSubMenus( TOOL_MENU& aToolMenu )
} }
void EDA_DRAW_FRAME::InitExitKey() void EDA_DRAW_FRAME::initExitKey()
{ {
wxAcceleratorEntry entries[1]; wxAcceleratorEntry entries[1];
entries[0].Set( wxACCEL_CTRL, int( 'Q' ), wxID_EXIT ); entries[0].Set( wxACCEL_CTRL, int( 'Q' ), wxID_EXIT );
@ -504,7 +504,7 @@ void EDA_DRAW_FRAME::DisplayUnitsMsg()
void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv ) void EDA_DRAW_FRAME::OnSize( wxSizeEvent& SizeEv )
{ {
m_FrameSize = GetClientSize( ); m_frameSize = GetClientSize( );
SizeEv.Skip(); SizeEv.Skip();
} }
@ -659,7 +659,7 @@ void EDA_DRAW_FRAME::SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType )
} }
EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::LoadCanvasTypeSetting() EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::loadCanvasTypeSetting()
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__
// Cairo renderer doesn't handle Retina displays so there's really only one game // Cairo renderer doesn't handle Retina displays so there's really only one game
@ -706,7 +706,7 @@ bool EDA_DRAW_FRAME::saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvas
for( unsigned ii = 0; ii < arrayDim( allowed_frames ); ii++ ) for( unsigned ii = 0; ii < arrayDim( allowed_frames ); ii++ )
{ {
if( m_Ident == allowed_frames[ii] ) if( m_ident == allowed_frames[ii] )
{ {
allow_save = true; allow_save = true;
break; break;
@ -992,9 +992,9 @@ void EDA_DRAW_FRAME::GetUnitPair( EDA_UNITS& aPrimaryUnit, EDA_UNITS& aSecondary
} }
void EDA_DRAW_FRAME::ResolveCanvasType() void EDA_DRAW_FRAME::resolveCanvasType()
{ {
m_canvasType = LoadCanvasTypeSetting(); m_canvasType = loadCanvasTypeSetting();
// Nudge user to switch to OpenGL if they are on legacy or Cairo // Nudge user to switch to OpenGL if they are on legacy or Cairo
if( m_firstRunDialogSetting < 1 ) if( m_firstRunDialogSetting < 1 )

206
common/filename_resolver.cpp
View File

@ -70,7 +70,7 @@ bool FILENAME_RESOLVER::Set3DConfigDir( const wxString& aConfigDir )
if( !cfgdir.DirExists() ) if( !cfgdir.DirExists() )
return false; return false;
m_ConfigDir = cfgdir.GetPath(); m_configDir = cfgdir.GetPath();
createPathList(); createPathList();
return true; return true;
@ -96,22 +96,22 @@ bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
if( flgChanged ) if( flgChanged )
*flgChanged = false; *flgChanged = false;
if( m_Paths.empty() ) if( m_paths.empty() )
{ {
SEARCH_PATH al; SEARCH_PATH al;
al.m_alias = "${KIPRJMOD}"; al.m_Alias = "${KIPRJMOD}";
al.m_pathvar = "${KIPRJMOD}"; al.m_Pathvar = "${KIPRJMOD}";
al.m_pathexp = m_curProjDir; al.m_Pathexp = m_curProjDir;
m_Paths.push_back( al ); m_paths.push_back( al );
if( flgChanged ) if( flgChanged )
*flgChanged = true; *flgChanged = true;
} }
else else
{ {
if( m_Paths.front().m_pathexp.Cmp( m_curProjDir ) ) if( m_paths.front().m_Pathexp.Cmp( m_curProjDir ) )
{ {
m_Paths.front().m_pathexp = m_curProjDir; m_paths.front().m_Pathexp = m_curProjDir;
if( flgChanged ) if( flgChanged )
*flgChanged = true; *flgChanged = true;
@ -127,7 +127,7 @@ bool FILENAME_RESOLVER::SetProject( PROJECT* aProject, bool* flgChanged )
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
ostr << " * [INFO] changed project dir to "; ostr << " * [INFO] changed project dir to ";
ostr << m_Paths.front().m_pathexp.ToUTF8(); ostr << m_paths.front().m_Pathexp.ToUTF8();
wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() ); wxLogTrace( MASK_3D_RESOLVER, "%s\n", ostr.str().c_str() );
} }
#endif #endif
@ -146,18 +146,18 @@ void FILENAME_RESOLVER::SetProgramBase( PGM_BASE* aBase )
{ {
m_pgm = aBase; m_pgm = aBase;
if( !m_pgm || m_Paths.empty() ) if( !m_pgm || m_paths.empty() )
return; return;
// recreate the path list // recreate the path list
m_Paths.clear(); m_paths.clear();
createPathList(); createPathList();
} }
bool FILENAME_RESOLVER::createPathList() bool FILENAME_RESOLVER::createPathList()
{ {
if( !m_Paths.empty() ) if( !m_paths.empty() )
return true; return true;
wxString kmod; wxString kmod;
@ -167,10 +167,10 @@ bool FILENAME_RESOLVER::createPathList()
// the user may change this later with a call to SetProjectDir() // the user may change this later with a call to SetProjectDir()
SEARCH_PATH lpath; SEARCH_PATH lpath;
lpath.m_alias = "${KIPRJMOD}"; lpath.m_Alias = "${KIPRJMOD}";
lpath.m_pathvar = "${KIPRJMOD}"; lpath.m_Pathvar = "${KIPRJMOD}";
lpath.m_pathexp = m_curProjDir; lpath.m_Pathexp = m_curProjDir;
m_Paths.push_back( lpath ); m_paths.push_back( lpath );
wxFileName fndummy; wxFileName fndummy;
wxUniChar psep = fndummy.GetPathSeparator(); wxUniChar psep = fndummy.GetPathSeparator();
std::list< wxString > epaths; std::list< wxString > epaths;
@ -183,39 +183,39 @@ bool FILENAME_RESOLVER::createPathList()
if( pathVal.empty() ) if( pathVal.empty() )
{ {
lpath.m_pathexp.clear(); lpath.m_Pathexp.clear();
} }
else else
{ {
fndummy.Assign( pathVal, "" ); fndummy.Assign( pathVal, "" );
fndummy.Normalize(); fndummy.Normalize();
lpath.m_pathexp = fndummy.GetFullPath(); lpath.m_Pathexp = fndummy.GetFullPath();
} }
lpath.m_alias = curr_path; lpath.m_Alias = curr_path;
lpath.m_pathvar = curr_path; lpath.m_Pathvar = curr_path;
if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() ) if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
lpath.m_pathexp.erase( --lpath.m_pathexp.end() ); lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
m_Paths.push_back( lpath ); m_paths.push_back( lpath );
} }
} }
if( !m_ConfigDir.empty() ) if( !m_configDir.empty() )
readPathList(); readPathList();
if( m_Paths.empty() ) if( m_paths.empty() )
return false; return false;
#ifdef DEBUG #ifdef DEBUG
wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" ); wxLogTrace( MASK_3D_RESOLVER, " * [3D model] search paths:\n" );
std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
while( sPL != m_Paths.end() ) while( sPL != m_paths.end() )
{ {
wxLogTrace( MASK_3D_RESOLVER, " + %s : '%s'\n", (*sPL).m_alias.GetData(), wxLogTrace( MASK_3D_RESOLVER, " + %s : '%s'\n", (*sPL).m_Alias.GetData(),
(*sPL).m_pathexp.GetData() ); (*sPL).m_Pathexp.GetData() );
++sPL; ++sPL;
} }
#endif #endif
@ -228,8 +228,8 @@ bool FILENAME_RESOLVER::UpdatePathList( std::vector< SEARCH_PATH >& aPathList )
{ {
wxUniChar envMarker( '$' ); wxUniChar envMarker( '$' );
while( !m_Paths.empty() && envMarker != *m_Paths.back().m_alias.rbegin() ) while( !m_paths.empty() && envMarker != *m_paths.back().m_Alias.rbegin() )
m_Paths.pop_back(); m_paths.pop_back();
size_t nI = aPathList.size(); size_t nI = aPathList.size();
@ -247,7 +247,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
if( aFileName.empty() ) if( aFileName.empty() )
return wxEmptyString; return wxEmptyString;
if( m_Paths.empty() ) if( m_paths.empty() )
createPathList(); createPathList();
// first attempt to use the name as specified: // first attempt to use the name as specified:
@ -316,8 +316,8 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
// a. an aliased shortened name or // a. an aliased shortened name or
// b. cannot be determined // b. cannot be determined
std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
std::list< SEARCH_PATH >::const_iterator ePL = m_Paths.end(); std::list< SEARCH_PATH >::const_iterator ePL = m_paths.end();
// check the path relative to the current project directory; // check the path relative to the current project directory;
// note: this is not necessarily the same as the current working // note: this is not necessarily the same as the current working
@ -326,9 +326,9 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
// This check is performed before checking the path relative to // This check is performed before checking the path relative to
// ${KISYS3DMOD} so that users can potentially override a model // ${KISYS3DMOD} so that users can potentially override a model
// within ${KISYS3DMOD} // within ${KISYS3DMOD}
if( !sPL->m_pathexp.empty() && !tname.StartsWith( ":" ) ) if( !sPL->m_Pathexp.empty() && !tname.StartsWith( ":" ) )
{ {
tmpFN.Assign( sPL->m_pathexp, "" ); tmpFN.Assign( sPL->m_Pathexp, "" );
wxString fullPath = tmpFN.GetPathWithSep() + tname; wxString fullPath = tmpFN.GetPathWithSep() + tname;
fullPath = ExpandEnvVarSubstitutions( fullPath, m_project ); fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
@ -362,7 +362,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
} }
// ${ENV_VAR} paths have already been checked; skip them // ${ENV_VAR} paths have already been checked; skip them
while( sPL != ePL && ( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) ) while( sPL != ePL && ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
++sPL; ++sPL;
// at this point the filename must contain an alias or else it is invalid // at this point the filename must contain an alias or else it is invalid
@ -388,9 +388,9 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
while( sPL != ePL ) while( sPL != ePL )
{ {
if( !sPL->m_alias.Cmp( alias ) && !sPL->m_pathexp.empty() ) if( !sPL->m_Alias.Cmp( alias ) && !sPL->m_Pathexp.empty() )
{ {
wxFileName fpath( wxFileName::DirName( sPL->m_pathexp ) ); wxFileName fpath( wxFileName::DirName( sPL->m_Pathexp ) );
wxString fullPath = fpath.GetPathWithSep() + relpath; wxString fullPath = fpath.GetPathWithSep() + relpath;
fullPath = ExpandEnvVarSubstitutions( fullPath, m_project ); fullPath = ExpandEnvVarSubstitutions( fullPath, m_project );
@ -425,7 +425,7 @@ wxString FILENAME_RESOLVER::ResolvePath( const wxString& aFileName )
bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath ) bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
{ {
if( aPath.m_alias.empty() || aPath.m_pathvar.empty() ) if( aPath.m_Alias.empty() || aPath.m_Pathvar.empty() )
return false; return false;
std::lock_guard<std::mutex> lock( mutex_resolver ); std::lock_guard<std::mutex> lock( mutex_resolver );
@ -433,14 +433,14 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
SEARCH_PATH tpath = aPath; SEARCH_PATH tpath = aPath;
#ifdef _WIN32 #ifdef _WIN32
while( tpath.m_pathvar.EndsWith( wxT( "\\" ) ) ) while( tpath.m_Pathvar.EndsWith( wxT( "\\" ) ) )
tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 ); tpath.m_pathvar.erase( tpath.m_Pathvar.length() - 1 );
#else #else
while( tpath.m_pathvar.EndsWith( wxT( "/" ) ) && tpath.m_pathvar.length() > 1 ) while( tpath.m_Pathvar.EndsWith( wxT( "/" ) ) && tpath.m_Pathvar.length() > 1 )
tpath.m_pathvar.erase( tpath.m_pathvar.length() - 1 ); tpath.m_Pathvar.erase( tpath.m_Pathvar.length() - 1 );
#endif #endif
wxFileName path( ExpandEnvVarSubstitutions( tpath.m_pathvar, m_project ), "" ); wxFileName path( ExpandEnvVarSubstitutions( tpath.m_Pathvar, m_project ), "" );
path.Normalize(); path.Normalize();
@ -448,45 +448,45 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
{ {
// suppress the message if the missing pathvar is the // suppress the message if the missing pathvar is the
// legacy KISYS3DMOD variable // legacy KISYS3DMOD variable
if( aPath.m_pathvar.compare( wxT( "${KISYS3DMOD}" ) ) ) if( aPath.m_Pathvar.compare( wxT( "${KISYS3DMOD}" ) ) )
{ {
wxString msg = _( "The given path does not exist" ); wxString msg = _( "The given path does not exist" );
msg.append( wxT( "\n" ) ); msg.append( wxT( "\n" ) );
msg.append( tpath.m_pathvar ); msg.append( tpath.m_Pathvar );
wxMessageBox( msg, _( "3D model search path" ) ); wxMessageBox( msg, _( "3D model search path" ) );
} }
tpath.m_pathexp.clear(); tpath.m_Pathexp.clear();
} }
else else
{ {
tpath.m_pathexp = path.GetFullPath(); tpath.m_Pathexp = path.GetFullPath();
#ifdef _WIN32 #ifdef _WIN32
while( tpath.m_pathexp.EndsWith( wxT( "\\" ) ) ) while( tpath.m_Pathexp.EndsWith( wxT( "\\" ) ) )
tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 ); tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
#else #else
while( tpath.m_pathexp.EndsWith( wxT( "/" ) ) && tpath.m_pathexp.length() > 1 ) while( tpath.m_Pathexp.EndsWith( wxT( "/" ) ) && tpath.m_Pathexp.length() > 1 )
tpath.m_pathexp.erase( tpath.m_pathexp.length() - 1 ); tpath.m_Pathexp.erase( tpath.m_Pathexp.length() - 1 );
#endif #endif
} }
wxString pname = path.GetPath(); wxString pname = path.GetPath();
std::list< SEARCH_PATH >::iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::iterator sPL = m_paths.begin();
std::list< SEARCH_PATH >::iterator ePL = m_Paths.end(); std::list< SEARCH_PATH >::iterator ePL = m_paths.end();
while( sPL != ePL ) while( sPL != ePL )
{ {
if( !tpath.m_alias.Cmp( sPL->m_alias ) ) if( !tpath.m_Alias.Cmp( sPL->m_Alias ) )
{ {
wxString msg = _( "Alias: " ); wxString msg = _( "Alias: " );
msg.append( tpath.m_alias ); msg.append( tpath.m_Alias );
msg.append( wxT( "\n" ) ); msg.append( wxT( "\n" ) );
msg.append( _( "This path:" ) + wxS( " " ) ); msg.append( _( "This path:" ) + wxS( " " ) );
msg.append( tpath.m_pathvar ); msg.append( tpath.m_Pathvar );
msg.append( wxT( "\n" ) ); msg.append( wxT( "\n" ) );
msg.append( _( "Existing path:" ) + wxS( " " ) ); msg.append( _( "Existing path:" ) + wxS( " " ) );
msg.append( sPL->m_pathvar ); msg.append( sPL->m_Pathvar );
wxMessageBox( msg, _( "Bad alias (duplicate name)" ) ); wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );
return false; return false;
@ -495,14 +495,14 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
++sPL; ++sPL;
} }
m_Paths.push_back( tpath ); m_paths.push_back( tpath );
return true; return true;
} }
bool FILENAME_RESOLVER::readPathList() bool FILENAME_RESOLVER::readPathList()
{ {
if( m_ConfigDir.empty() ) if( m_configDir.empty() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
@ -512,11 +512,11 @@ bool FILENAME_RESOLVER::readPathList()
return false; return false;
} }
wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG ); wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
cfgpath.Normalize(); cfgpath.Normalize();
wxString cfgname = cfgpath.GetFullPath(); wxString cfgname = cfgpath.GetFullPath();
size_t nitems = m_Paths.size(); size_t nitems = m_paths.size();
std::ifstream cfgFile; std::ifstream cfgFile;
std::string cfgLine; std::string cfgLine;
@ -578,17 +578,17 @@ bool FILENAME_RESOLVER::readPathList()
idx = 0; idx = 0;
if( !getHollerith( cfgLine, idx, al.m_alias ) ) if( !getHollerith( cfgLine, idx, al.m_Alias ) )
continue; continue;
// never add on KISYS3DMOD from a config file // never add on KISYS3DMOD from a config file
if( !al.m_alias.Cmp( wxT( "KISYS3DMOD" ) ) ) if( !al.m_Alias.Cmp( wxT( "KISYS3DMOD" ) ) )
continue; continue;
if( !getHollerith( cfgLine, idx, al.m_pathvar ) ) if( !getHollerith( cfgLine, idx, al.m_Pathvar ) )
continue; continue;
if( !getHollerith( cfgLine, idx, al.m_description ) ) if( !getHollerith( cfgLine, idx, al.m_Description ) )
continue; continue;
addPath( al ); addPath( al );
@ -599,13 +599,13 @@ bool FILENAME_RESOLVER::readPathList()
if( vnum < CFGFILE_VERSION ) if( vnum < CFGFILE_VERSION )
writePathList(); writePathList();
return( m_Paths.size() != nitems ); return( m_paths.size() != nitems );
} }
bool FILENAME_RESOLVER::writePathList() bool FILENAME_RESOLVER::writePathList()
{ {
if( m_ConfigDir.empty() ) if( m_configDir.empty() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; ostr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
@ -618,13 +618,13 @@ bool FILENAME_RESOLVER::writePathList()
} }
// skip all ${ENV_VAR} alias names // skip all ${ENV_VAR} alias names
std::list< SEARCH_PATH >::const_iterator sPL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sPL = m_paths.begin();
while( sPL != m_Paths.end() && while( sPL != m_paths.end() &&
( sPL->m_alias.StartsWith( "${" ) || sPL->m_alias.StartsWith( "$(" ) ) ) ( sPL->m_Alias.StartsWith( "${" ) || sPL->m_Alias.StartsWith( "$(" ) ) )
++sPL; ++sPL;
wxFileName cfgpath( m_ConfigDir, RESOLVER_CONFIG ); wxFileName cfgpath( m_configDir, RESOLVER_CONFIG );
wxString cfgname = cfgpath.GetFullPath(); wxString cfgname = cfgpath.GetFullPath();
std::ofstream cfgFile; std::ofstream cfgFile;
@ -645,13 +645,13 @@ bool FILENAME_RESOLVER::writePathList()
cfgFile << "#V" << CFGFILE_VERSION << "\n"; cfgFile << "#V" << CFGFILE_VERSION << "\n";
std::string tstr; std::string tstr;
while( sPL != m_Paths.end() ) while( sPL != m_paths.end() )
{ {
tstr = sPL->m_alias.ToUTF8(); tstr = sPL->m_Alias.ToUTF8();
cfgFile << "\"" << tstr.size() << ":" << tstr << "\","; cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
tstr = sPL->m_pathvar.ToUTF8(); tstr = sPL->m_Pathvar.ToUTF8();
cfgFile << "\"" << tstr.size() << ":" << tstr << "\","; cfgFile << "\"" << tstr.size() << ":" << tstr << "\",";
tstr = sPL->m_description.ToUTF8(); tstr = sPL->m_Description.ToUTF8();
cfgFile << "\"" << tstr.size() << ":" << tstr << "\"\n"; cfgFile << "\"" << tstr.size() << ":" << tstr << "\"\n";
++sPL; ++sPL;
} }
@ -694,24 +694,24 @@ void FILENAME_RESOLVER::checkEnvVarPath( const wxString& aPath )
// check if the alias exists; if not then add it to the end of the // check if the alias exists; if not then add it to the end of the
// env var section of the path list // env var section of the path list
auto sPL = m_Paths.begin(); auto sPL = m_paths.begin();
auto ePL = m_Paths.end(); auto ePL = m_paths.end();
while( sPL != ePL ) while( sPL != ePL )
{ {
if( sPL->m_alias == envar ) if( sPL->m_Alias == envar )
return; return;
if( !sPL->m_alias.StartsWith( "${" ) ) if( !sPL->m_Alias.StartsWith( "${" ) )
break; break;
++sPL; ++sPL;
} }
SEARCH_PATH lpath; SEARCH_PATH lpath;
lpath.m_alias = envar; lpath.m_Alias = envar;
lpath.m_pathvar = lpath.m_alias; lpath.m_Pathvar = lpath.m_Alias;
wxFileName tmpFN( ExpandEnvVarSubstitutions( lpath.m_alias, m_project ), "" ); wxFileName tmpFN( ExpandEnvVarSubstitutions( lpath.m_Alias, m_project ), "" );
wxUniChar psep = tmpFN.GetPathSeparator(); wxUniChar psep = tmpFN.GetPathSeparator();
tmpFN.Normalize(); tmpFN.Normalize();
@ -719,15 +719,15 @@ void FILENAME_RESOLVER::checkEnvVarPath( const wxString& aPath )
if( !tmpFN.DirExists() ) if( !tmpFN.DirExists() )
return; return;
lpath.m_pathexp = tmpFN.GetFullPath(); lpath.m_Pathexp = tmpFN.GetFullPath();
if( !lpath.m_pathexp.empty() && psep == *lpath.m_pathexp.rbegin() ) if( !lpath.m_Pathexp.empty() && psep == *lpath.m_Pathexp.rbegin() )
lpath.m_pathexp.erase( --lpath.m_pathexp.end() ); lpath.m_Pathexp.erase( --lpath.m_Pathexp.end() );
if( lpath.m_pathexp.empty() ) if( lpath.m_Pathexp.empty() )
return; return;
m_Paths.insert( sPL, lpath ); m_paths.insert( sPL, lpath );
} }
@ -735,19 +735,19 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
{ {
wxString fname = aFullPathName; wxString fname = aFullPathName;
if( m_Paths.empty() ) if( m_paths.empty() )
createPathList(); createPathList();
std::lock_guard<std::mutex> lock( mutex_resolver ); std::lock_guard<std::mutex> lock( mutex_resolver );
std::list< SEARCH_PATH >::const_iterator sL = m_Paths.begin(); std::list< SEARCH_PATH >::const_iterator sL = m_paths.begin();
size_t idx; size_t idx;
while( sL != m_Paths.end() ) while( sL != m_paths.end() )
{ {
// undefined paths do not participate in the // undefined paths do not participate in the
// file name shortening procedure // file name shortening procedure
if( sL->m_pathexp.empty() ) if( sL->m_Pathexp.empty() )
{ {
++sL; ++sL;
continue; continue;
@ -756,9 +756,9 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
wxFileName fpath; wxFileName fpath;
// in the case of aliases, ensure that we use the most recent definition // in the case of aliases, ensure that we use the most recent definition
if( sL->m_alias.StartsWith( "${" ) || sL->m_alias.StartsWith( "$(" ) ) if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
{ {
wxString tpath = ExpandEnvVarSubstitutions( sL->m_alias, m_project ); wxString tpath = ExpandEnvVarSubstitutions( sL->m_Alias, m_project );
if( tpath.empty() ) if( tpath.empty() )
{ {
@ -770,7 +770,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
} }
else else
{ {
fpath.Assign( sL->m_pathexp, wxT( "" ) ); fpath.Assign( sL->m_Pathexp, wxT( "" ) );
} }
wxString fps = fpath.GetPathWithSep(); wxString fps = fpath.GetPathWithSep();
@ -787,10 +787,10 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
fname.Replace( wxT( "\\" ), wxT( "/" ) ); fname.Replace( wxT( "\\" ), wxT( "/" ) );
#endif #endif
if( sL->m_alias.StartsWith( "${" ) || sL->m_alias.StartsWith( "$(" ) ) if( sL->m_Alias.StartsWith( "${" ) || sL->m_Alias.StartsWith( "$(" ) )
{ {
// old style ENV_VAR // old style ENV_VAR
tname = sL->m_alias; tname = sL->m_Alias;
tname.Append( "/" ); tname.Append( "/" );
tname.append( fname ); tname.append( fname );
} }
@ -798,7 +798,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
{ {
// new style alias // new style alias
tname = ":"; tname = ":";
tname.append( sL->m_alias ); tname.append( sL->m_Alias );
tname.append( ":" ); tname.append( ":" );
tname.append( fname ); tname.append( fname );
} }
@ -824,7 +824,7 @@ wxString FILENAME_RESOLVER::ShortenPath( const wxString& aFullPathName )
const std::list< SEARCH_PATH >* FILENAME_RESOLVER::GetPaths() const std::list< SEARCH_PATH >* FILENAME_RESOLVER::GetPaths()
{ {
return &m_Paths; return &m_paths;
} }

6
common/footprint_info.cpp
View File

@ -182,7 +182,7 @@ void FOOTPRINT_ASYNC_LOADER::Start( FP_LIB_TABLE* aTable, wxString const* aNickn
aTable->Format( &sof, 0 ); aTable->Format( &sof, 0 );
m_last_table = sof.GetString(); m_last_table = sof.GetString();
m_list->StartWorkers( aTable, aNickname, this, aNThreads ); m_list->startWorkers( aTable, aNickname, this, aNThreads );
} }
@ -190,7 +190,7 @@ bool FOOTPRINT_ASYNC_LOADER::Join()
{ {
if( m_list ) if( m_list )
{ {
bool rv = m_list->JoinWorkers(); bool rv = m_list->joinWorkers();
m_list = nullptr; m_list = nullptr;
return rv; return rv;
} }
@ -203,7 +203,7 @@ void FOOTPRINT_ASYNC_LOADER::Abort()
{ {
if( m_list ) if( m_list )
{ {
m_list->StopWorkers(); m_list->stopWorkers();
m_list = nullptr; m_list = nullptr;
} }
} }

2
common/widgets/paged_dialog.cpp
View File

@ -130,7 +130,7 @@ void PAGED_DIALOG::finishInitialization()
m_treebook->Fit(); m_treebook->Fit();
m_treebook->Layout(); m_treebook->Layout();
FinishDialogSettings(); finishDialogSettings();
} }

6
cvpcb/cvpcb_mainframe.cpp
View File

@ -70,7 +70,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_tcFilterString = NULL; m_tcFilterString = NULL;
m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() ); m_FootprintsList = FOOTPRINT_LIST::GetInstance( Kiway() );
m_initialized = false; m_initialized = false;
m_AboutTitle = "CvPcb"; m_aboutTitle = "CvPcb";
// Give an icon // Give an icon
wxIcon icon; wxIcon icon;
@ -97,14 +97,14 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_auimgr.AddPane( m_libListBox, EDA_PANE().Palette().Name( "Libraries" ).Left().Layer(1) m_auimgr.AddPane( m_libListBox, EDA_PANE().Palette().Name( "Libraries" ).Left().Layer(1)
.Caption( _( "Footprint Libraries" ) ) .Caption( _( "Footprint Libraries" ) )
.BestSize( (int) ( m_FrameSize.x * 0.20 ), m_FrameSize.y ) ); .BestSize((int) ( m_frameSize.x * 0.20 ), m_frameSize.y ) );
m_auimgr.AddPane( m_compListBox, EDA_PANE().Palette().Name( "Components" ).Center().Layer(0) m_auimgr.AddPane( m_compListBox, EDA_PANE().Palette().Name( "Components" ).Center().Layer(0)
.Caption( _( "Symbol : Footprint Assignments" ) ) ); .Caption( _( "Symbol : Footprint Assignments" ) ) );
m_auimgr.AddPane( m_footprintListBox, EDA_PANE().Palette().Name( "Footprints" ).Right().Layer(1) m_auimgr.AddPane( m_footprintListBox, EDA_PANE().Palette().Name( "Footprints" ).Right().Layer(1)
.Caption( _( "Filtered Footprints" ) ) .Caption( _( "Filtered Footprints" ) )
.BestSize( (int) ( m_FrameSize.x * 0.30 ), m_FrameSize.y ) ); .BestSize((int) ( m_frameSize.x * 0.30 ), m_frameSize.y ) );
// Build the bottom panel, to display 2 status texts and the buttons: // Build the bottom panel, to display 2 status texts and the buttons:
auto bottomPanel = new wxPanel( this ); auto bottomPanel = new wxPanel( this );

2
cvpcb/display_footprints_frame.cpp
View File

@ -82,7 +82,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, wxWindow* aPa
SetScreen( new PCB_SCREEN( GetPageSizeIU() ) ); SetScreen( new PCB_SCREEN( GetPageSizeIU() ) );
// Create GAL canvas before loading settings // Create GAL canvas before loading settings
auto* gal_drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize, auto* gal_drawPanel = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
GetGalDisplayOptions(), GetGalDisplayOptions(),
EDA_DRAW_PANEL_GAL::GAL_FALLBACK ); EDA_DRAW_PANEL_GAL::GAL_FALLBACK );
SetCanvas( gal_drawPanel ); SetCanvas( gal_drawPanel );

2
eeschema/cross-probing.cpp
View File

@ -578,7 +578,7 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
STRING_FORMATTER formatter; STRING_FORMATTER formatter;
// TODO remove once real-time connectivity is a given // TODO remove once real-time connectivity is a given
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
// Ensure the netlist data is up to date: // Ensure the netlist data is up to date:
RecalculateConnections( NO_CLEANUP ); RecalculateConnections( NO_CLEANUP );

2
eeschema/dialogs/dialog_annotate.cpp
View File

@ -107,7 +107,7 @@ DIALOG_ANNOTATE::DIALOG_ANNOTATE( SCH_EDIT_FRAME* parent, const wxString& messag
Layout(); Layout();
// When all widgets have the size fixed, call FinishDialogSettings // When all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_bom.cpp
View File

@ -247,7 +247,7 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) :
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }
DIALOG_BOM::~DIALOG_BOM() DIALOG_BOM::~DIALOG_BOM()

2
eeschema/dialogs/dialog_bus_manager.cpp
View File

@ -183,7 +183,7 @@ DIALOG_BUS_MANAGER::DIALOG_BUS_MANAGER( SCH_EDIT_FRAME* aParent )
m_bus_edit->SetHint( _( "Bus Alias Name" ) ); m_bus_edit->SetHint( _( "Bus Alias Name" ) );
m_signal_edit->SetHint( _( "Net or Bus Name" ) ); m_signal_edit->SetHint( _( "Net or Bus Name" ) );
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -149,7 +149,7 @@ DIALOG_CHANGE_SYMBOLS::DIALOG_CHANGE_SYMBOLS( SCH_EDIT_FRAME* aParent, SCH_COMPO
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

8
eeschema/dialogs/dialog_choose_component.cpp
View File

@ -155,14 +155,14 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
// We specify the width of the right window (m_symbol_view_panel), because specify // We specify the width of the right window (m_symbol_view_panel), because specify
// the width of the left window does not work as expected when SetSashGravity() is called // the width of the left window does not work as expected when SetSashGravity() is called
m_hsplitter->SetSashPosition( panelCfg.sash_pos_h > 0 ? panelCfg.sash_pos_h : m_hsplitter->SetSashPosition( panelCfg.sash_pos_h > 0 ? panelCfg.sash_pos_h :
HorizPixelsFromDU( 220 ) ); horizPixelsFromDU( 220 ) );
if( m_vsplitter ) if( m_vsplitter )
m_vsplitter->SetSashPosition( panelCfg.sash_pos_v > 0 ? panelCfg.sash_pos_v : m_vsplitter->SetSashPosition( panelCfg.sash_pos_v > 0 ? panelCfg.sash_pos_v :
VertPixelsFromDU( 230 ) ); vertPixelsFromDU( 230 ) );
wxSize dlgSize( panelCfg.width > 0 ? panelCfg.width : HorizPixelsFromDU( 390 ), wxSize dlgSize( panelCfg.width > 0 ? panelCfg.width : horizPixelsFromDU( 390 ),
panelCfg.height > 0 ? panelCfg.height : VertPixelsFromDU( 300 ) ); panelCfg.height > 0 ? panelCfg.height : vertPixelsFromDU( 300 ) );
SetSize( dlgSize ); SetSize( dlgSize );
} }

2
eeschema/dialogs/dialog_edit_components_libid.cpp
View File

@ -373,7 +373,7 @@ DIALOG_EDIT_COMPONENTS_LIBID::DIALOG_EDIT_COMPONENTS_LIBID( SCH_EDIT_FRAME* aPar
initDlg(); initDlg();
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_edit_label.cpp
View File

@ -135,7 +135,7 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_edit_line_style.cpp
View File

@ -75,7 +75,7 @@ DIALOG_EDIT_LINE_STYLE::DIALOG_EDIT_LINE_STYLE( SCH_EDIT_FRAME* aParent,
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_edit_one_field.cpp
View File

@ -130,7 +130,7 @@ void DIALOG_EDIT_ONE_FIELD::init()
} }
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_erc.cpp
View File

@ -106,7 +106,7 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
} }
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -834,7 +834,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
FinishDialogSettings(); finishDialogSettings();
SetSize( defaultDlgSize ); SetSize( defaultDlgSize );
Center(); Center();

4
eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -105,7 +105,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_
m_hasChange = false; m_hasChange = false;
// TODO(JE) remove once real-time connectivity is a given // TODO(JE) remove once real-time connectivity is a given
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
m_parent->RecalculateConnections( NO_CLEANUP ); m_parent->RecalculateConnections( NO_CLEANUP );
m_lineStyle->Append( DEFAULT_STYLE ); m_lineStyle->Append( DEFAULT_STYLE );
@ -118,7 +118,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_
m_sdbSizerButtonsOK->SetDefault(); m_sdbSizerButtonsOK->SetDefault();
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_junction_props.cpp
View File

@ -44,7 +44,7 @@ DIALOG_JUNCTION_PROPS::DIALOG_JUNCTION_PROPS( SCH_EDIT_FRAME* aParent,
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_lib_edit_draw_item.cpp
View File

@ -46,7 +46,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM::DIALOG_LIB_EDIT_DRAW_ITEM( SYMBOL_EDIT_FRAME* aParent
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_lib_edit_text.cpp
View File

@ -55,7 +55,7 @@ DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( SYMBOL_EDIT_FRAME* aParent, LIB_TEXT
m_sdbSizerButtonsOK->SetDefault(); m_sdbSizerButtonsOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_lib_new_component.cpp
View File

@ -49,7 +49,7 @@ DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( EDA_DRAW_FRAME* aParent,
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

4
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -102,7 +102,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS && aLibEntry->IsRoot() ) if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS && aLibEntry->IsRoot() )
|| ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::PARENT && aLibEntry->IsAlias() ) ) || ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::PARENT && aLibEntry->IsAlias() ) )
{ {
ResetSize(); resetSize();
} }
} }
@ -113,7 +113,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
syncControlStates( m_libEntry->IsAlias() ); syncControlStates( m_libEntry->IsAlias() );
Layout(); Layout();
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_netlist.cpp
View File

@ -314,7 +314,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
m_sdbSizer2OK->SetDefault(); m_sdbSizer2OK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_paste_special.cpp
View File

@ -32,7 +32,7 @@ DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep ) :
m_keep( aKeep ) m_keep( aKeep )
{ {
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_pin_properties.cpp
View File

@ -201,7 +201,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
SetInitialFocus( m_textPinName ); SetInitialFocus( m_textPinName );
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
// On some window managers (Unity, XFCE) the dialog is not always raised, depending on // On some window managers (Unity, XFCE) the dialog is not always raised, depending on
// how it is is run. // how it is is run.

2
eeschema/dialogs/dialog_plot_schematic.cpp
View File

@ -65,7 +65,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
initDlg(); initDlg();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_print_using_printer.cpp
View File

@ -154,7 +154,7 @@ DIALOG_PRINT_USING_PRINTER::DIALOG_PRINT_USING_PRINTER( SCH_EDIT_FRAME* aParent
// what ENTER does. Must also SetFocus(). // what ENTER does. Must also SetFocus().
m_sdbSizer1OK->SetFocus(); m_sdbSizer1OK->SetFocus();
FinishDialogSettings(); finishDialogSettings();
} }

4
eeschema/dialogs/dialog_rescue_each.cpp
View File

@ -142,7 +142,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( wxWindow* aParent,
m_previewNewWidget->SetLayoutDirection( wxLayout_LeftToRight ); m_previewNewWidget->SetLayoutDirection( wxLayout_LeftToRight );
Layout(); Layout();
SetSizeInDU( 480, 360 ); setSizeInDU( 480, 360 );
// Make sure the HTML window is large enough. Some fun size juggling and // Make sure the HTML window is large enough. Some fun size juggling and
// fudge factors here but it does seem to work pretty reliably. // fudge factors here but it does seem to work pretty reliably.
@ -153,7 +153,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( wxWindow* aParent,
m_htmlPrompt->SetSizeHints( 2 * prompt_size.x / 3, approx_info_height ); m_htmlPrompt->SetSizeHints( 2 * prompt_size.x / 3, approx_info_height );
Layout(); Layout();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
SetSizeInDU( 480, 360 ); setSizeInDU( 480, 360 );
Center(); Center();
} }

2
eeschema/dialogs/dialog_schematic_setup.cpp
View File

@ -85,7 +85,7 @@ DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) :
if( Prj().IsReadOnly() ) if( Prj().IsReadOnly() )
m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) ); m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) );
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_sheet_pin_properties.cpp
View File

@ -59,7 +59,7 @@ DIALOG_SHEET_PIN_PROPERTIES::DIALOG_SHEET_PIN_PROPERTIES( SCH_EDIT_FRAME* parent
m_comboName->SetValidator( validator ); m_comboName->SetValidator( validator );
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
/* This ugly hack fixes a bug in wxWidgets 2.8.7 and likely earlier versions for /* This ugly hack fixes a bug in wxWidgets 2.8.7 and likely earlier versions for
* the flex grid sizer in wxGTK that prevents the last column from being sized * the flex grid sizer in wxGTK that prevents the last column from being sized

4
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -87,7 +87,7 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
wxGridEventHandler( DIALOG_SHEET_PROPERTIES::OnGridCellChanging ), wxGridEventHandler( DIALOG_SHEET_PROPERTIES::OnGridCellChanging ),
NULL, this ); NULL, this );
FinishDialogSettings(); finishDialogSettings();
} }
@ -823,5 +823,5 @@ void DIALOG_SHEET_PROPERTIES::OnInitDlg( wxInitDialogEvent& event )
TransferDataToWindow(); TransferDataToWindow();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_signal_list.cpp
View File

@ -81,7 +81,7 @@ bool DIALOG_SIGNAL_LIST::TransferDataToWindow()
bool success = DIALOG_SIGNAL_LIST_BASE::TransferDataToWindow(); bool success = DIALOG_SIGNAL_LIST_BASE::TransferDataToWindow();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
return success; return success;
} }

2
eeschema/dialogs/dialog_sim_settings.h
View File

@ -90,7 +90,7 @@ private:
TransferDataToWindow(); TransferDataToWindow();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }
/** /**

2
eeschema/dialogs/dialog_spice_model.h
View File

@ -99,7 +99,7 @@ private:
TransferDataToWindow(); TransferDataToWindow();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }
/** /**

4
eeschema/dialogs/dialog_symbol_properties.cpp
View File

@ -361,7 +361,7 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
wxGridEventHandler( DIALOG_SYMBOL_PROPERTIES::OnPinTableColSort ), wxGridEventHandler( DIALOG_SYMBOL_PROPERTIES::OnPinTableColSort ),
nullptr, this ); nullptr, this );
FinishDialogSettings(); finishDialogSettings();
} }
@ -1037,5 +1037,5 @@ void DIALOG_SYMBOL_PROPERTIES::OnInitDlg( wxInitDialogEvent& event )
TransferDataToWindow(); TransferDataToWindow();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
eeschema/dialogs/dialog_update_from_pcb.cpp
View File

@ -66,7 +66,7 @@ DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
m_sdbSizer->Layout(); m_sdbSizer->Layout();
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
FinishDialogSettings(); finishDialogSettings();
} }
void DIALOG_UPDATE_FROM_PCB::updateData() void DIALOG_UPDATE_FROM_PCB::updateData()

10
eeschema/lib_view_frame.cpp
View File

@ -111,7 +111,7 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
if( aFrameType == FRAME_SCH_VIEWER_MODAL ) if( aFrameType == FRAME_SCH_VIEWER_MODAL )
SetModal( true ); SetModal( true );
m_AboutTitle = "Symbol Library Viewer"; m_aboutTitle = "Symbol Library Viewer";
// Force the frame name used in config. the lib viewer frame has a name // Force the frame name used in config. the lib viewer frame has a name
// depending on aFrameType (needed to identify the frame by wxWidgets), // depending on aFrameType (needed to identify the frame by wxWidgets),
@ -687,11 +687,11 @@ void LIB_VIEW_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
GetRenderSettings()->m_ShowPinsElectricalType = cfg->m_LibViewPanel.show_pin_electrical_type; GetRenderSettings()->m_ShowPinsElectricalType = cfg->m_LibViewPanel.show_pin_electrical_type;
// Set parameters to a reasonable value. // Set parameters to a reasonable value.
if( m_libListWidth > m_FrameSize.x/2 ) if( m_libListWidth > m_frameSize.x / 2 )
m_libListWidth = m_FrameSize.x/2; m_libListWidth = m_frameSize.x / 2;
if( m_cmpListWidth > m_FrameSize.x/2 ) if( m_cmpListWidth > m_frameSize.x / 2 )
m_cmpListWidth = m_FrameSize.x/2; m_cmpListWidth = m_frameSize.x / 2;
} }

4
eeschema/sch_base_frame.cpp
View File

@ -271,7 +271,7 @@ KIGFX::SCH_RENDER_SETTINGS* SCH_BASE_FRAME::GetRenderSettings()
void SCH_BASE_FRAME::createCanvas() void SCH_BASE_FRAME::createCanvas()
{ {
m_canvasType = LoadCanvasTypeSetting(); m_canvasType = loadCanvasTypeSetting();
// Allows only a CAIRO or OPENGL canvas: // Allows only a CAIRO or OPENGL canvas:
if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL
@ -280,7 +280,7 @@ void SCH_BASE_FRAME::createCanvas()
m_canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL; m_canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
} }
SetCanvas( new SCH_DRAW_PANEL( this, wxID_ANY, wxPoint( 0, 0 ), m_FrameSize, SetCanvas( new SCH_DRAW_PANEL( this, wxID_ANY, wxPoint( 0, 0 ), m_frameSize,
GetGalDisplayOptions(), m_canvasType )); GetGalDisplayOptions(), m_canvasType ));
ActivateGalCanvas(); ActivateGalCanvas();
} }

2
eeschema/sch_connection.cpp
View File

@ -395,7 +395,7 @@ void SCH_CONNECTION::AppendInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
#if defined(DEBUG) #if defined(DEBUG)
// These messages are not flagged as translatable, because they are only debug messages // These messages are not flagged as translatable, because they are only debug messages
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
return; return;
if( IsBus() ) if( IsBus() )

8
eeschema/sch_edit_frame.cpp
View File

@ -217,7 +217,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
m_showBorderAndTitleBlock = true; // true to show sheet references m_showBorderAndTitleBlock = true; // true to show sheet references
m_hasAutoSave = true; m_hasAutoSave = true;
m_AboutTitle = "Eeschema"; m_aboutTitle = "Eeschema";
m_findReplaceDialog = nullptr; m_findReplaceDialog = nullptr;
@ -274,7 +274,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
m_auimgr.GetPane( "InfoBar" ).Hide(); m_auimgr.GetPane( "InfoBar" ).Hide();
m_auimgr.Update(); m_auimgr.Update();
ResolveCanvasType(); resolveCanvasType();
SwitchCanvas( m_canvasType ); SwitchCanvas( m_canvasType );
GetToolManager()->RunAction( ACTIONS::zoomFitScreen, true ); GetToolManager()->RunAction( ACTIONS::zoomFitScreen, true );
@ -291,7 +291,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ):
p->SetSchematic( m_schematic ); p->SetSchematic( m_schematic );
} }
InitExitKey(); initExitKey();
setupUnits( eeconfig() ); setupUnits( eeconfig() );
// Net list generator // Net list generator
@ -724,7 +724,7 @@ void SCH_EDIT_FRAME::OnModify()
GetScreen()->SetModify(); GetScreen()->SetModify();
GetScreen()->SetSave(); GetScreen()->SetSave();
if( ADVANCED_CFG::GetCfg().m_realTimeConnectivity && CONNECTION_GRAPH::m_allowRealTime ) if( ADVANCED_CFG::GetCfg().m_RealTimeConnectivity && CONNECTION_GRAPH::m_allowRealTime )
RecalculateConnections( NO_CLEANUP ); RecalculateConnections( NO_CLEANUP );
GetCanvas()->GetView()->UpdateAllItemsConditionally( KIGFX::REPAINT, GetCanvas()->GetView()->UpdateAllItemsConditionally( KIGFX::REPAINT,

4
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -106,7 +106,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_libMgr = nullptr; m_libMgr = nullptr;
m_unit = 1; m_unit = 1;
m_convert = 1; m_convert = 1;
m_AboutTitle = _( "Symbol Editor" ); m_aboutTitle = _( "Symbol Editor" );
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) ); icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) );
@ -138,7 +138,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
ReCreateHToolbar(); ReCreateHToolbar();
ReCreateVToolbar(); ReCreateVToolbar();
ReCreateOptToolbar(); ReCreateOptToolbar();
InitExitKey(); initExitKey();
updateTitle(); updateTitle();
DisplaySymbolDatasheet(); DisplaySymbolDatasheet();

4
eeschema/tools/sch_editor_control.cpp
View File

@ -911,7 +911,7 @@ int SCH_EDITOR_CONTROL::AssignNetclass( const TOOL_EVENT& aEvent )
VECTOR2D cursorPos = controls->GetCursorPosition( !aEvent.Modifier( MD_ALT ) ); VECTOR2D cursorPos = controls->GetCursorPosition( !aEvent.Modifier( MD_ALT ) );
// TODO remove once real-time connectivity is a given // TODO remove once real-time connectivity is a given
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
// Ensure the netlist data is up to date: // Ensure the netlist data is up to date:
m_frame->RecalculateConnections( NO_CLEANUP ); m_frame->RecalculateConnections( NO_CLEANUP );
@ -1135,7 +1135,7 @@ int SCH_EDITOR_CONTROL::UpdateNetHighlighting( const TOOL_EVENT& aEvent )
int SCH_EDITOR_CONTROL::HighlightNetCursor( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::HighlightNetCursor( const TOOL_EVENT& aEvent )
{ {
// TODO(JE) remove once real-time connectivity is a given // TODO(JE) remove once real-time connectivity is a given
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
m_frame->RecalculateConnections( NO_CLEANUP ); m_frame->RecalculateConnections( NO_CLEANUP );
std::string tool = aEvent.GetCommandStr().get(); std::string tool = aEvent.GetCommandStr().get();

2
eeschema/tools/sch_line_wire_bus_tool.cpp
View File

@ -103,7 +103,7 @@ private:
Clear(); Clear();
// TODO(JE) remove once real-time is enabled // TODO(JE) remove once real-time is enabled
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime ) if( !ADVANCED_CFG::GetCfg().m_RealTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
{ {
frame->RecalculateConnections( NO_CLEANUP ); frame->RecalculateConnections( NO_CLEANUP );

10
gerbview/dialogs/dialog_print_gerbview.cpp
View File

@ -141,7 +141,7 @@ bool DIALOG_PRINT_GERBVIEW::TransferDataToWindow()
wxCheckListBox* listBox = m_layerLists[listIdx]; wxCheckListBox* listBox = m_layerLists[listIdx];
listBox->Append( filename.GetFullName() ); listBox->Append( filename.GetFullName() );
if( settings()->m_layerSet.test(ii) ) if( settings()->m_LayerSet.test( ii) )
listBox->Check( ii, true ); listBox->Check( ii, true );
wxASSERT( m_layerToItemMap.count( ii ) == 0 ); wxASSERT( m_layerToItemMap.count( ii ) == 0 );
@ -150,7 +150,7 @@ bool DIALOG_PRINT_GERBVIEW::TransferDataToWindow()
++itemIdx; ++itemIdx;
} }
m_checkboxMirror->SetValue( settings()->m_mirror ); m_checkboxMirror->SetValue( settings()->m_Mirror );
// Update the dialog layout when layers are added // Update the dialog layout when layers are added
GetSizer()->Fit( this ); GetSizer()->Fit( this );
@ -267,7 +267,7 @@ void DIALOG_PRINT_GERBVIEW::enableLayer( unsigned int aLayer, bool aValue )
int DIALOG_PRINT_GERBVIEW::setLayerSetFromList() int DIALOG_PRINT_GERBVIEW::setLayerSetFromList()
{ {
settings()->m_layerSet = LSET(); settings()->m_LayerSet = LSET();
int& pageCount = settings()->m_pageCount; int& pageCount = settings()->m_pageCount;
pageCount = 0; pageCount = 0;
@ -279,7 +279,7 @@ int DIALOG_PRINT_GERBVIEW::setLayerSetFromList()
{ {
if( isLayerEnabled( layer ) ) if( isLayerEnabled( layer ) )
{ {
settings()->m_layerSet.set( layer ); settings()->m_LayerSet.set( layer );
++pageCount; ++pageCount;
} }
@ -295,7 +295,7 @@ void DIALOG_PRINT_GERBVIEW::saveSettings()
{ {
setLayerSetFromList(); setLayerSetFromList();
settings()->m_mirror = m_checkboxMirror->GetValue(); settings()->m_Mirror = m_checkboxMirror->GetValue();
DIALOG_PRINT_GENERIC::saveSettings(); DIALOG_PRINT_GENERIC::saveSettings();
} }

6
gerbview/gerbview_frame.cpp
View File

@ -89,7 +89,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
m_apertText = nullptr; m_apertText = nullptr;
m_dcodeText = nullptr; m_dcodeText = nullptr;
m_displayMode = 0; m_displayMode = 0;
m_AboutTitle = "GerbView"; m_aboutTitle = "GerbView";
SHAPE_POLY_SET dummy; // A ugly trick to force the linker to include SHAPE_POLY_SET dummy; // A ugly trick to force the linker to include
// some methods in code and avoid link errors // some methods in code and avoid link errors
@ -99,7 +99,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
m_zipFileHistory.SetMaxFiles( fileHistorySize ); m_zipFileHistory.SetMaxFiles( fileHistorySize );
m_jobFileHistory.SetMaxFiles( fileHistorySize ); m_jobFileHistory.SetMaxFiles( fileHistorySize );
auto* galCanvas = new GERBVIEW_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize, auto* galCanvas = new GERBVIEW_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
GetGalDisplayOptions(), GetGalDisplayOptions(),
EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE ); EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
@ -160,7 +160,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
SetActiveLayer( 0, true ); SetActiveLayer( 0, true );
GetToolManager()->RunAction( ACTIONS::zoomFitScreen, false ); GetToolManager()->RunAction( ACTIONS::zoomFitScreen, false );
ResolveCanvasType(); resolveCanvasType();
SwitchCanvas( m_canvasType ); SwitchCanvas( m_canvasType );

8
gerbview/gerbview_printout.cpp
View File

@ -44,7 +44,7 @@ GERBVIEW_PRINTOUT::GERBVIEW_PRINTOUT( GBR_LAYOUT* aLayout, const BOARD_PRINTOUT_
bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage ) bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
{ {
// Store the layerset, as it is going to be modified below and the original settings are needed // Store the layerset, as it is going to be modified below and the original settings are needed
LSET lset = m_settings.m_layerSet; LSET lset = m_settings.m_LayerSet;
// The gerber filename of the page to print will be printed to the worksheet. // The gerber filename of the page to print will be printed to the worksheet.
// Find this filename: // Find this filename:
@ -57,7 +57,7 @@ bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
// because handling negative objects when using only one page is tricky // because handling negative objects when using only one page is tricky
// Enable only one layer to create a printout // Enable only one layer to create a printout
m_settings.m_layerSet = LSET( layerId ); m_settings.m_LayerSet = LSET( layerId );
GERBER_FILE_IMAGE_LIST& gbrImgList = GERBER_FILE_IMAGE_LIST::GetImagesList(); GERBER_FILE_IMAGE_LIST& gbrImgList = GERBER_FILE_IMAGE_LIST::GetImagesList();
GERBER_FILE_IMAGE* gbrImage = gbrImgList.GetGbrImage( layerId ); GERBER_FILE_IMAGE* gbrImage = gbrImgList.GetGbrImage( layerId );
@ -69,7 +69,7 @@ bool GERBVIEW_PRINTOUT::OnPrintPage( int aPage )
DrawPage( gbr_filename, aPage, m_settings.m_pageCount ); DrawPage( gbr_filename, aPage, m_settings.m_pageCount );
// Restore the original layer set, so the next page can be printed // Restore the original layer set, so the next page can be printed
m_settings.m_layerSet = lset; m_settings.m_LayerSet = lset;
return true; return true;
} }
@ -85,7 +85,7 @@ void GERBVIEW_PRINTOUT::setupViewLayers( KIGFX::VIEW& aView, const LSET& aLayerS
{ {
BOARD_PRINTOUT::setupViewLayers( aView, aLayerSet ); BOARD_PRINTOUT::setupViewLayers( aView, aLayerSet );
for( LSEQ layerSeq = m_settings.m_layerSet.Seq(); layerSeq; ++layerSeq ) for( LSEQ layerSeq = m_settings.m_LayerSet.Seq(); layerSeq; ++layerSeq )
aView.SetLayerVisible( GERBVIEW_LAYER_ID_START + *layerSeq, true ); aView.SetLayerVisible( GERBVIEW_LAYER_ID_START + *layerSeq, true );
} }

19
include/advanced_config.h
View File

@ -59,8 +59,7 @@ class ADVANCED_CFG
{ {
public: public:
/** /**
* Get the singleton instance's config, which is shared by all * Get the singleton instance's config, which is shared by all consumers.
* consumers of advanced config.
* *
* This configuration is read-only - to set options, users should add the parameters to * This configuration is read-only - to set options, users should add the parameters to
* their config files at ~/.config/kicad/advanced, or the platform equivalent. * their config files at ~/.config/kicad/advanced, or the platform equivalent.
@ -68,18 +67,16 @@ public:
static const ADVANCED_CFG& GetCfg(); static const ADVANCED_CFG& GetCfg();
/** /**
* For drawsegments - arcs.
* Distance from an arc end point and the estimated end point, when rotating from the * Distance from an arc end point and the estimated end point, when rotating from the
* start point to the end point. * start point to the end point.
*/ */
double m_drawArcAccuracy; double m_DrawArcAccuracy;
/** /**
* For drawsegments - arcs. * When drawing an arc, the angle ( center - start ) - ( start - end ) can be limited to
* When drawing an arc, the angle ( center - start ) - ( start - end ) * avoid extremely high radii.
* can be limited to avoid extremely high radii.
*/ */
double m_drawArcCenterMaxAngle; double m_DrawArcCenterMaxAngle;
/** /**
* Extra fill clearance for zone fills. Note that for zone tests this is essentially * Extra fill clearance for zone fills. Note that for zone tests this is essentially
@ -102,12 +99,12 @@ public:
/** /**
* Do real-time connectivity * Do real-time connectivity
*/ */
bool m_realTimeConnectivity; bool m_RealTimeConnectivity;
/** /**
* Set the stack size for coroutines * Set the stack size for coroutines
*/ */
int m_coroutineStackSize; int m_CoroutineStackSize;
/** /**
* Show PNS router debug graphics * Show PNS router debug graphics
@ -143,7 +140,7 @@ public:
bool m_DebugZoneFiller; bool m_DebugZoneFiller;
/** /**
* A mode that writes PDF's without compression. * A mode that writes PDFs without compression.
*/ */
bool m_DebugPDFWriter; bool m_DebugPDFWriter;

29
include/base_screen.h
View File

@ -41,8 +41,8 @@
class BASE_SCREEN : public EDA_ITEM class BASE_SCREEN : public EDA_ITEM
{ {
private: private:
bool m_FlagModified; ///< Indicates current drawing has been modified. bool m_flagModified; ///< Indicates current drawing has been modified.
bool m_FlagSave; ///< Indicates automatic file save. bool m_flagSave; ///< Indicates automatic file save.
/** /**
* The cross hair position in logical (drawing) units. The cross hair is not the cursor * The cross hair position in logical (drawing) units. The cross hair is not the cursor
@ -89,15 +89,12 @@ public:
VECTOR2D m_LocalOrigin; ///< Relative Screen cursor coordinate (on grid) VECTOR2D m_LocalOrigin; ///< Relative Screen cursor coordinate (on grid)
///< in user units. (coordinates from last reset position) ///< in user units. (coordinates from last reset position)
wxPoint m_StartVisu; /**< Coordinates in drawing units of the current wxPoint m_StartVisu; ///< Coordinates in drawing units of the current
* view position (upper left corner of device) ///< view position (upper left corner of device)
*/
bool m_Center; /**< Center on screen. If true (0.0) is centered bool m_Center; ///< Center on screen. If true (0.0) is centered on screen
* on screen coordinates can be < 0 and ///< coordinates can be < 0 and > 0 except for schematics.
* > 0 except for schematics. ///< false: when coordinates can only be >= 0 (schematics).
* false: when coordinates can only be >= 0
* Schematic */
VECTOR2D m_ScrollCenter; ///< Current scroll center point in logical units. VECTOR2D m_ScrollCenter; ///< Current scroll center point in logical units.
@ -120,12 +117,12 @@ public:
void InitDataPoints( const wxSize& aPageSizeInternalUnits ); void InitDataPoints( const wxSize& aPageSizeInternalUnits );
void SetModify() { m_FlagModified = true; } void SetModify() { m_flagModified = true; }
void ClrModify() { m_FlagModified = false; } void ClrModify() { m_flagModified = false; }
void SetSave() { m_FlagSave = true; } void SetSave() { m_flagSave = true; }
void ClrSave() { m_FlagSave = false; } void ClrSave() { m_flagSave = false; }
bool IsModify() const { return m_FlagModified; } bool IsModify() const { return m_flagModified; }
bool IsSave() const { return m_FlagSave; } bool IsSave() const { return m_flagSave; }
/** /**
* Return the class name. * Return the class name.

12
include/board_item.h
View File

@ -372,11 +372,10 @@ public:
protected: protected:
/** /**
* Helper function * Return a string (to be shown to the user) describing a layer mask. The BOARD is needed
* Return a string (to be shown to the user) describing a layer mask. * because layer names are customizable.
* The BOARD is needed because layer names are (somewhat) customizable
*/ */
virtual wxString LayerMaskDescribe() const; virtual wxString layerMaskDescribe() const;
}; };
#ifndef SWIG #ifndef SWIG
@ -407,10 +406,7 @@ public:
// pure virtuals: // pure virtuals:
void SetPosition( const wxPoint& ) override {} void SetPosition( const wxPoint& ) override {}
wxPoint GetPosition() const override { return wxPoint(0, 0); }
wxPoint GetPosition() const override {
return wxPoint(0, 0);
}
static DELETED_BOARD_ITEM* GetInstance() static DELETED_BOARD_ITEM* GetInstance()
{ {

4
include/board_printout.h
View File

@ -55,8 +55,8 @@ struct BOARD_PRINTOUT_SETTINGS : public PRINTOUT_SETTINGS
{ {
} }
LSET m_layerSet; ///< Layers to print LSET m_LayerSet; ///< Layers to print
bool m_mirror; ///< Print mirrored bool m_Mirror; ///< Print mirrored
void Load( APP_SETTINGS_BASE* aConfig ) override; void Load( APP_SETTINGS_BASE* aConfig ) override;
void Save( APP_SETTINGS_BASE* aConfig ) override; void Save( APP_SETTINGS_BASE* aConfig ) override;

34
include/dialog_shim.h
View File

@ -102,9 +102,8 @@ public:
DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& title, DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER, long style = wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER,
const wxString& name = wxDialogNameStr const wxString& name = wxDialogNameStr );
);
~DIALOG_SHIM(); ~DIALOG_SHIM();
@ -146,45 +145,38 @@ public:
e.ShiftDown() && !e.MetaDown(); e.ShiftDown() && !e.MetaDown();
} }
static void FixOSXCancelButtonIssue( wxWindow *aWindow );
protected: protected:
/** /**
* In all dialogs, we must call the same functions to fix minimal * In all dialogs, we must call the same functions to fix minimal dlg size, the default
* dlg size, the default position and perhaps some others to fix a few issues * position and perhaps some others to fix a few issues depending on Windows Managers
* depending on Windows Managers
* this helper function does these calls. * this helper function does these calls.
* *
* FinishDialogSettings must be called from derived classes, * finishDialogSettings must be called from derived classes after all widgets have been
* when all widgets are initialized, and therefore their size fixed. * initialized, and therefore their size fixed. If TransferDataToWindow() is used to
* If TransferDataToWindow() is used to initialize widgets, at end of TransferDataToWindow, * initialize widgets, at the end of TransferDataToWindow, or better yet, at end of a
* or better at end of a wxInitDialogEvent handler * wxInitDialogEvent handler.
*
* In any case, the best way is to call it in a wxInitDialogEvent handler
* after calling TransfertDataToWindow(), which is the default
* wxInitDialogEvent handler wxDialog
*/ */
void FinishDialogSettings(); void finishDialogSettings();
/** /**
* Set the dialog to the given dimensions in "dialog units". These are units equivalent * Set the dialog to the given dimensions in "dialog units". These are units equivalent
* to 4* the average character width and 8* the average character height, allowing a dialog * to 4* the average character width and 8* the average character height, allowing a dialog
* to be sized in a way that scales it with the system font. * to be sized in a way that scales it with the system font.
*/ */
void SetSizeInDU( int x, int y ); void setSizeInDU( int x, int y );
/** /**
* Convert an integer number of dialog units to pixels, horizontally. See SetSizeInDU or * Convert an integer number of dialog units to pixels, horizontally. See SetSizeInDU or
* wxDialog documentation for more information. * wxDialog documentation for more information.
*/ */
int HorizPixelsFromDU( int x ); int horizPixelsFromDU( int x );
/** /**
* Convert an integer number of dialog units to pixels, vertically. See SetSizeInDU or * Convert an integer number of dialog units to pixels, vertically. See SetSizeInDU or
* wxDialog documentation for more information. * wxDialog documentation for more information.
*/ */
int VertPixelsFromDU( int y ); int vertPixelsFromDU( int y );
/** /**
* Clear the existing dialog size and position. * Clear the existing dialog size and position.
@ -193,7 +185,7 @@ protected:
* the sizers will layout the dialog accordingly. This useful when there are dialog * the sizers will layout the dialog accordingly. This useful when there are dialog
* windows that size changes due to layout dependency hidden controls. * windows that size changes due to layout dependency hidden controls.
*/ */
void ResetSize(); void resetSize();
EDA_UNITS m_units; // userUnits for display and parsing EDA_UNITS m_units; // userUnits for display and parsing
std::string m_hash_key; // alternate for class_map when classname re-used std::string m_hash_key; // alternate for class_map when classname re-used

2
include/dialogs/html_messagebox.h
View File

@ -55,7 +55,7 @@ public:
*/ */
void SetDialogSizeInDU( int aWidth, int aHeight ) void SetDialogSizeInDU( int aWidth, int aHeight )
{ {
SetSizeInDU( aWidth, aHeight ); setSizeInDU( aWidth, aHeight );
Center(); Center();
} }

20
include/eda_base_frame.h
View File

@ -127,16 +127,16 @@ class EDA_BASE_FRAME : public wxFrame, public TOOLS_HOLDER, public KIWAY_HOLDER
virtual bool IsModal() const { return false; } virtual bool IsModal() const { return false; }
protected: protected:
FRAME_T m_Ident; // Id Type (pcb, schematic, library..) FRAME_T m_ident; // Id Type (pcb, schematic, library..)
wxPoint m_FramePos; wxPoint m_framePos;
wxSize m_FrameSize; wxSize m_frameSize;
bool m_maximizeByDefault; bool m_maximizeByDefault;
// These contain the frame size and position for when it is not maximized // These contain the frame size and position for when it is not maximized
wxPoint m_NormalFramePos; wxPoint m_normalFramePos;
wxSize m_NormalFrameSize; wxSize m_normalFrameSize;
wxString m_AboutTitle; // Name of program displayed in About. wxString m_aboutTitle; // Name of program displayed in About.
wxAuiManager m_auimgr; wxAuiManager m_auimgr;
wxString m_perspective; // wxAuiManager perspective. wxString m_perspective; // wxAuiManager perspective.
@ -155,7 +155,7 @@ protected:
int m_autoSaveInterval; // The auto save interval time in seconds. int m_autoSaveInterval; // The auto save interval time in seconds.
wxTimer* m_autoSaveTimer; wxTimer* m_autoSaveTimer;
int m_UndoRedoCountMax; // undo/Redo command Max depth int m_undoRedoCountMax; // undo/Redo command Max depth
UNDO_REDO_CONTAINER m_undoList; // Objects list for the undo command (old data) UNDO_REDO_CONTAINER m_undoList; // Objects list for the undo command (old data)
UNDO_REDO_CONTAINER m_redoList; // Objects list for the redo command (old data) UNDO_REDO_CONTAINER m_redoList; // Objects list for the redo command (old data)
@ -314,7 +314,7 @@ public:
int GetAutoSaveInterval() const { return m_autoSaveInterval; } int GetAutoSaveInterval() const { return m_autoSaveInterval; }
bool IsType( FRAME_T aType ) const { return m_Ident == aType; } bool IsType( FRAME_T aType ) const { return m_ident == aType; }
/** /**
* Return a SEARCH_STACK pertaining to entire program. * Return a SEARCH_STACK pertaining to entire program.
@ -551,7 +551,7 @@ public:
*/ */
virtual void ProjectChanged() {} virtual void ProjectChanged() {}
const wxString& GetAboutTitle() const { return m_AboutTitle; } const wxString& GetAboutTitle() const { return m_aboutTitle; }
/** /**
* Get if the contents of the frame have been modified since the last save. * Get if the contents of the frame have been modified since the last save.
@ -630,7 +630,7 @@ public:
virtual int GetUndoCommandCount() const { return m_undoList.m_CommandsList.size(); } virtual int GetUndoCommandCount() const { return m_undoList.m_CommandsList.size(); }
virtual int GetRedoCommandCount() const { return m_redoList.m_CommandsList.size(); } virtual int GetRedoCommandCount() const { return m_redoList.m_CommandsList.size(); }
int GetMaxUndoItems() const { return m_UndoRedoCountMax; } int GetMaxUndoItems() const { return m_undoRedoCountMax; }
bool NonUserClose( bool aForce ) bool NonUserClose( bool aForce )
{ {

75
include/eda_draw_frame.h
View File

@ -118,37 +118,27 @@ protected:
void setupUnits( APP_SETTINGS_BASE* aCfg ); void setupUnits( APP_SETTINGS_BASE* aCfg );
void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
/** /**
* Determines the Canvas type to load (with prompt if required) and initializes m_canvasType * Determines the Canvas type to load (with prompt if required) and initializes m_canvasType
*/ */
void ResolveCanvasType(); void resolveCanvasType();
/**
* Returns the canvas type stored in the application settings.
*/
EDA_DRAW_PANEL_GAL::GAL_TYPE loadCanvasTypeSetting();
/**
* Stores the canvas type in the application settings.
*/
bool saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType );
/** /**
* Sets the common key-pair for exiting the application (Ctrl-Q) and ties it * Sets the common key-pair for exiting the application (Ctrl-Q) and ties it
* to the wxID_EXIT event id. This is useful in sub-applications to pass the event * to the wxID_EXIT event id. This is useful in sub-applications to pass the event
* up to a non-owning window * up to a non-owning window
*/ */
void InitExitKey(); void initExitKey();
/**
* @param doOpen if true runs an Open Library browser, otherwise New Library
* @param aFilename for New may contain a default name; in both cases return the chosen
* filename.
* @param wildcard a wildcard to filter the displayed files
* @param ext the library file extension
* @param isDirectory indicates the library files are directories
* @return true for OK; false for Cancel.
*/
bool LibraryFileBrowser( bool doOpen, wxFileName& aFilename,
const wxString& wildcard, const wxString& ext,
bool isDirectory = false );
/**
* Stores the canvas type in the application settings.
*/
bool saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType );
public: public:
EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent,
@ -237,6 +227,21 @@ public:
bool ShowPageLimits() const { return m_showPageLimits; } bool ShowPageLimits() const { return m_showPageLimits; }
void SetShowPageLimits( bool aShow ) { m_showPageLimits = aShow; } void SetShowPageLimits( bool aShow ) { m_showPageLimits = aShow; }
/**
* @param doOpen if true runs an Open Library browser, otherwise New Library
* @param aFilename for New may contain a default name; in both cases return the chosen
* filename.
* @param wildcard a wildcard to filter the displayed files
* @param ext the library file extension
* @param isDirectory indicates the library files are directories
* @return true for OK; false for Cancel.
*/
bool LibraryFileBrowser( bool doOpen, wxFileName& aFilename,
const wxString& wildcard, const wxString& ext,
bool isDirectory = false );
void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
virtual wxString GetScreenDesc() const; virtual wxString GetScreenDesc() const;
/** /**
@ -246,13 +251,9 @@ public:
virtual BASE_SCREEN* GetScreen() const { return m_currentScreen; } virtual BASE_SCREEN* GetScreen() const { return m_currentScreen; }
/** /**
* Execute a remote command send via a socket to the application, * Execute a remote command sent via socket (to port KICAD_PCB_PORT_SERVICE_NUMBER,
* port KICAD_PCB_PORT_SERVICE_NUMBER (currently 4242) * currently 4242).
* It called by EDA_DRAW_FRAME::OnSockRequest(). * Subclasses should override to implement actual command handlers.
* this is a virtual function becuse the actual commands depends on the
* application.
* the basic function do nothing
* @param cmdline = received command from socket
*/ */
virtual void ExecuteRemoteCommand( const char* cmdline ){} virtual void ExecuteRemoteCommand( const char* cmdline ){}
@ -277,12 +278,11 @@ public:
/** /**
* Command event handler for selecting grid sizes. * Command event handler for selecting grid sizes.
* *
* All commands that set the grid size should eventually end up here. * All commands that set the grid size should eventually end up here. This is where the
* This is where the application setting is saved. If you override * application setting is saved. If you override this method, make sure you call down
* this method, make sure you call down to the base class. * to the base class.
* *
* @param event - Command event passed by selecting grid size from the * @param event - Command event from the grid size combobox on the toolbar.
* grid size combobox on the toolbar.
*/ */
void OnSelectGrid( wxCommandEvent& event ); void OnSelectGrid( wxCommandEvent& event );
@ -403,7 +403,6 @@ public:
void OnSockRequestServer( wxSocketEvent& evt ); void OnSockRequestServer( wxSocketEvent& evt );
void LoadSettings( APP_SETTINGS_BASE* aCfg ) override; void LoadSettings( APP_SETTINGS_BASE* aCfg ) override;
void SaveSettings( APP_SETTINGS_BASE* aCfg ) override; void SaveSettings( APP_SETTINGS_BASE* aCfg ) override;
/** /**
@ -432,7 +431,6 @@ public:
* @param aList is the list of #MSG_PANEL_ITEM objects to fill the message panel. * @param aList is the list of #MSG_PANEL_ITEM objects to fill the message panel.
*/ */
void SetMsgPanel( const std::vector< MSG_PANEL_ITEM >& aList ); void SetMsgPanel( const std::vector< MSG_PANEL_ITEM >& aList );
void SetMsgPanel( EDA_ITEM* aItem ); void SetMsgPanel( EDA_ITEM* aItem );
/** /**
@ -452,11 +450,6 @@ public:
*/ */
virtual void PrintPage( RENDER_SETTINGS* aSettings ); virtual void PrintPage( RENDER_SETTINGS* aSettings );
/**
* Returns the canvas type stored in the application settings.
*/
EDA_DRAW_PANEL_GAL::GAL_TYPE LoadCanvasTypeSetting();
/** /**
* Use to start up the GAL drawing canvas. * Use to start up the GAL drawing canvas.
*/ */

12
include/filename_resolver.h
View File

@ -42,17 +42,17 @@ class PGM_BASE;
struct SEARCH_PATH struct SEARCH_PATH
{ {
wxString m_alias; // alias to the base path wxString m_Alias; // alias to the base path
wxString m_pathvar; // base path as stored in the config file wxString m_Pathvar; // base path as stored in the config file
wxString m_pathexp; // expanded base path wxString m_Pathexp; // expanded base path
wxString m_description; // description of the aliased path wxString m_Description; // description of the aliased path
}; };
class FILENAME_RESOLVER class FILENAME_RESOLVER
{ {
private: private:
wxString m_ConfigDir; // 3D configuration directory wxString m_configDir; // 3D configuration directory
std::list<SEARCH_PATH> m_Paths; // list of base paths to search from std::list<SEARCH_PATH> m_paths; // list of base paths to search from
int m_errflags; int m_errflags;
PGM_BASE* m_pgm; PGM_BASE* m_pgm;
PROJECT* m_project; PROJECT* m_project;

21
include/footprint_info.h
View File

@ -69,20 +69,11 @@ public:
// These two accessors do not have to call ensure_loaded(), because constructor // These two accessors do not have to call ensure_loaded(), because constructor
// fills in these fields: // fills in these fields:
const wxString& GetFootprintName() const const wxString& GetFootprintName() const { return m_fpname; }
{
return m_fpname;
}
wxString GetLibNickname() const override wxString GetLibNickname() const override { return m_nickname; }
{
return m_nickname;
}
wxString GetName() const override wxString GetName() const override { return m_fpname; }
{
return m_fpname;
}
LIB_ID GetLibId() const override LIB_ID GetLibId() const override
{ {
@ -282,18 +273,18 @@ protected:
* Launch worker threads to load footprints. Part of the * Launch worker threads to load footprints. Part of the
* FOOTPRINT_ASYNC_LOADER implementation. * FOOTPRINT_ASYNC_LOADER implementation.
*/ */
virtual void StartWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname, virtual void startWorkers( FP_LIB_TABLE* aTable, wxString const* aNickname,
FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads ) = 0; FOOTPRINT_ASYNC_LOADER* aLoader, unsigned aNThreads ) = 0;
/** /**
* Join worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation. * Join worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation.
*/ */
virtual bool JoinWorkers() = 0; virtual bool joinWorkers() = 0;
/** /**
* Stop worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation. * Stop worker threads. Part of the FOOTPRINT_ASYNC_LOADER implementation.
*/ */
virtual void StopWorkers() = 0; virtual void stopWorkers() = 0;
}; };

2
include/tool/coroutine.h
View File

@ -160,7 +160,7 @@ public:
,valgrind_stack( 0 ) ,valgrind_stack( 0 )
#endif #endif
{ {
m_stacksize = ADVANCED_CFG::GetCfg().m_coroutineStackSize; m_stacksize = ADVANCED_CFG::GetCfg().m_CoroutineStackSize;
} }
~COROUTINE() ~COROUTINE()

2
kicad/kicad_manager_frame.cpp
View File

@ -100,7 +100,7 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
{ {
m_active_project = false; m_active_project = false;
m_leftWinWidth = 250; // Default value m_leftWinWidth = 250; // Default value
m_AboutTitle = "KiCad"; m_aboutTitle = "KiCad";
// Create the status line (bottom of the frame) // Create the status line (bottom of the frame)
static const int dims[3] = { -1, -1, 100 }; static const int dims[3] = { -1, -1, 100 };

2
pagelayout_editor/dialogs/design_inspector.cpp
View File

@ -189,7 +189,7 @@ DIALOG_INSPECTOR::DIALOG_INSPECTOR( PL_EDITOR_FRAME* aParent ) :
ReCreateDesignList(); ReCreateDesignList();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

8
pagelayout_editor/pl_editor_frame.cpp
View File

@ -93,7 +93,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_showBorderAndTitleBlock = true; // true for reference drawings. m_showBorderAndTitleBlock = true; // true for reference drawings.
WS_DATA_MODEL::GetTheInstance().m_EditMode = true; WS_DATA_MODEL::GetTheInstance().m_EditMode = true;
SetShowPageLimits( true ); SetShowPageLimits( true );
m_AboutTitle = "PlEditor"; m_aboutTitle = "Page Layout Editor";
// Give an icon // Give an icon
wxIcon icon; wxIcon icon;
@ -101,7 +101,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
SetIcon( icon ); SetIcon( icon );
// Create GAL canvas // Create GAL canvas
auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_FrameSize, auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,
GetGalDisplayOptions(), EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE ); GetGalDisplayOptions(), EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE );
SetCanvas( drawPanel ); SetCanvas( drawPanel );
@ -180,11 +180,11 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_auimgr.GetPane( "InfoBar" ).Hide(); m_auimgr.GetPane( "InfoBar" ).Hide();
m_auimgr.Update(); m_auimgr.Update();
ResolveCanvasType(); resolveCanvasType();
SwitchCanvas( m_canvasType ); SwitchCanvas( m_canvasType );
// Add the exit key handler // Add the exit key handler
InitExitKey(); initExitKey();
setupUnits( config() ); setupUnits( config() );
wxPoint originCoord = ReturnCoordOriginCorner(); wxPoint originCoord = ReturnCoordOriginCorner();

2
pcb_calculator/dialogs/dialog_regulator_form.h
View File

@ -47,7 +47,7 @@ public:
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }
~DIALOG_REGULATOR_FORM(){}; ~DIALOG_REGULATOR_FORM(){};

4
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -93,9 +93,9 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
// Set previous size and position // Set previous size and position
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y );
if( m_FramePos == wxDefaultPosition ) if( m_framePos == wxDefaultPosition )
Centre(); Centre();
} }

2
pcbnew/board_item.cpp
View File

@ -69,7 +69,7 @@ wxString BOARD_ITEM::GetLayerName() const
} }
wxString BOARD_ITEM::LayerMaskDescribe() const wxString BOARD_ITEM::layerMaskDescribe() const
{ {
BOARD* board = GetBoard(); BOARD* board = GetBoard();
LSET layers = GetLayerSet(); LSET layers = GetLayerSet();

2
pcbnew/dialogs/dialog_board_reannotate.cpp
View File

@ -175,7 +175,7 @@ DIALOG_BOARD_REANNOTATE::DIALOG_BOARD_REANNOTATE( PCB_EDIT_FRAME* aParentFrame )
m_MessageWindow->SetPrintInfo( false ); // Suppress the "Info: " prefix m_MessageWindow->SetPrintInfo( false ); // Suppress the "Info: " prefix
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_board_setup.cpp
View File

@ -97,7 +97,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
if( Prj().IsReadOnly() ) if( Prj().IsReadOnly() )
m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) ); m_infoBar->ShowMessage( _( "Project is missing or read-only. Changes will not be saved." ) );
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_board_statistics.cpp
View File

@ -172,7 +172,7 @@ bool DIALOG_BOARD_STATISTICS::TransferDataToWindow()
updateWidets(); updateWidets();
Layout(); Layout();
drillsPanel->Layout(); drillsPanel->Layout();
FinishDialogSettings(); finishDialogSettings();
return true; return true;
} }

8
pcbnew/dialogs/dialog_choose_footprint.cpp
View File

@ -118,20 +118,20 @@ DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,
// We specify the width of the right window (m_symbol_view_panel), because specify // We specify the width of the right window (m_symbol_view_panel), because specify
// the width of the left window does not work as expected when SetSashGravity() is called // the width of the left window does not work as expected when SetSashGravity() is called
if( cfg->m_FootprintChooser.sash_h < 0 ) if( cfg->m_FootprintChooser.sash_h < 0 )
cfg->m_FootprintChooser.sash_h = HorizPixelsFromDU( 220 ); cfg->m_FootprintChooser.sash_h = horizPixelsFromDU( 220 );
m_hsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_h ); m_hsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_h );
if( cfg->m_FootprintChooser.sash_v < 0 ) if( cfg->m_FootprintChooser.sash_v < 0 )
cfg->m_FootprintChooser.sash_v = HorizPixelsFromDU( 230 ); cfg->m_FootprintChooser.sash_v = horizPixelsFromDU( 230 );
if( m_vsplitter ) if( m_vsplitter )
m_vsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_v ); m_vsplitter->SetSashPosition( cfg->m_FootprintChooser.sash_v );
int w = cfg->m_FootprintChooser.width < 0 ? int w = cfg->m_FootprintChooser.width < 0 ?
HorizPixelsFromDU( 440 ) : cfg->m_FootprintChooser.width; horizPixelsFromDU( 440 ) : cfg->m_FootprintChooser.width;
int h = cfg->m_FootprintChooser.height < 0 ? int h = cfg->m_FootprintChooser.height < 0 ?
HorizPixelsFromDU( 340 ) : cfg->m_FootprintChooser.height; horizPixelsFromDU( 340 ) : cfg->m_FootprintChooser.height;
SetSize( wxSize( w, h ) ); SetSize( wxSize( w, h ) );
SetInitialFocus( m_tree ); SetInitialFocus( m_tree );

2
pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
View File

@ -57,7 +57,7 @@ DIALOG_CLEANUP_TRACKS_AND_VIAS::DIALOG_CLEANUP_TRACKS_AND_VIAS( PCB_EDIT_FRAME*
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
m_sdbSizer->SetSizeHints( this ); m_sdbSizer->SetSizeHints( this );
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_constraints_reporter.cpp
View File

@ -35,7 +35,7 @@ DIALOG_CONSTRAINTS_REPORTER::DIALOG_CONSTRAINTS_REPORTER( PCB_EDIT_FRAME* aParen
void DIALOG_CONSTRAINTS_REPORTER::FinishInitialization() void DIALOG_CONSTRAINTS_REPORTER::FinishInitialization()
{ {
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_copper_zones.cpp
View File

@ -144,7 +144,7 @@ DIALOG_COPPER_ZONE::DIALOG_COPPER_ZONE( PCB_BASE_FRAME* aParent, ZONE_SETTINGS*
m_islandThresholdUnits->Enable( val ); m_islandThresholdUnits->Enable( val );
} ); } );
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_dimension_properties.cpp
View File

@ -164,7 +164,7 @@ DIALOG_DIMENSION_PROPERTIES::DIALOG_DIMENSION_PROPERTIES( PCB_BASE_EDIT_FRAME* a
m_cbTextOrientation->Enable( !m_cbKeepAligned->GetValue() ); m_cbTextOrientation->Enable( !m_cbKeepAligned->GetValue() );
} ); } );
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_drc.cpp
View File

@ -88,7 +88,7 @@ DIALOG_DRC::DIALOG_DRC( PCB_EDIT_FRAME* aEditorFrame, wxWindow* aParent ) :
initValues(); initValues();
syncCheckboxes(); syncCheckboxes();
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
View File

@ -160,7 +160,7 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP
// wxFormBuilder doesn't include this event... // wxFormBuilder doesn't include this event...
m_itemsGrid->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_FOOTPRINT_FP_EDITOR::OnGridCellChanging ), NULL, this ); m_itemsGrid->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_FOOTPRINT_FP_EDITOR::OnGridCellChanging ), NULL, this );
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_enum_pads.cpp
View File

@ -29,7 +29,7 @@ DIALOG_ENUM_PADS::DIALOG_ENUM_PADS( wxWindow* aParent ) :
{ {
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_exchange_footprints.cpp
View File

@ -155,7 +155,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_export_idf.cpp
View File

@ -84,7 +84,7 @@ public:
m_sdbSizerOK->SetDefault(); m_sdbSizerOK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }
~DIALOG_EXPORT_IDF3() ~DIALOG_EXPORT_IDF3()

2
pcbnew/dialogs/dialog_export_step.cpp
View File

@ -176,7 +176,7 @@ DIALOG_EXPORT_STEP::DIALOG_EXPORT_STEP( PCB_EDIT_FRAME* aParent, const wxString&
m_STEP_Yorg->SetValue( tmpStr ); m_STEP_Yorg->SetValue( tmpStr );
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_export_svg.cpp
View File

@ -91,7 +91,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
m_sdbSizer1Cancel->SetLabel( _( "Close" ) ); m_sdbSizer1Cancel->SetLabel( _( "Close" ) );
m_sdbSizer1->Layout(); m_sdbSizer1->Layout();
FinishDialogSettings(); finishDialogSettings();
} }

2
pcbnew/dialogs/dialog_export_vrml.cpp
View File

@ -84,7 +84,7 @@ public:
m_sdbSizer1OK->SetDefault(); m_sdbSizer1OK->SetDefault();
// Now all widgets have the size fixed, call FinishDialogSettings // Now all widgets have the size fixed, call FinishDialogSettings
FinishDialogSettings(); finishDialogSettings();
Connect( ID_USE_ABS_PATH, wxEVT_UPDATE_UI, Connect( ID_USE_ABS_PATH, wxEVT_UPDATE_UI,
wxUpdateUIEventHandler( DIALOG_EXPORT_3DFILE::OnUpdateUseRelativePath ) ); wxUpdateUIEventHandler( DIALOG_EXPORT_3DFILE::OnUpdateUseRelativePath ) );

2
pcbnew/dialogs/dialog_footprint_properties.cpp
View File

@ -172,7 +172,7 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
m_buttonBrowse->SetBitmap( KiBitmap( folder_xpm ) ); m_buttonBrowse->SetBitmap( KiBitmap( folder_xpm ) );
m_buttonRemove->SetBitmap( KiBitmap( trash_xpm ) ); m_buttonRemove->SetBitmap( KiBitmap( trash_xpm ) );
FinishDialogSettings(); finishDialogSettings();
} }

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