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

Grids: remove more uses of old user grid in UI 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/15515
This commit is contained in:
Mike Williams 2023-08-28 07:27:25 -04:00
parent a4d1b29b91
commit 3edcef0229
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/tool/common_tools.cpp
View File

@ -69,13 +69,6 @@ void COMMON_TOOLS::Reset( RESET_REASON aReason )
m_grids.emplace_back( KiROUND<double, int>( gridSize ), KiROUND<double, int>( gridSize ) );
}
double userGridX = EDA_UNIT_UTILS::UI::DoubleValueFromString( scale, EDA_UNITS::MILLIMETRES,
settings.user_grid_x );
double userGridY = EDA_UNIT_UTILS::UI::DoubleValueFromString( scale, EDA_UNITS::MILLIMETRES,
settings.user_grid_y );
m_grids.emplace_back( KiROUND<double, int>( userGridX ), KiROUND<double, int>( userGridY ) );
OnGridChanged( false );
}

16
pcbnew/dialogs/dialog_board_reannotate.cpp
View File

@ -403,19 +403,9 @@ void DIALOG_BOARD_REANNOTATE::GetParameters()
// Get the chosen sort grid for rounding
m_gridIndex = m_GridChoice->GetSelection();
if( m_gridIndex >= ( int ) m_settings->m_Window.grid.sizes.size() )
{
m_sortGridx = EDA_UNIT_UTILS::UI::DoubleValueFromString(
pcbIUScale, EDA_UNITS::MILS, m_settings->m_Window.grid.user_grid_x );
m_sortGridy = EDA_UNIT_UTILS::UI::DoubleValueFromString(
pcbIUScale, EDA_UNITS::MILS, m_settings->m_Window.grid.user_grid_y );
}
else
{
m_sortGridx = EDA_UNIT_UTILS::UI::DoubleValueFromString(
pcbIUScale, EDA_UNITS::MILS, m_settings->m_Window.grid.sizes[m_gridIndex] );
m_sortGridy = m_sortGridx;
}
m_sortGridx = EDA_UNIT_UTILS::UI::DoubleValueFromString(
pcbIUScale, EDA_UNITS::MILS, m_settings->m_Window.grid.sizes[m_gridIndex] );
m_sortGridy = m_sortGridx;
m_annotationScope = ANNOTATE_ALL;