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

Pcbnew: fix Bug #1272926 (Texts are now not accepted on edge cuts layer)

This commit is contained in:
jean-pierre charras 2014-01-26 18:30:20 +01:00
parent 3354bdde05
commit fe97521bda
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/dialogs/dialog_pcb_text_properties.cpp
View File

@ -172,6 +172,15 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnCancelClick( wxCommandEvent& event )
void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event ) void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event )
{ {
// Test for acceptable layer.
// Incorrect layer can happen for old boards,
// having texts on edge cut layer for instance
if( m_LayerSelectionCtrl->GetLayerSelection() < 0 )
{
wxMessageBox( wxT("No layer selected, Please select the text layer") );
return;
}
wxPoint newPosition; wxPoint newPosition;
wxSize newSize; wxSize newSize;

9
pcbnew/onleftclick.cpp
View File

@ -325,6 +325,13 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
break; break;
case ID_PCB_ADD_TEXT_BUTT: case ID_PCB_ADD_TEXT_BUTT:
if( IsLayerInList( EDGE_LAYER, getActiveLayer() ) )
{
DisplayError( this,
_( "Texts not allowed on Edge Cut layers" ) );
break;
}
if( (DrawStruct == NULL) || (DrawStruct->GetFlags() == 0) ) if( (DrawStruct == NULL) || (DrawStruct->GetFlags() == 0) )
{ {
SetCurItem( CreateTextePcb( aDC ) ); SetCurItem( CreateTextePcb( aDC ) );
@ -367,7 +374,7 @@ void PCB_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition )
break; break;
case ID_PCB_DIMENSION_BUTT: case ID_PCB_DIMENSION_BUTT:
if( IsLayerInList( EDGE_LAYER|ALL_CU_LAYERS ,getActiveLayer() ) ) if( IsLayerInList( EDGE_LAYER|ALL_CU_LAYERS, getActiveLayer() ) )
{ {
DisplayError( this, DisplayError( this,
_( "Dimension not allowed on Copper or Edge Cut layers" ) ); _( "Dimension not allowed on Copper or Edge Cut layers" ) );