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

Formatting.

This commit is contained in:
Jeff Young 2024-05-22 22:36:00 +01:00
parent f88f6a053b
commit 3944d8abc9
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/pcb_edit_frame.cpp
View File

@ -220,9 +220,11 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Must be created before the menus are created. // Must be created before the menus are created.
if( ADVANCED_CFG::GetCfg().m_ShowPcbnewExportNetlist ) if( ADVANCED_CFG::GetCfg().m_ShowPcbnewExportNetlist )
{
m_exportNetlistAction = new TOOL_ACTION( "pcbnew.EditorControl.exportNetlist", m_exportNetlistAction = new TOOL_ACTION( "pcbnew.EditorControl.exportNetlist",
AS_GLOBAL, 0, "", _( "Netlist..." ), AS_GLOBAL, 0, "", _( "Netlist..." ),
_( "Export netlist used to update schematics" ) ); _( "Export netlist used to update schematics" ) );
}
// Create GAL canvas // Create GAL canvas
auto canvas = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize, auto canvas = new PCB_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,

19
pcbnew/tools/board_editor_control.cpp
View File

@ -477,6 +477,7 @@ int BOARD_EDITOR_CONTROL::ExportNetlist( const TOOL_EVENT& aEvent )
} }
nlohmann::ordered_map<wxString, wxString> fields; nlohmann::ordered_map<wxString, wxString> fields;
for( PCB_FIELD* field : footprint->Fields() ) for( PCB_FIELD* field : footprint->Fields() )
fields[field->GetCanonicalName()] = field->GetText(); fields[field->GetCanonicalName()] = field->GetText();
@ -1636,12 +1637,12 @@ int BOARD_EDITOR_CONTROL::DrillOrigin( const TOOL_EVENT& aEvent )
Activate(); Activate();
picker->SetClickHandler( picker->SetClickHandler(
[this] ( const VECTOR2D& pt ) -> bool [this] ( const VECTOR2D& pt ) -> bool
{ {
m_frame->SaveCopyInUndoList( m_placeOrigin.get(), UNDO_REDO::DRILLORIGIN ); m_frame->SaveCopyInUndoList( m_placeOrigin.get(), UNDO_REDO::DRILLORIGIN );
DoSetDrillOrigin( getView(), m_frame, m_placeOrigin.get(), pt ); DoSetDrillOrigin( getView(), m_frame, m_placeOrigin.get(), pt );
return false; // drill origin is a one-shot; don't continue with tool return false; // drill origin is a one-shot; don't continue with tool
} ); } );
m_toolMgr->RunAction( ACTIONS::pickerTool, &aEvent ); m_toolMgr->RunAction( ACTIONS::pickerTool, &aEvent );
@ -1670,9 +1671,11 @@ void BOARD_EDITOR_CONTROL::setTransitions()
Go( &BOARD_EDITOR_CONTROL::ImportSpecctraSession, PCB_ACTIONS::importSpecctraSession.MakeEvent() ); Go( &BOARD_EDITOR_CONTROL::ImportSpecctraSession, PCB_ACTIONS::importSpecctraSession.MakeEvent() );
Go( &BOARD_EDITOR_CONTROL::ExportSpecctraDSN, PCB_ACTIONS::exportSpecctraDSN.MakeEvent() ); Go( &BOARD_EDITOR_CONTROL::ExportSpecctraDSN, PCB_ACTIONS::exportSpecctraDSN.MakeEvent() );
if( ADVANCED_CFG::GetCfg().m_ShowPcbnewExportNetlist && m_frame && if( ADVANCED_CFG::GetCfg().m_ShowPcbnewExportNetlist && m_frame
m_frame->GetExportNetlistAction() ) && m_frame->GetExportNetlistAction() )
{
Go( &BOARD_EDITOR_CONTROL::ExportNetlist, m_frame->GetExportNetlistAction()->MakeEvent() ); Go( &BOARD_EDITOR_CONTROL::ExportNetlist, m_frame->GetExportNetlistAction()->MakeEvent() );
}
Go( &BOARD_EDITOR_CONTROL::GenerateDrillFiles, PCB_ACTIONS::generateDrillFiles.MakeEvent() ); Go( &BOARD_EDITOR_CONTROL::GenerateDrillFiles, PCB_ACTIONS::generateDrillFiles.MakeEvent() );
Go( &BOARD_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateGerbers.MakeEvent() ); Go( &BOARD_EDITOR_CONTROL::GenerateFabFiles, PCB_ACTIONS::generateGerbers.MakeEvent() );