From 1628b65d7979fc641589e307b15d3bf255ed913a Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Thu, 24 Aug 2023 12:38:20 -0400 Subject: [PATCH] Grid Settings: keep sane via value when hidden in schematic editors --- common/dialogs/dialog_grid_settings.cpp | 1 + common/settings/app_settings.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/common/dialogs/dialog_grid_settings.cpp b/common/dialogs/dialog_grid_settings.cpp index c5df98dd28..6e282da00f 100644 --- a/common/dialogs/dialog_grid_settings.cpp +++ b/common/dialogs/dialog_grid_settings.cpp @@ -67,6 +67,7 @@ DIALOG_GRID_SETTINGS::DIALOG_GRID_SETTINGS( EDA_DRAW_FRAME* aParent ) : sbGridOriginSizer->ShowItems( false ); // No vias in the schematics + m_GridOverrideViasSize->SetValue( wxT( "50 mil" ) ); m_checkGridOverrideVias->Hide(); m_staticTextVias->Hide(); m_GridOverrideViasSize->Hide(); diff --git a/common/settings/app_settings.cpp b/common/settings/app_settings.cpp index cb34fc3367..9b5950de43 100644 --- a/common/settings/app_settings.cpp +++ b/common/settings/app_settings.cpp @@ -355,6 +355,8 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: &aWindow->grid.override_connectables, true ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_wires", &aWindow->grid.override_wires, true ) ); + m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_vias", + &aWindow->grid.override_vias, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_text", &aWindow->grid.override_text, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_graphics", @@ -366,6 +368,9 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_wires_size", &aWindow->grid.override_wires_size, "50 mil" ) ); + m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_vias_size", + &aWindow->grid.override_vias_size, + "50 mil" ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_text_size", &aWindow->grid.override_text_size, "10 mil" ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_graphics_size", @@ -380,6 +385,8 @@ void APP_SETTINGS_BASE::addParamsForWindow( WINDOW_SETTINGS* aWindow, const std: &aWindow->grid.override_connectables, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_wires", &aWindow->grid.override_wires, false ) ); + m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_vias", + &aWindow->grid.override_wires, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_text", &aWindow->grid.override_text, false ) ); m_params.emplace_back( new PARAM( aJsonPath + ".grid.override_graphics",