From 57f8a248a5007d6ab948f305fd2845013547a4cb Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sat, 17 Sep 2022 18:02:42 -0400 Subject: [PATCH] Remove unused settings --- pcbnew/dialogs/dialog_copper_zones.cpp | 8 -------- .../dialog_non_copper_zones_properties.cpp | 3 --- pcbnew/dialogs/dialog_rule_area_properties.cpp | 3 --- pcbnew/pcbnew_settings.cpp | 15 --------------- pcbnew/pcbnew_settings.h | 5 ----- 5 files changed, 34 deletions(-) diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp index 1531a4fd9b..1f4aff0168 100644 --- a/pcbnew/dialogs/dialog_copper_zones.cpp +++ b/pcbnew/dialogs/dialog_copper_zones.cpp @@ -550,10 +550,6 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aUseExportableSetupOnly ) m_settings.m_BorderHatchPitch = m_outlineHatchPitch.GetValue(); - PCBNEW_SETTINGS* cfg = m_Parent->GetPcbNewSettings(); - - cfg->m_Zones.hatching_style = static_cast( m_settings.m_ZoneBorderDisplayStyle ); - m_settings.m_ZoneClearance = m_clearance.GetValue(); m_settings.m_ZoneMinThickness = m_minWidth.GetValue(); @@ -576,10 +572,6 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aUseExportableSetupOnly ) } storePersistentNetSortConfigurations(); - cfg->m_Zones.clearance = pcbIUScale.IUToMils( m_settings.m_ZoneClearance ); - cfg->m_Zones.min_thickness = pcbIUScale.IUToMils( m_settings.m_ZoneMinThickness ); - cfg->m_Zones.thermal_relief_gap = pcbIUScale.IUToMils( m_settings.m_ThermalReliefGap ); - cfg->m_Zones.thermal_relief_copper_width = pcbIUScale.IUToMils( m_settings.m_ThermalReliefSpokeWidth ); m_settings.SetIslandRemovalMode( (ISLAND_REMOVAL_MODE) m_cbRemoveIslands->GetSelection() ); m_settings.SetMinIslandArea( m_islandThreshold.GetValue() ); diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp index 50f7d94ebd..c06bbe01af 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp @@ -292,9 +292,6 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataFromWindow() m_settings.m_HatchSmoothingLevel = m_spinCtrlSmoothLevel->GetValue(); m_settings.m_HatchSmoothingValue = m_spinCtrlSmoothValue->GetValue(); - auto cfg = m_parent->GetPcbNewSettings(); - cfg->m_Zones.hatching_style = static_cast( m_settings.m_ZoneBorderDisplayStyle ); - m_settings.m_Locked = m_cbLocked->GetValue(); // Get the layer selection for this zone diff --git a/pcbnew/dialogs/dialog_rule_area_properties.cpp b/pcbnew/dialogs/dialog_rule_area_properties.cpp index 791e18ae8a..3d08bcd2ac 100644 --- a/pcbnew/dialogs/dialog_rule_area_properties.cpp +++ b/pcbnew/dialogs/dialog_rule_area_properties.cpp @@ -227,9 +227,6 @@ bool DIALOG_RULE_AREA_PROPERTIES::TransferDataFromWindow() m_zonesettings.m_BorderHatchPitch = m_outlineHatchPitch.GetValue(); - auto cfg = m_parent->GetPcbNewSettings(); - cfg->m_Zones.hatching_style = static_cast( m_zonesettings.m_ZoneBorderDisplayStyle ); - m_zonesettings.m_Locked = m_cbLocked->GetValue(); m_zonesettings.m_ZonePriority = 0; // for a keepout, this param is not used. diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp index 680c71d63d..168dcb0e3d 100644 --- a/pcbnew/pcbnew_settings.cpp +++ b/pcbnew/pcbnew_settings.cpp @@ -358,24 +358,9 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS() m_params.emplace_back( new PARAM( "export_vrml.origin_mode", &m_ExportVrml.origin_mode, 0 ) ); - m_params.emplace_back( new PARAM( "zones.hatching_style", - &m_Zones.hatching_style, 0 ) ); - m_params.emplace_back( new PARAM( "zones.net_sort_mode", &m_Zones.net_sort_mode, -1 ) ); - m_params.emplace_back( new PARAM( "zones.clearance", - &m_Zones.clearance, ZONE_CLEARANCE_MIL ) ); - - m_params.emplace_back( new PARAM( "zones.min_thickness", - &m_Zones.min_thickness, ZONE_THICKNESS_MIL ) ); - - m_params.emplace_back( new PARAM( "zones.thermal_relief_gap", - &m_Zones.thermal_relief_gap, ZONE_THERMAL_RELIEF_GAP_MIL ) ); - - m_params.emplace_back( new PARAM( "zones.thermal_relief_copper_width", - &m_Zones.thermal_relief_copper_width, ZONE_THERMAL_RELIEF_COPPER_WIDTH_MIL ) ); - m_params.emplace_back( new PARAM( "import_graphics.layer", &m_ImportGraphics.layer, Dwgs_User ) ); diff --git a/pcbnew/pcbnew_settings.h b/pcbnew/pcbnew_settings.h index 18a7583ee3..95765f5260 100644 --- a/pcbnew/pcbnew_settings.h +++ b/pcbnew/pcbnew_settings.h @@ -279,12 +279,7 @@ public: struct ZONES { - int hatching_style; int net_sort_mode; - double clearance; - double min_thickness; - double thermal_relief_gap; - double thermal_relief_copper_width; }; struct DISPLAY_OPTIONS