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

ADDED Edit Text and Graphics Properties for Footprint Editor. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9650
This commit is contained in:
Jeff Young 2021-11-20 22:05:57 +00:00
parent e48d4a653a
commit e363a0eedc
5 changed files with 105 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -25,6 +25,7 @@
#include <string_utils.h> #include <string_utils.h>
#include <board_commit.h> #include <board_commit.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>
#include <footprint_edit_frame.h>
#include <pcb_layer_box_selector.h> #include <pcb_layer_box_selector.h>
#include <pcbnew.h> #include <pcbnew.h>
#include <board.h> #include <board.h>
@ -37,6 +38,7 @@
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tools/global_edit_tool.h> #include <tools/global_edit_tool.h>
#include <tools/footprint_editor_control.h>
#include <dialog_global_edit_text_and_graphics_base.h> #include <dialog_global_edit_text_and_graphics_base.h>
@ -81,9 +83,10 @@ static bool g_filterSelected = false;
class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE
{ {
PCB_EDIT_FRAME* m_parent; PCB_BASE_EDIT_FRAME* m_parent;
BOARD_DESIGN_SETTINGS* m_brdSettings; BOARD_DESIGN_SETTINGS* m_brdSettings;
PCB_SELECTION m_selection; PCB_SELECTION m_selection;
bool m_isBoardEditor;
UNIT_BINDER m_lineWidth; UNIT_BINDER m_lineWidth;
UNIT_BINDER m_textWidth; UNIT_BINDER m_textWidth;
@ -91,7 +94,7 @@ class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_
UNIT_BINDER m_thickness; UNIT_BINDER m_thickness;
public: public:
DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_EDIT_FRAME* parent ); DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_BASE_EDIT_FRAME* parent );
~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS() override; ~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS() override;
protected: protected:
@ -119,7 +122,7 @@ protected:
}; };
DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_EDIT_FRAME* parent ) : DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_BASE_EDIT_FRAME* parent ) :
DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( parent ), DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( parent ),
m_lineWidth( parent, m_lineWidthLabel, m_LineWidthCtrl, m_lineWidthUnits ), m_lineWidth( parent, m_lineWidthLabel, m_LineWidthCtrl, m_lineWidthUnits ),
m_textWidth( parent, m_SizeXlabel, m_SizeXCtrl, m_SizeXunit ), m_textWidth( parent, m_SizeXlabel, m_SizeXCtrl, m_SizeXunit ),
@ -128,6 +131,21 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_
{ {
m_parent = parent; m_parent = parent;
m_brdSettings = &m_parent->GetDesignSettings(); m_brdSettings = &m_parent->GetDesignSettings();
m_isBoardEditor = dynamic_cast<PCB_EDIT_FRAME*>( m_parent ) != nullptr;
if( !m_isBoardEditor )
{
m_otherFields->SetLabel( _( "Other text items" ) );
m_footprintGraphics->SetLabel( _( "Graphic items" ) );
m_boardText->Show( false );
m_boardGraphics->Show( false );
m_referenceFilterOpt->Show( false );
m_referenceFilter->Show( false );
m_footprintFilterOpt->Show( false );
m_footprintFilter->Show( false );
}
m_layerFilter->SetBoardFrame( m_parent ); m_layerFilter->SetBoardFrame( m_parent );
m_layerFilter->SetLayersHotkeys( false ); m_layerFilter->SetLayersHotkeys( false );
@ -153,15 +171,24 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS()
g_modifyValues = m_values->GetValue(); g_modifyValues = m_values->GetValue();
g_modifyOtherFields = m_otherFields->GetValue(); g_modifyOtherFields = m_otherFields->GetValue();
g_modifyFootprintGraphics = m_footprintGraphics->GetValue(); g_modifyFootprintGraphics = m_footprintGraphics->GetValue();
g_modifyBoardText = m_boardText->GetValue();
g_modifyBoardGraphics = m_boardGraphics->GetValue(); if( m_isBoardEditor )
{
g_modifyBoardText = m_boardText->GetValue();
g_modifyBoardGraphics = m_boardGraphics->GetValue();
}
g_filterByLayer = m_layerFilterOpt->GetValue(); g_filterByLayer = m_layerFilterOpt->GetValue();
g_layerFilter = m_layerFilter->GetLayerSelection(); g_layerFilter = m_layerFilter->GetLayerSelection();
g_filterByReference = m_referenceFilterOpt->GetValue();
g_referenceFilter = m_referenceFilter->GetValue(); if( m_isBoardEditor )
g_filterByFootprint = m_footprintFilterOpt->GetValue(); {
g_footprintFilter = m_footprintFilter->GetValue(); g_filterByReference = m_referenceFilterOpt->GetValue();
g_referenceFilter = m_referenceFilter->GetValue();
g_filterByFootprint = m_footprintFilterOpt->GetValue();
g_footprintFilter = m_footprintFilter->GetValue();
}
g_filterSelected = m_selectedItemsFilter->GetValue(); g_filterSelected = m_selectedItemsFilter->GetValue();
} }
@ -175,17 +202,25 @@ bool DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::TransferDataToWindow()
m_values->SetValue( g_modifyValues ); m_values->SetValue( g_modifyValues );
m_otherFields->SetValue( g_modifyOtherFields ); m_otherFields->SetValue( g_modifyOtherFields );
m_footprintGraphics->SetValue( g_modifyFootprintGraphics ); m_footprintGraphics->SetValue( g_modifyFootprintGraphics );
m_boardText->SetValue( g_modifyBoardText );
m_boardGraphics->SetValue( g_modifyBoardGraphics ); if( m_isBoardEditor )
{
m_boardText->SetValue( g_modifyBoardText );
m_boardGraphics->SetValue( g_modifyBoardGraphics );
}
if( m_layerFilter->SetLayerSelection( g_layerFilter ) != wxNOT_FOUND ) if( m_layerFilter->SetLayerSelection( g_layerFilter ) != wxNOT_FOUND )
m_layerFilterOpt->SetValue( g_filterByLayer ); m_layerFilterOpt->SetValue( g_filterByLayer );
// SetValue() generates events, ChangeValue() does not if( m_isBoardEditor )
m_referenceFilter->ChangeValue( g_referenceFilter ); {
m_referenceFilterOpt->SetValue( g_filterByReference ); // SetValue() generates events, ChangeValue() does not
m_footprintFilter->ChangeValue( g_footprintFilter ); m_referenceFilter->ChangeValue( g_referenceFilter );
m_footprintFilterOpt->SetValue( g_filterByFootprint ); m_referenceFilterOpt->SetValue( g_filterByReference );
m_footprintFilter->ChangeValue( g_footprintFilter );
m_footprintFilterOpt->SetValue( g_filterByFootprint );
}
m_selectedItemsFilter->SetValue( g_filterSelected ); m_selectedItemsFilter->SetValue( g_filterSelected );
m_lineWidth.SetValue( INDETERMINATE_ACTION ); m_lineWidth.SetValue( INDETERMINATE_ACTION );
@ -387,26 +422,29 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::visitItem( BOARD_COMMIT& aCommit, BOA
return; return;
} }
if( m_referenceFilterOpt->GetValue() && !m_referenceFilter->GetValue().IsEmpty() ) if( m_isBoardEditor )
{ {
FOOTPRINT* fp = dynamic_cast<FOOTPRINT*>( aItem->GetParent() ); if( m_referenceFilterOpt->GetValue() && !m_referenceFilter->GetValue().IsEmpty() )
if( fp )
{ {
if( !WildCompareString( m_referenceFilter->GetValue(), fp->GetReference(), false ) ) FOOTPRINT* fp = dynamic_cast<FOOTPRINT*>( aItem->GetParent() );
return;
if( fp )
{
if( !WildCompareString( m_referenceFilter->GetValue(), fp->GetReference(), false ) )
return;
}
} }
if( m_footprintFilterOpt->GetValue() && !m_footprintFilter->GetValue().IsEmpty() )
{
FOOTPRINT* fp = dynamic_cast<FOOTPRINT*>( aItem->GetParent() );
if( fp )
{
if( !WildCompareString( m_footprintFilter->GetValue(), fp->GetFPID().Format(), false ) )
return;
}
} }
if( m_footprintFilterOpt->GetValue() && !m_footprintFilter->GetValue().IsEmpty() )
{
FOOTPRINT* fp = dynamic_cast<FOOTPRINT*>( aItem->GetParent() );
if( fp )
{
if( !WildCompareString( m_footprintFilter->GetValue(), fp->GetFPID().Format(), false ) )
return;
}
} }
processItem( aCommit, aItem ); processItem( aCommit, aItem );
@ -456,20 +494,23 @@ bool DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::TransferDataFromWindow()
} }
} }
// Go through the PCB text & graphic items if( m_isBoardEditor )
for( BOARD_ITEM* boardItem : m_parent->GetBoard()->Drawings() )
{ {
KICAD_T itemType = boardItem->Type(); // Go through the PCB text & graphic items
for( BOARD_ITEM* boardItem : m_parent->GetBoard()->Drawings() )
{
KICAD_T itemType = boardItem->Type();
if( itemType == PCB_TEXT_T ) if( itemType == PCB_TEXT_T )
{ {
if( m_boardText->GetValue() ) if( m_boardText->GetValue() )
visitItem( commit, boardItem ); visitItem( commit, boardItem );
} }
else if( itemType == PCB_SHAPE_T || BaseType( itemType ) == PCB_DIMENSION_T ) else if( itemType == PCB_SHAPE_T || BaseType( itemType ) == PCB_DIMENSION_T )
{ {
if( m_boardGraphics->GetValue() ) if( m_boardGraphics->GetValue() )
visitItem( commit, boardItem ); visitItem( commit, boardItem );
}
} }
} }
@ -490,3 +531,13 @@ int GLOBAL_EDIT_TOOL::EditTextAndGraphics( const TOOL_EVENT& aEvent )
} }
int FOOTPRINT_EDITOR_CONTROL::EditTextAndGraphics( const TOOL_EVENT& aEvent )
{
FOOTPRINT_EDIT_FRAME* editFrame = getEditFrame<FOOTPRINT_EDIT_FRAME>();
DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS dlg( editFrame );
dlg.ShowModal();
return 0;
}

