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

Offset internal items by drag amount. 

Some tools move only preview items while keeping the real items
hidden.  Those tools must use this new offset parameter.

Other tools move the real items.  Those tools can ignore this
parameter (which will default to {0,0}).

Fixes https://gitlab.com/kicad/code/kicad/issues/9391
This commit is contained in:
Jeff Young 2021-11-25 14:35:01 +00:00
parent 52fc41d0cb
commit 5985a21b74
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcbnew/connectivity/connectivity_data.cpp
View File

@ -276,7 +276,8 @@ void CONNECTIVITY_DATA::FindIsolatedCopperIslands( std::vector<CN_ZONE_ISOLATED_
void CONNECTIVITY_DATA::ComputeDynamicRatsnest( const std::vector<BOARD_ITEM*>& aItems,
const CONNECTIVITY_DATA* aDynamicData )
const CONNECTIVITY_DATA* aDynamicData,
VECTOR2I aInternalOffset )
{
if( !aDynamicData )
return;
@ -291,7 +292,7 @@ void CONNECTIVITY_DATA::ComputeDynamicRatsnest( const std::vector<BOARD_ITEM*>&
if( dynNet->GetNodeCount() != 0 )
{
auto ourNet = m_nets[nc];
RN_NET* ourNet = m_nets[nc];
CN_ANCHOR_PTR nodeA, nodeB;
if( ourNet->NearestBicoloredPair( *dynNet, nodeA, nodeB ) )
@ -307,17 +308,17 @@ void CONNECTIVITY_DATA::ComputeDynamicRatsnest( const std::vector<BOARD_ITEM*>&
}
// This gets the ratsnest for internal connections in the moving set
const auto& edges = GetRatsnestForItems( aItems );
const std::vector<CN_EDGE>& edges = GetRatsnestForItems( aItems );
for( const auto& edge : edges )
for( const CN_EDGE& edge : edges )
{
const auto& nodeA = edge.GetSourceNode();
const auto& nodeB = edge.GetTargetNode();
RN_DYNAMIC_LINE l;
const CN_ANCHOR_PTR& nodeA = edge.GetSourceNode();
const CN_ANCHOR_PTR& nodeB = edge.GetTargetNode();
RN_DYNAMIC_LINE l;
// Use the parents' positions
l.a = nodeA->Parent()->GetPosition();
l.b = nodeB->Parent()->GetPosition();
l.a = nodeA->Parent()->GetPosition() + (wxPoint) aInternalOffset;
l.b = nodeB->Parent()->GetPosition() + (wxPoint) aInternalOffset;
l.netCode = 0;
m_dynamicRatsnest.push_back( l );
}
@ -351,13 +352,14 @@ bool CONNECTIVITY_DATA::IsConnectedOnLayer( const BOARD_CONNECTED_ITEM *aItem, i
{
CN_CONNECTIVITY_ALGO::ITEM_MAP_ENTRY &entry = m_connAlgo->ItemEntry( aItem );
auto matchType = [&]( KICAD_T aItemType )
{
if( aTypes.empty() )
return true;
auto matchType =
[&]( KICAD_T aItemType )
{
if( aTypes.empty() )
return true;
return std::count( aTypes.begin(), aTypes.end(), aItemType ) > 0;
};
return std::count( aTypes.begin(), aTypes.end(), aItemType ) > 0;
};
for( CN_ITEM* citem : entry.GetItems() )
{
@ -381,12 +383,12 @@ unsigned int CONNECTIVITY_DATA::GetUnconnectedCount() const
{
unsigned int unconnected = 0;
for( auto net : m_nets )
for( RN_NET* net : m_nets )
{
if( !net )
continue;
const auto& edges = net->GetUnconnected();
const std::vector<CN_EDGE>& edges = net->GetUnconnected();
if( edges.empty() )
continue;
@ -400,7 +402,7 @@ unsigned int CONNECTIVITY_DATA::GetUnconnectedCount() const
void CONNECTIVITY_DATA::Clear()
{
for( auto net : m_nets )
for( RN_NET* net : m_nets )
delete net;
m_nets.clear();

3
pcbnew/connectivity/connectivity_data.h
View File

@ -246,7 +246,8 @@ public:
* for the set of items aItems.
*/
void ComputeDynamicRatsnest( const std::vector<BOARD_ITEM*>& aItems,
const CONNECTIVITY_DATA* aDynamicData );
const CONNECTIVITY_DATA* aDynamicData,
VECTOR2I aInternalOffset = { 0, 0 } );
const std::vector<RN_DYNAMIC_LINE>& GetDynamicRatsnest() const
{

2
pcbnew/router/router_tool.cpp
View File

@ -1856,7 +1856,7 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
// Update ratsnest
dynamicData->Move( offset - lastOffset );
lastOffset = offset;
connectivityData->ComputeDynamicRatsnest( dynamicItems, dynamicData.get() );
connectivityData->ComputeDynamicRatsnest( dynamicItems, dynamicData.get(), offset );
}
}
else if( hasMouseMoved && ( evt->IsMouseUp( BUT_LEFT ) || evt->IsClick( BUT_LEFT ) ) )