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

Move meander placer picker tool from item highlighting to net highlighting.

This commit is contained in:
Jeff Young 2023-10-09 21:46:24 +01:00
parent 9ff8d02e60
commit d10b0b053e
6 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pcbnew/generators/pcb_generator_meanders.cpp
View File

@ -449,7 +449,7 @@ public:
}
}
aCommit->Push( "Remove meander", APPEND_UNDO );
aCommit->Push( "Remove Meander", APPEND_UNDO );
}
std::optional<PNS::LINE> getLineBetweenPoints( VECTOR2I origStart, VECTOR2I origEnd,
@ -1047,11 +1047,14 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
{
if( m_pickerItem )
{
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
if( !m_meander )
{
// First click; create a meander generator
// First click; create a meander
generatorTool->HighlightNet( nullptr );
m_toolMgr->GetTool<PCB_SELECTION_TOOL>()->UnbrightenItem( m_pickerItem );
m_frame->SetActiveLayer( m_pickerItem->GetLayer() );
m_meander = new PCB_GENERATOR_MEANDERS( m_board, m_pickerItem->GetLayer() );
@ -1067,8 +1070,7 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
else
{
// Second click; we're done
BOARD_COMMIT commit( m_frame );
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
BOARD_COMMIT commit( m_frame );
m_meander->EditStart( generatorTool, m_board, m_frame, &commit );
m_meander->Update( generatorTool, m_board, m_frame, &commit );
@ -1089,6 +1091,7 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
PCB_SELECTION_TOOL* selTool = m_toolMgr->GetTool<PCB_SELECTION_TOOL>();
GENERAL_COLLECTORS_GUIDE guide = m_frame->GetCollectorsGuide();
GENERAL_COLLECTOR collector;
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
collector.m_Threshold = KiROUND( getView()->ToWorld( HITTEST_THRESHOLD_PIXELS ) );
collector.Collect( board, { PCB_TRACE_T, PCB_ARC_T }, aPos, guide );
@ -1100,29 +1103,27 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
if( !m_meander )
{
// First click not yet made; we're in brighten-track-under-cursor mode
// First click not yet made; we're in highlight-net-under-cursor mode
if( m_pickerItem != item )
if( !m_pickerItem )
{
if( m_pickerItem )
selTool->UnbrightenItem( m_pickerItem );
m_pickerItem = item;
if( m_pickerItem )
selTool->BrightenItem( m_pickerItem );
m_pickerItem = static_cast<BOARD_CONNECTED_ITEM*>( item );
generatorTool->HighlightNet( m_pickerItem );
}
else
{
m_pickerItem = static_cast<BOARD_CONNECTED_ITEM*>( item );
generatorTool->UpdateHighlightedNet( m_pickerItem );
}
}
else
{
// First click alread made; we're in preview-meander mode
// First click already made; we're in preview-meander mode
m_meander->SetEnd( aPos );
if( m_meander->GetPosition() != m_meander->GetEnd() )
{
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
m_meander->EditStart( generatorTool, m_board, m_frame, nullptr );
m_meander->Update( generatorTool, m_board, m_frame, nullptr );
}
@ -1142,6 +1143,10 @@ int DRAWING_TOOL::PlaceMeander( const TOOL_EVENT& aEvent )
picker->SetFinalizeHandler(
[this]( const int& aFinalState )
{
GENERATOR_TOOL* generatorTool = m_toolMgr->GetTool<GENERATOR_TOOL>();
generatorTool->HighlightNet( nullptr );
// Ensure the cursor gets changed & updated
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ARROW );
m_frame->GetCanvas()->Refresh();

12
pcbnew/router/pns_tool_base.cpp
View File

@ -278,6 +278,18 @@ void TOOL_BASE::highlightNets( bool aEnabled, std::set<NET_HANDLE> aNets )
}
void TOOL_BASE::updateHighlightedNets( std::set<NET_HANDLE> aNets )
{
RENDER_SETTINGS* rs = getView()->GetPainter()->GetSettings();
std::set<int> netcodes;
for( const NET_HANDLE& net : aNets )
netcodes.insert( m_router->GetInterface()->GetNetCode( net ) );
rs->SetHighlight( netcodes, true );
}
bool TOOL_BASE::checkSnap( ITEM *aItem )
{
// Sync PNS engine settings with the general PCB editor options.

1
pcbnew/router/pns_tool_base.h
View File

@ -63,6 +63,7 @@ protected:
const std::vector<ITEM*> aAvoidItems = {} );
virtual void highlightNets( bool aEnabled, std::set<NET_HANDLE> aNetcodes = {} );
virtual void updateHighlightedNets( std::set<NET_HANDLE> aNetcodes = {} );
virtual void updateStartItem( const TOOL_EVENT& aEvent, bool aIgnorePads = false );
virtual void updateEndItem( const TOOL_EVENT& aEvent );

2
pcbnew/tools/drawing_tool.h
View File

@ -352,7 +352,7 @@ private:
STROKE_PARAMS m_stroke; // Current stroke for multi-segment drawing
TEXT_ATTRIBUTES m_textAttrs;
BOARD_ITEM* m_pickerItem;
BOARD_CONNECTED_ITEM* m_pickerItem;
PCB_GENERATOR_MEANDERS* m_meander;

18
pcbnew/tools/generator_tool.cpp
View File

@ -250,6 +250,24 @@ int GENERATOR_TOOL::GenEditAction( const TOOL_EVENT& aEvent )
}
void GENERATOR_TOOL::HighlightNet( BOARD_CONNECTED_ITEM* aStartItem )
{
if( aStartItem && aStartItem->GetNet() )
highlightNets( true, { aStartItem->GetNet() } );
else
highlightNets( false );
}
void GENERATOR_TOOL::UpdateHighlightedNet( BOARD_CONNECTED_ITEM* aStartItem )
{
if( aStartItem && aStartItem->GetNet() )
updateHighlightedNets( { aStartItem->GetNet() } );
else
highlightNets( false );
}
void GENERATOR_TOOL::setTransitions()
{
// Generator actions

3
pcbnew/tools/generator_tool.h
View File

@ -58,6 +58,9 @@ public:
int RegenerateItem( const TOOL_EVENT& aEvent );
int GenEditAction( const TOOL_EVENT& aEvent );
void HighlightNet( BOARD_CONNECTED_ITEM* aStartItem );
void UpdateHighlightedNet( BOARD_CONNECTED_ITEM* aStartItem );
private:
///< Set up handlers for various events.
void setTransitions() override;