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

Don't allow component & sheet field IDs to collide. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4748
This commit is contained in:
Jeff Young 2020-06-30 19:15:29 +01:00
parent 25c5c35176
commit 61b5a12362
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eeschema/dialogs/dialog_edit_one_field.cpp
View File

@ -83,15 +83,6 @@ void DIALOG_EDIT_ONE_FIELD::init()
SCH_BASE_FRAME* parent = GetParent(); SCH_BASE_FRAME* parent = GetParent();
bool libedit = parent->IsType( FRAME_SCH_LIB_EDITOR ); bool libedit = parent->IsType( FRAME_SCH_LIB_EDITOR );
switch( m_fieldId )
{
case REFERENCE: m_textLabel->SetLabel( _( "Reference designator:" ) ); break;
case VALUE: m_textLabel->SetLabel( _( "Value:" ) ); break;
case FOOTPRINT: m_textLabel->SetLabel( _( "Footprint ID:" ) ); break;
case DATASHEET: m_textLabel->SetLabel( _( "Datasheet URL:" ) ); break;
default: break;
}
m_TextCtrl->SetValidator( SCH_FIELD_VALIDATOR( libedit, m_fieldId, &m_text ) ); m_TextCtrl->SetValidator( SCH_FIELD_VALIDATOR( libedit, m_fieldId, &m_text ) );
// Disable options for graphic text editing which are not needed for fields. // Disable options for graphic text editing which are not needed for fields.
@ -282,9 +273,24 @@ DIALOG_SCH_EDIT_ONE_FIELD::DIALOG_SCH_EDIT_ONE_FIELD( SCH_BASE_FRAME* aParent,
DIALOG_EDIT_ONE_FIELD( aParent, aTitle, aField ), DIALOG_EDIT_ONE_FIELD( aParent, aTitle, aField ),
m_field( aField ) m_field( aField )
{ {
m_fieldId = aField->GetId(); if( aField->GetParent() && aField->GetParent()->Type() == SCH_COMPONENT_T )
{
m_fieldId = aField->GetId();
}
else if( aField->GetParent() && aField->GetParent()->Type() == SCH_SHEET_T )
{
switch( aField->GetId() )
{
case SHEETNAME: m_fieldId = SHEETNAME_V; break;
case SHEETFILENAME: m_fieldId = SHEETFILENAME_V; break;
default: m_fieldId = SHEETUSERFIELD_V; break;
}
}
m_isPower = false; m_isPower = false;
m_textLabel->SetLabel( m_field->GetName() + ":" );
// The library symbol may have been removed so using SCH_COMPONENT::GetPartRef() here // The library symbol may have been removed so using SCH_COMPONENT::GetPartRef() here
// could result in a segfault. If the library symbol is no longer available, the // could result in a segfault. If the library symbol is no longer available, the
// schematic fields can still edit so set the power symbol flag to false. This may not // schematic fields can still edit so set the power symbol flag to false. This may not

5
eeschema/sch_validators.h
View File

@ -36,8 +36,9 @@
#define FIELD_NAME -1 #define FIELD_NAME -1
#define FIELD_VALUE -2 #define FIELD_VALUE -2
#define SHEETNAME_V 100 // We can't use SHEETNAME and SHEETFILENAME because they #define SHEETNAME_V 100 // We can't use SHEETNAME and SHEETFILENAME because they
#define SHEETFILENAME_V 101 // overlap with REFERENCE and VALUE #define SHEETFILENAME_V 101 // overlap with REFERENCE and VALUE
#define SHEETUSERFIELD_V 102
/** /**
* A text control validator used for validating the text allowed in library and * A text control validator used for validating the text allowed in library and