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

Handle dimensions in Edit Text and Graphics Properties. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6340
This commit is contained in:
Jeff Young 2020-11-09 20:32:08 +00:00
parent bd63c018c9
commit 67095af043
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -28,6 +28,7 @@
#include <pcb_layer_box_selector.h>
#include <class_board.h>
#include <class_module.h>
#include <class_dimension.h>
#include <fp_shape.h>
#include <pcb_text.h>
#include <widgets/unit_binder.h>
@ -270,8 +271,12 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
aCommit.Modify( aItem );
EDA_TEXT* textItem = dynamic_cast<EDA_TEXT*>( aItem );
PCB_SHAPE* drawItem = dynamic_cast<PCB_SHAPE*>( aItem );
FP_TEXT* fpTextItem = dynamic_cast<FP_TEXT*>( aItem );
PCB_SHAPE* drawItem = dynamic_cast<PCB_SHAPE*>( aItem );
DIMENSION* dimension = dynamic_cast<DIMENSION*>( aItem );
if( dimension )
textItem = &dimension->Text();
if( m_setToSpecifiedValues->GetValue() )
{
@ -296,8 +301,14 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
if( m_keepUpright->Get3StateValue() != wxCHK_UNDETERMINED && fpTextItem )
fpTextItem->SetKeepUpright( m_keepUpright->GetValue() );
if( !m_lineWidth.IsIndeterminate() && drawItem )
drawItem->SetWidth( m_lineWidth.GetValue() );
if( !m_lineWidth.IsIndeterminate() )
{
if( drawItem )
drawItem->SetWidth( m_lineWidth.GetValue() );
if( dimension )
dimension->SetLineThickness( m_lineWidth.GetValue() );
}
}
else
{
@ -315,6 +326,9 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
if( drawItem )
drawItem->SetWidth( m_brdSettings->GetLineThickness( layer ) );
if( dimension )
dimension->SetLineThickness( m_brdSettings->GetLineThickness( layer ) );
}
}
@ -399,12 +413,14 @@ bool DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::TransferDataFromWindow()
// Go through the PCB text & graphic items
for( BOARD_ITEM* boardItem : m_parent->GetBoard()->Drawings() )
{
if( boardItem->Type() == PCB_TEXT_T )
KICAD_T itemType = boardItem->Type();
if( itemType == PCB_TEXT_T )
{
if( m_boardText->GetValue() )
visitItem( commit, boardItem );
}
else if( boardItem->Type() == PCB_SHAPE_T )
else if( itemType == PCB_SHAPE_T || BaseType( itemType ) == PCB_DIMENSION_T )
{
if( m_boardGraphics->GetValue() )
visitItem( commit, boardItem );

24
pcbnew/pcb_edit_frame.cpp
View File

@ -1381,19 +1381,27 @@ void PCB_EDIT_FRAME::DoUpdatePCBFromNetlist( NETLIST& aNetlist, bool aUseTimesta
void PCB_EDIT_FRAME::RunEeschema()
{
wxString msg;
wxFileName schfn( Prj().GetProjectPath(), Prj().GetProjectName(),
KiCadSchematicFileExtension );
wxFileName schematic( Prj().GetProjectPath(), Prj().GetProjectName(), "kicad_sch" );
if( !schfn.FileExists() )
if( !schematic.FileExists() )
{
msg.Printf( _( "Schematic file \"%s\" not found." ), schfn.GetFullPath() );
wxMessageBox( msg, _( "KiCad Error" ), wxOK | wxICON_ERROR, this );
return;
wxFileName legacySchematic( Prj().GetProjectPath(), Prj().GetProjectName(), "sch" );
if( legacySchematic.FileExists() )
{
schematic = legacySchematic;
}
else
{
msg.Printf( _( "Schematic file \"%s\" not found." ), schematic.GetFullPath() );
wxMessageBox( msg, _( "KiCad Error" ), wxOK | wxICON_ERROR, this );
return;
}
}
if( Kiface().IsSingle() )
{
wxString filename = wxT( "\"" ) + schfn.GetFullPath( wxPATH_NATIVE ) + wxT( "\"" );
wxString filename = wxT( "\"" ) + schematic.GetFullPath( wxPATH_NATIVE ) + wxT( "\"" );
ExecuteFile( this, EESCHEMA_EXE, filename );
}
else
@ -1425,7 +1433,7 @@ void PCB_EDIT_FRAME::RunEeschema()
if( !frame->IsShown() ) // the frame exists, (created by the dialog field editor)
// but no project loaded.
{
frame->OpenProjectFiles( std::vector<wxString>( 1, schfn.GetFullPath() ) );
frame->OpenProjectFiles( std::vector<wxString>( 1, schematic.GetFullPath() ) );
frame->Show( true );
}