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

Eeschema: some fixes in grid list and zoom list from config. 

- slightly modify the zoom list.
- Do not use the values read from config: the user cannot change them,
so any issue in config cannot be easily solved.
Moreover, the grid list cannot be changed.
However the lists are still written in config, just in case.
This commit is contained in:
jean-pierre charras 2020-11-19 11:36:59 +01:00
parent 048715ab91
commit 754e8e912c
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eeschema/eeschema_config.cpp
View File

@ -330,7 +330,9 @@ void SCH_BASE_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
EDA_DRAW_FRAME::LoadSettings( aCfg ); EDA_DRAW_FRAME::LoadSettings( aCfg );
if( aCfg->m_Window.grid.sizes.empty() ) // Currently values read from config file are not used because the user cannot
// change this config
// if( aCfg->m_Window.grid.sizes.empty() ) // Will be probably never enabled
{ {
/* /*
* Do NOT add others values (mainly grid values in mm), because they can break the * Do NOT add others values (mainly grid values in mm), because they can break the
@ -351,30 +353,19 @@ void SCH_BASE_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
"1 mil" }; "1 mil" };
} }
if( aCfg->m_Window.zoom_factors.empty() ) // Currently values read from config file are not used because the user cannot
// change this config
// if( aCfg->m_Window.zoom_factors.empty() )
{ {
aCfg->m_Window.zoom_factors = { 0.1, aCfg->m_Window.zoom_factors = { 0.05, 0.07,
0.15, 0.1, 0.15, 0.2, 0.3, 0.5, 0.7,
0.2, 1.0, 1.5, 2.0, 3.0, 4.5, 6.5,
0.3, 10.0, 15.0, 20.0, 30.0, 45.0, 65.0,
0.5, 100.0 };
0.7,
1.0,
1.5,
2.0,
3.0,
4.5,
6.5,
10.0,
15.0,
20.0,
30.0,
45.0,
65.0,
100.0,
150.0 };
} }
// ensure factors < MAX_ZOOM_FACTOR (useful only when the user will be
// able to change/edit the factor list
for( double& factor : aCfg->m_Window.zoom_factors ) for( double& factor : aCfg->m_Window.zoom_factors )
factor = std::min( factor, MAX_ZOOM_FACTOR ); factor = std::min( factor, MAX_ZOOM_FACTOR );
} }