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

Prevent grid axes from inadvertently turning on in eeschema 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/4680
This commit is contained in:
Jon Evans 2020-06-19 17:22:25 -04:00
parent 6d2f30005e
commit dd42a19319
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/dialogs/panel_eeschema_color_settings.cpp
View File

@ -194,7 +194,14 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createSwatches()
} ); } );
for( int layer : layers ) for( int layer : layers )
createSwatch( layer, LayerName( layer ) ); {
wxString name = LayerName( layer );
if( layer == LAYER_SCHEMATIC_GRID_AXES )
name += _( " (symbol editor only)" );
createSwatch( layer, name );
}
// Give a minimal width to m_colorsListWindow, in order to always having // Give a minimal width to m_colorsListWindow, in order to always having
// a full row shown // a full row shown

3
eeschema/eeschema_config.cpp
View File

@ -382,6 +382,9 @@ void SCH_EDIT_FRAME::SaveProjectSettings()
void SCH_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg ) void SCH_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
{ {
// For now, axes are forced off in eeschema even if turned on in config
eeconfig()->m_Window.grid.axes_enabled = false;
SCH_BASE_FRAME::LoadSettings( eeconfig() ); SCH_BASE_FRAME::LoadSettings( eeconfig() );
GetRenderSettings()->m_ShowPinsElectricalType = false; GetRenderSettings()->m_ShowPinsElectricalType = false;

1
eeschema/schematic.cpp
View File

@ -55,7 +55,6 @@ void SCHEMATIC::Reset()
} }
void SCHEMATIC::SetRoot( SCH_SHEET* aRootSheet ) void SCHEMATIC::SetRoot( SCH_SHEET* aRootSheet )
{ {
wxCHECK_RET( aRootSheet, "Call to SetRoot with null SCH_SHEET!" ); wxCHECK_RET( aRootSheet, "Call to SetRoot with null SCH_SHEET!" );