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

Resolve variables in Sheet Properties dialog's sheet path. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6409
This commit is contained in:
Jeff Young 2020-11-18 17:54:41 +00:00
parent 55d0b79746
commit f005335743
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -44,7 +44,9 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
DIALOG_SHEET_PROPERTIES_BASE( aParent ),
m_frame( aParent ),
m_clearAnnotationNewItems( aClearAnnotationNewItems ),
m_borderWidth( aParent, m_borderWidthLabel, m_borderWidthCtrl, m_borderWidthUnits, true )
m_borderWidth( aParent, m_borderWidthLabel, m_borderWidthCtrl, m_borderWidthUnits, true ),
m_dummySheet( *aSheet ),
m_dummySheetNameField( wxDefaultPosition, SHEETNAME, &m_dummySheet )
{
m_sheet = aSheet;
m_fields = new FIELDS_GRID_TABLE<SCH_FIELD>( this, aParent, m_sheet );
@ -776,11 +778,16 @@ void DIALOG_SHEET_PROPERTIES::OnUpdateUI( wxUpdateUIEvent& event )
wxGridCellEditor* editor = m_grid->GetCellEditor( SHEETNAME, FDC_VALUE );
wxControl* control = editor->GetControl();
wxTextEntry* textControl = dynamic_cast<wxTextEntry*>( control );
wxString sheetName;
if( textControl )
hierarchicalPath += textControl->GetValue();
sheetName = textControl->GetValue();
else
hierarchicalPath += m_grid->GetCellValue( SHEETNAME, FDC_VALUE );
sheetName = m_grid->GetCellValue( SHEETNAME, FDC_VALUE );
m_dummySheet.SetFields( *m_fields );
m_dummySheetNameField.SetText( sheetName );
hierarchicalPath += m_dummySheetNameField.GetShownText();
editor->DecRef();

5
eeschema/dialogs/dialog_sheet_properties.h
View File

@ -28,7 +28,7 @@
#include <fields_grid_table.h>
#include <widgets/unit_binder.h>
#include <dialog_sheet_properties_base.h>
#include <sch_sheet.h>
class SCH_SHEET;
class SCH_EDIT_FRAME;
@ -55,6 +55,9 @@ private:
FIELDS_GRID_TABLE<SCH_FIELD>* m_fields;
UNIT_BINDER m_borderWidth;
SCH_SHEET m_dummySheet;
SCH_FIELD m_dummySheetNameField;
bool onSheetFilenameChanged( const wxString& aNewFilename );
bool TransferDataToWindow() override;