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

DRAGGER needs to report it's nets. 

Otherwise things like snapping don't work.

Fixes https://gitlab.com/kicad/code/kicad/issues/4147
This commit is contained in:
Jeff Young 2020-11-01 19:56:54 +00:00
parent a95e2184da
commit f6c92ab1ea
4 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/router/pns_component_dragger.h
View File

@ -79,6 +79,11 @@ public:
*/
NODE* CurrentNode() const override;
const std::vector<int> CurrentNets() const override
{
return std::vector<int>();
}
/**
* Function Traces()
*

6
pcbnew/router/pns_drag_algo.h
View File

@ -43,7 +43,8 @@ class DRAG_ALGO : public ALGO_BASE
{
public:
DRAG_ALGO( ROUTER* aRouter ) :
ALGO_BASE( aRouter ), m_world( nullptr )
ALGO_BASE( aRouter ),
m_world( nullptr )
{
}
@ -61,7 +62,6 @@ public:
m_world = aWorld;
}
/**
* Function Start()
*
@ -95,6 +95,8 @@ public:
*/
virtual NODE* CurrentNode() const = 0;
virtual const std::vector<int> CurrentNets() const = 0;
/**
* Function Traces()
*

8
pcbnew/router/pns_dragger.h
View File

@ -83,6 +83,11 @@ public:
*/
NODE* CurrentNode() const override;
const std::vector<int> CurrentNets() const override
{
return std::vector<int>( 1, m_draggedLine.Net() );
}
/**
* Function Traces()
*
@ -113,13 +118,10 @@ private:
NODE* m_lastNode;
int m_mode;
LINE m_draggedLine;
//VIA* m_draggedVia;
//LINE m_lastValidDraggedLine;
std::unique_ptr<SHOVE> m_shove;
int m_draggedSegmentIndex;
bool m_dragStatus;
PNS_MODE m_currentMode;
ITEM_SET m_origViaConnections;
///< Contains the list of items that are currently modified by the dragger
ITEM_SET m_draggedItems;

2
pcbnew/router/pns_router.cpp
View File

@ -507,6 +507,8 @@ const std::vector<int> ROUTER::GetCurrentNets() const
{
if( m_placer )
return m_placer->CurrentNets();
else if( m_dragger )
return m_dragger->CurrentNets();
return std::vector<int>();
}