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

Use ChangeValue() instead of SetValue() to keep from firing events. 

Otherwise setting a filter also turns off the Show All Nets checkbox.

Also make sure that config values get saved when they're changed.
This commit is contained in:
Jeff Young 2021-07-03 20:26:09 +01:00
parent d3fb22014f
commit 37fac6de35
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/dialogs/dialog_copper_zones.cpp
View File

@ -54,7 +54,7 @@ private:
std::map<wxString, int> m_displayNameToNetCodeMap;
bool m_netSortingByPadCount;
long m_netFiltering;
bool m_netFiltering;
static wxString m_netNameShowFilter; // the filter to show nets (default * "*"). Static
// to keep this pattern for an entire Pcbnew session
int m_cornerSmoothingType;
@ -202,8 +202,8 @@ bool DIALOG_COPPER_ZONE::TransferDataToWindow()
netNameDoNotShowFilter = cfg->m_Zones.net_filter;
m_ShowNetNameFilter->SetValue( m_netNameShowFilter );
m_DoNotShowNetNameFilter->SetValue( netNameDoNotShowFilter );
m_ShowNetNameFilter->ChangeValue( m_netNameShowFilter );
m_DoNotShowNetNameFilter->ChangeValue( netNameDoNotShowFilter );
m_showAllNetsOpt->SetValue( !m_netFiltering );
m_sortByPadsOpt->SetValue( m_netSortingByPadCount );
@ -471,7 +471,7 @@ void DIALOG_COPPER_ZONE::OnNetSortingOptionSelected( wxCommandEvent& event )
buildAvailableListOfNets();
auto cfg = m_Parent->GetPcbNewSettings();
PCBNEW_SETTINGS* cfg = m_Parent->GetPcbNewSettings();
int configValue = m_netFiltering ? 2 : 0;
@ -511,6 +511,16 @@ void DIALOG_COPPER_ZONE::OnRunFiltersButtonClick( wxCommandEvent& event )
m_showAllNetsOpt->SetValue( false );
buildAvailableListOfNets();
PCBNEW_SETTINGS* cfg = m_Parent->GetPcbNewSettings();
int configValue = m_netFiltering ? 2 : 0;
if( m_netSortingByPadCount )
configValue += 1;
cfg->m_Zones.net_sort_mode = configValue;
cfg->m_Zones.net_filter = m_DoNotShowNetNameFilter->GetValue().ToStdString();
}