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

Don't allow editing design rules without a project 

Also fix a crash initializing DRC engine on an empty board

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5835
This commit is contained in:
Jon Evans 2020-09-30 19:04:31 -04:00
parent 8fad4bb34c
commit 4dda3a1715
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/dialogs/panel_setup_layers.cpp
View File

@ -251,6 +251,9 @@ bool PANEL_SETUP_LAYERS::TransferDataToWindow()
{ {
m_enabledLayers = m_pcb->GetEnabledLayers(); m_enabledLayers = m_pcb->GetEnabledLayers();
// Rescue may be enabled, but should not be shown in this dialog
m_enabledLayers.reset( Rescue );
showCopperChoice( m_pcb->GetCopperLayerCount() ); showCopperChoice( m_pcb->GetCopperLayerCount() );
setCopperLayerCheckBoxes( m_pcb->GetCopperLayerCount() ); setCopperLayerCheckBoxes( m_pcb->GetCopperLayerCount() );

10
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -349,6 +349,13 @@ bool PANEL_SETUP_RULES::TransferDataToWindow()
m_originalText = m_textEditor->GetText(); m_originalText = m_textEditor->GetText();
if( m_frame->Prj().IsNullProject() )
{
m_textEditor->ClearAll();
m_textEditor->AddText( _( "Design rules cannot be added without a project" ) );
m_textEditor->Disable();
}
return true; return true;
} }
@ -358,6 +365,9 @@ bool PANEL_SETUP_RULES::TransferDataFromWindow()
if( m_originalText == m_textEditor->GetText() ) if( m_originalText == m_textEditor->GetText() )
return true; return true;
if( m_frame->Prj().IsNullProject() )
return true;
try try
{ {
std::vector<DRC_RULE*> dummyRules; std::vector<DRC_RULE*> dummyRules;

11
pcbnew/pcb_base_edit_frame.cpp
View File

@ -143,6 +143,12 @@ void PCB_BASE_EDIT_FRAME::SetBoard( BOARD* aBoard )
GetCanvas()->GetGAL()->SetGridOrigin( VECTOR2D( aBoard->GetDesignSettings().m_GridOrigin ) ); GetCanvas()->GetGAL()->SetGridOrigin( VECTOR2D( aBoard->GetDesignSettings().m_GridOrigin ) );
if( new_board )
{
BOARD_DESIGN_SETTINGS& bds = aBoard->GetDesignSettings();
bds.m_DRCEngine = std::make_shared<DRC_ENGINE>( aBoard, &bds );
}
// update the tool manager with the new board and its view. // update the tool manager with the new board and its view.
if( m_toolManager ) if( m_toolManager )
{ {
@ -153,12 +159,7 @@ void PCB_BASE_EDIT_FRAME::SetBoard( BOARD* aBoard )
GetCanvas()->GetViewControls(), config(), this ); GetCanvas()->GetViewControls(), config(), this );
if( new_board ) if( new_board )
{
BOARD_DESIGN_SETTINGS& bds = aBoard->GetDesignSettings();
bds.m_DRCEngine = std::make_shared<DRC_ENGINE>( aBoard, &bds );
m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD ); m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
}
} }
} }