diff --git a/pcbnew/router/pns_kicad_iface.h b/pcbnew/router/pns_kicad_iface.h index 7b3f727e52..74fa685f94 100644 --- a/pcbnew/router/pns_kicad_iface.h +++ b/pcbnew/router/pns_kicad_iface.h @@ -101,12 +101,12 @@ public: void Commit() override; void AddItem( PNS::ITEM* aItem ) override; void RemoveItem( PNS::ITEM* aItem ) override; - + void UpdateNet( int aNetCode ) override; private: struct OFFSET { - VECTOR2I p_old, p_new; + VECTOR2I p_old, p_new; }; std::map m_moduleOffsets; @@ -114,7 +114,6 @@ private: KIGFX::VIEW_GROUP* m_previewItems; std::unordered_set m_hiddenItems; - PNS::ROUTER* m_router; PCB_TOOL_BASE* m_tool; std::unique_ptr m_commit; const PCB_DISPLAY_OPTIONS* m_dispOptions; diff --git a/pcbnew/router/pns_optimizer.cpp b/pcbnew/router/pns_optimizer.cpp index 91e73f3047..a1d0106fde 100644 --- a/pcbnew/router/pns_optimizer.cpp +++ b/pcbnew/router/pns_optimizer.cpp @@ -1315,7 +1315,8 @@ static int64_t shovedArea( const SHAPE_LINE_CHAIN& aOld, const SHAPE_LINE_CHAIN& return std::abs(area / 2); } -bool tightenSegment( bool dir, NODE *aNode, LINE cur, const SHAPE_LINE_CHAIN& in, SHAPE_LINE_CHAIN& out ) +bool tightenSegment( bool dir, NODE *aNode, const LINE& cur, + const SHAPE_LINE_CHAIN& in, SHAPE_LINE_CHAIN& out ) { SEG a = in.CSegment(0); SEG center = in.CSegment(1); @@ -1418,10 +1419,7 @@ bool tightenSegment( bool dir, NODE *aNode, LINE cur, const SHAPE_LINE_CHAIN& in //dbg->AddLine ( snew, 3, 100000 ); - return true; - - } void Tighten( NODE *aNode, SHAPE_LINE_CHAIN& aOldLine, LINE& aNewLine, LINE& aOptimized )