Modedit: fix Bug #1471020 (user grid not stored)

This commit is contained in:
jean-pierre charras 2015-07-03 10:15:37 +02:00
parent 705c4ef4c5
commit 3907de0289
3 changed files with 13 additions and 10 deletions

View File

@ -9,11 +9,12 @@ use *only* wxWidgets
>= 3.0.2 on OSX (which need patches: see patches/wxwidgets-3.0.0_macosx_xxx) >= 3.0.2 on OSX (which need patches: see patches/wxwidgets-3.0.0_macosx_xxx)
Known bug on Windows: Known bug on Windows:
Postscript printers print tracks like tin line. Postscript printers print tracks like thin line.
It happens only for PS drivers, and PDF printer. It happens only for PS drivers, and PDF printer.
Other drivers (PCL for instance) work fine, Other drivers (PCL for instance) work fine,
so it is unlikely a bug inside Kicad/wxWidgets so it is unlikely a bug inside Kicad/wxWidgets
on 3.0.2 Window version 64 bits: On 3.0.2 Window version 64 bits:
the mirror mode gives a blanc sheet. The mirror mode gives a blank sheet.
This is a bug in wxWidgets 3.0.2
wxWidgets 3.0.2 must be patched (see patches/wxWidgets-3.0.2-msw-dc-orientation-fix.patch) and rebuilt. wxWidgets 3.0.2 must be patched (see patches/wxWidgets-3.0.2-msw-dc-orientation-fix.patch) and rebuilt.

View File

@ -183,6 +183,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Dimensions submenu // Dimensions submenu
wxMenu* dimensions_Submenu = new wxMenu; wxMenu* dimensions_Submenu = new wxMenu;
// User grid size
AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP,
_( "&User Grid Size" ), _( "Adjust user grid" ),
KiBitmap( grid_xpm ) );
// Sizes and Widths // Sizes and Widths
AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
_( "&Size and Width" ), _( "&Size and Width" ),
@ -194,11 +199,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
_( "&Pad Setting" ), _( "Edit settings for new pads" ), _( "&Pad Setting" ), _( "Edit settings for new pads" ),
KiBitmap( pad_dimensions_xpm ) ); KiBitmap( pad_dimensions_xpm ) );
// User grid size
AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP,
_( "&User Grid Size" ), _( "Adjust user grid" ),
KiBitmap( grid_xpm ) );
//--------- View menu ---------------- //--------- View menu ----------------
wxMenu* viewMenu = new wxMenu; wxMenu* viewMenu = new wxMenu;

View File

@ -470,12 +470,14 @@ void FOOTPRINT_EDIT_FRAME::SetPlotSettings( const PCB_PLOT_PARAMS& aSettings )
void FOOTPRINT_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg ) void FOOTPRINT_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
{ {
EDA_DRAW_FRAME::LoadSettings( aCfg ); PCB_BASE_FRAME::LoadSettings( aCfg );
wxConfigLoadSetups( aCfg, GetConfigurationSettings() ); wxConfigLoadSetups( aCfg, GetConfigurationSettings() );
// Ensure some params are valid // Ensure some params are valid
BOARD_DESIGN_SETTINGS& settings = GetDesignSettings(); BOARD_DESIGN_SETTINGS& settings = GetDesignSettings();
// Usually, graphic items are drawn on F_SilkS or F_Fab layer
// Force these layers if not default
if( ( settings.m_RefDefaultlayer != F_SilkS ) && ( settings.m_RefDefaultlayer != F_Fab ) ) if( ( settings.m_RefDefaultlayer != F_SilkS ) && ( settings.m_RefDefaultlayer != F_Fab ) )
settings.m_RefDefaultlayer = F_SilkS; settings.m_RefDefaultlayer = F_SilkS;
@ -486,7 +488,7 @@ void FOOTPRINT_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
void FOOTPRINT_EDIT_FRAME::SaveSettings( wxConfigBase* aCfg ) void FOOTPRINT_EDIT_FRAME::SaveSettings( wxConfigBase* aCfg )
{ {
EDA_DRAW_FRAME::SaveSettings( aCfg ); PCB_BASE_FRAME::SaveSettings( aCfg );
wxConfigSaveSetups( aCfg, GetConfigurationSettings() ); wxConfigSaveSetups( aCfg, GetConfigurationSettings() );
} }