12
pcbnew/footprint_edit_frame.cpp
View File

@ -1095,10 +1095,6 @@ void FOOTPRINT_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::zoomTool, CHECK( cond.CurrentTool( ACTIONS::zoomTool ) ) ); mgr->SetConditions( ACTIONS::zoomTool, CHECK( cond.CurrentTool( ACTIONS::zoomTool ) ) );
mgr->SetConditions( ACTIONS::selectionTool, CHECK( cond.CurrentTool( ACTIONS::selectionTool ) ) ); mgr->SetConditions( ACTIONS::selectionTool, CHECK( cond.CurrentTool( ACTIONS::selectionTool ) ) );
mgr->SetConditions( PCB_ACTIONS::checkFootprint, ENABLE( cond.HasItems() ) );
mgr->SetConditions( PCB_ACTIONS::repairFootprint, ENABLE( cond.HasItems() ) );
auto highContrastCond = auto highContrastCond =
[this]( const SELECTION& ) [this]( const SELECTION& )
{ {
@ -1130,10 +1126,14 @@ void FOOTPRINT_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::print, ENABLE( haveFootprintCond ) ); mgr->SetConditions( ACTIONS::print, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::exportFootprint, ENABLE( haveFootprintCond ) ); mgr->SetConditions( PCB_ACTIONS::exportFootprint, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::footprintProperties, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::cleanupGraphics, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::placeImportedGraphics, ENABLE( haveFootprintCond ) ); mgr->SetConditions( PCB_ACTIONS::placeImportedGraphics, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::footprintProperties, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::editTextAndGraphics, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::checkFootprint, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::repairFootprint, ENABLE( haveFootprintCond ) );
mgr->SetConditions( PCB_ACTIONS::cleanupGraphics, ENABLE( haveFootprintCond ) );
// Only enable a tool if the part is edtable // Only enable a tool if the part is edtable
#define CURRENT_EDIT_TOOL( action ) mgr->SetConditions( action, \ #define CURRENT_EDIT_TOOL( action ) mgr->SetConditions( action, \

1
pcbnew/menubar_footprint_editor.cpp
View File

@ -110,6 +110,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
editMenu->Add( ACTIONS::selectAll ); editMenu->Add( ACTIONS::selectAll );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
editMenu->Add( PCB_ACTIONS::editTextAndGraphics );
editMenu->Add( PCB_ACTIONS::defaultPadProperties ); editMenu->Add( PCB_ACTIONS::defaultPadProperties );

1
pcbnew/tools/footprint_editor_control.cpp
View File

@ -616,6 +616,7 @@ void FOOTPRINT_EDITOR_CONTROL::setTransitions()
Go( &FOOTPRINT_EDITOR_CONTROL::ImportFootprint, PCB_ACTIONS::importFootprint.MakeEvent() ); Go( &FOOTPRINT_EDITOR_CONTROL::ImportFootprint, PCB_ACTIONS::importFootprint.MakeEvent() );
Go( &FOOTPRINT_EDITOR_CONTROL::ExportFootprint, PCB_ACTIONS::exportFootprint.MakeEvent() ); Go( &FOOTPRINT_EDITOR_CONTROL::ExportFootprint, PCB_ACTIONS::exportFootprint.MakeEvent() );
Go( &FOOTPRINT_EDITOR_CONTROL::EditTextAndGraphics, PCB_ACTIONS::editTextAndGraphics.MakeEvent() );
Go( &FOOTPRINT_EDITOR_CONTROL::CleanupGraphics, PCB_ACTIONS::cleanupGraphics.MakeEvent() ); Go( &FOOTPRINT_EDITOR_CONTROL::CleanupGraphics, PCB_ACTIONS::cleanupGraphics.MakeEvent() );
Go( &FOOTPRINT_EDITOR_CONTROL::CheckFootprint, PCB_ACTIONS::checkFootprint.MakeEvent() ); Go( &FOOTPRINT_EDITOR_CONTROL::CheckFootprint, PCB_ACTIONS::checkFootprint.MakeEvent() );

3
pcbnew/tools/footprint_editor_control.h
View File

@ -68,11 +68,12 @@ public:
int ToggleLayersManager( const TOOL_EVENT& aEvent ); int ToggleLayersManager( const TOOL_EVENT& aEvent );
int Properties( const TOOL_EVENT& aEvent ); int Properties( const TOOL_EVENT& aEvent );
int CleanupGraphics( const TOOL_EVENT& aEvent ); int EditTextAndGraphics( const TOOL_EVENT& aEvent );
int CheckFootprint( const TOOL_EVENT& aEvent ); int CheckFootprint( const TOOL_EVENT& aEvent );
void DestroyCheckerDialog(); void DestroyCheckerDialog();
int CleanupGraphics( const TOOL_EVENT& aEvent );
int RepairFootprint( const TOOL_EVENT& aEvent ); int RepairFootprint( const TOOL_EVENT& aEvent );
/** /**