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

Fix issue with severities not get initialised in DRC_TREE_MODELs.

This commit is contained in:
Jeff Young 2020-03-04 18:04:14 +00:00
parent 0894674869
commit d20f36511f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/dialogs/dialog_drc.cpp
View File

@ -147,7 +147,11 @@ void DIALOG_DRC_CONTROL::initValues()
m_cbRefillZones->SetValue( cfg->m_DrcDialog.refill_zones ); m_cbRefillZones->SetValue( cfg->m_DrcDialog.refill_zones );
m_cbReportAllTrackErrors->SetValue( cfg->m_DrcDialog.test_track_to_zone ); m_cbReportAllTrackErrors->SetValue( cfg->m_DrcDialog.test_track_to_zone );
m_cbTestFootprints->SetValue( cfg->m_DrcDialog.test_footprints ); m_cbTestFootprints->SetValue( cfg->m_DrcDialog.test_footprints );
m_severities = cfg->m_DrcDialog.severities; m_severities = cfg->m_DrcDialog.severities;
m_markerTreeModel->SetSeverities( m_severities );
m_unconnectedTreeModel->SetSeverities( m_severities );
m_footprintWarningsTreeModel->SetSeverities( m_severities );
Layout(); // adding the units above expanded Clearance text, now resize. Layout(); // adding the units above expanded Clearance text, now resize.

4
pcbnew/drc/drc_tree_model.cpp
View File

@ -82,6 +82,7 @@ void DRC_TREE_MODEL::rebuildModel( DRC_ITEMS_PROVIDER* aProvider, int aSeveritie
// Even with the updateLock, wxWidgets sometimes ties its knickers in // Even with the updateLock, wxWidgets sometimes ties its knickers in
// a knot when trying to run a wxdataview_selection_changed_callback() // a knot when trying to run a wxdataview_selection_changed_callback()
// on a row that has been deleted. // on a row that has been deleted.
if( m_view )
m_view->UnselectAll(); m_view->UnselectAll();
Cleared(); Cleared();
@ -92,11 +93,10 @@ void DRC_TREE_MODEL::rebuildModel( DRC_ITEMS_PROVIDER* aProvider, int aSeveritie
m_drcItemsProvider = aProvider; m_drcItemsProvider = aProvider;
} }
wxASSERT( m_drcItemsProvider );
if( aSeverities != m_severities ) if( aSeverities != m_severities )
m_severities = aSeverities; m_severities = aSeverities;
if( m_drcItemsProvider )
m_drcItemsProvider->SetSeverities( m_severities ); m_drcItemsProvider->SetSeverities( m_severities );
m_tree.clear(); m_tree.clear();