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

Backing out earlier fix in favour of fixing std::shared_ptr usage. 

Assigning to a reference to a std::shared_ptr does not update the
reference to a different std::shared_ptr; it changes what the
std::shared_ptr points to.

Fixes https://gitlab.com/kicad/code/kicad/issues/12968
This commit is contained in:
Jeff Young 2022-11-21 21:51:28 +00:00
parent e3cc0a5bc7
commit 11130bfd88
4 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/connectivity/connectivity_data.cpp
View File

@ -178,15 +178,8 @@ void CONNECTIVITY_DATA::updateRatsnest()
[&]( const int a, const int b) [&]( const int a, const int b)
{ {
for( int ii = a; ii < b; ++ii ) for( int ii = a; ii < b; ++ii )
dirty_nets[ ii ]->UpdateNet(); dirty_nets[ii]->UpdateNet();
}).wait(); } ).wait();
GetKiCadThreadPool().parallelize_loop( 0, dirty_nets.size(),
[&]( const int a, const int b)
{
for( int ii = a; ii < b; ++ii )
dirty_nets[ii]->OptimizeNet();
}).wait();
#ifdef PROFILE #ifdef PROFILE
rnUpdate.Show(); rnUpdate.Show();

3
pcbnew/connectivity/connectivity_items.h
View File

@ -179,9 +179,10 @@ public:
virtual ~CN_ITEM() {}; virtual ~CN_ITEM() {};
void AddAnchor( const VECTOR2I& aPos ) std::shared_ptr<CN_ANCHOR> AddAnchor( const VECTOR2I& aPos )
{ {
m_anchors.emplace_back( std::make_shared<CN_ANCHOR>( aPos, this ) ); m_anchors.emplace_back( std::make_shared<CN_ANCHOR>( aPos, this ) );
return m_anchors.at( m_anchors.size() - 1 );
} }
std::vector<std::shared_ptr<CN_ANCHOR>>& Anchors() { return m_anchors; } std::vector<std::shared_ptr<CN_ANCHOR>>& Anchors() { return m_anchors; }

39
pcbnew/ratsnest/ratsnest_data.cpp
View File

@ -361,17 +361,17 @@ void RN_NET::optimizeRNEdges()
} }
if( closest_item ) if( closest_item )
{ return closest_item->AddAnchor( closest_pt );
closest_item->AddAnchor( closest_pt ); else
return closest_item->GetAnchorItem( closest_item->GetAnchorItemCount() - 1 ); return aAnchor;
}
return aAnchor;
}; };
auto findZoneToZoneAnchors = auto optimizeZoneToZoneAnchors =
[&]( std::shared_ptr<CN_ANCHOR>& a, std::shared_ptr<CN_ANCHOR>& b ) [&]( CN_EDGE& edge )
{ {
const std::shared_ptr<CN_ANCHOR> a = edge.GetSourceNode();
const std::shared_ptr<CN_ANCHOR> b = edge.GetTargetNode();
for( CN_ITEM* itemA : a->Item()->ConnectedItems() ) for( CN_ITEM* itemA : a->Item()->ConnectedItems() )
{ {
CN_ZONE_LAYER* zoneLayerA = dynamic_cast<CN_ZONE_LAYER*>( itemA ); CN_ZONE_LAYER* zoneLayerA = dynamic_cast<CN_ZONE_LAYER*>( itemA );
@ -398,13 +398,11 @@ void RN_NET::optimizeRNEdges()
VECTOR2I ptA; VECTOR2I ptA;
shapeA->Collide( shapeB, startDist + 10, nullptr, &ptA ); shapeA->Collide( shapeB, startDist + 10, nullptr, &ptA );
zoneLayerA->AddAnchor( ptA ); edge.SetSourceNode( zoneLayerA->AddAnchor( ptA ) );
a = zoneLayerA->GetAnchorItem( zoneLayerA->GetAnchorItemCount() - 1 );
VECTOR2I ptB; VECTOR2I ptB;
shapeB->Collide( shapeA, startDist + 10, nullptr, &ptB ); shapeB->Collide( shapeA, startDist + 10, nullptr, &ptB );
zoneLayerB->AddAnchor( ptB ); edge.SetTargetNode( zoneLayerB->AddAnchor( ptB ) );
b = zoneLayerB->GetAnchorItem( zoneLayerB->GetAnchorItemCount() - 1 );
return; return;
} }
@ -414,8 +412,8 @@ void RN_NET::optimizeRNEdges()
for( CN_EDGE& edge : m_rnEdges ) for( CN_EDGE& edge : m_rnEdges )
{ {
std::shared_ptr<CN_ANCHOR> source = edge.GetSourceNode(); const std::shared_ptr<CN_ANCHOR> source = edge.GetSourceNode();
std::shared_ptr<CN_ANCHOR> target = edge.GetTargetNode(); const std::shared_ptr<CN_ANCHOR> target = edge.GetTargetNode();
if( source->ConnectedItemsCount() == 0 ) if( source->ConnectedItemsCount() == 0 )
{ {
@ -429,9 +427,7 @@ void RN_NET::optimizeRNEdges()
} }
else else
{ {
findZoneToZoneAnchors( source, target ); optimizeZoneToZoneAnchors( edge );
edge.SetSourceNode( source );
edge.SetTargetNode( target );
} }
} }
} }
@ -440,21 +436,16 @@ void RN_NET::optimizeRNEdges()
void RN_NET::UpdateNet() void RN_NET::UpdateNet()
{ {
compute(); compute();
m_dirty = false;
}
void RN_NET::OptimizeNet()
{
#ifdef PROFILE #ifdef PROFILE
PROF_TIMER cnt( "optimize" ); PROF_TIMER cnt( "optimize" );
#endif #endif
optimizeRNEdges(); optimizeRNEdges();
#ifdef PROFILE #ifdef PROFILE
cnt.Show(); cnt.Show();
#endif #endif
m_dirty = false;
} }

1
pcbnew/ratsnest/ratsnest_data.h
View File

@ -81,7 +81,6 @@ public:
* Recompute ratsnest for a net. * Recompute ratsnest for a net.
*/ */
void UpdateNet(); void UpdateNet();
void OptimizeNet();
void Clear(); void Clear();
void AddCluster( std::shared_ptr<CN_CLUSTER> aCluster ); void AddCluster( std::shared_ptr<CN_CLUSTER> aCluster );