AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 17:23:44 +00:00
Files Issues Releases Activity

pcbnew: fix post-rebase errors

Browse Source
This commit is contained in:
Tomasz Wlostowski 2024-07-30 17:52:19 +02:00
parent a4936964e2
commit 145f26dd1e
3 changed files with 16 additions and 4 deletions

1
pcbnew/pcb_edit_frame.cpp
View File

@ -90,6 +90,7 @@
#include <tools/position_relative_tool.h>
#include <tools/zone_filler_tool.h>
#include <tools/pcb_actions.h>
#include <tools/multichannel_tool.h>
#include <router/router_tool.h>
#include <autorouter/autoplace_tool.h>
#include <python/scripting/pcb_scripting_tool.h>

8
pcbnew/tools/multichannel_tool.cpp
View File

@ -148,10 +148,10 @@ const SHAPE_LINE_CHAIN MULTICHANNEL_TOOL::buildRAOutline( std::set<FOOTPRINT*>&
auto bb = fp->GetBoundingBox( false, false );
bb.Inflate( aMargin );
bbCorners.push_back( { bb.GetX(), bb.GetY() } );
bbCorners.push_back( { bb.GetX() + bb.GetWidth(), bb.GetY() } );
bbCorners.push_back( { bb.GetX() + bb.GetWidth(), bb.GetY() + bb.GetHeight() } );
bbCorners.push_back( { bb.GetX(), bb.GetY() + bb.GetHeight() } );
bbCorners.push_back( VECTOR2I( bb.GetX(), bb.GetY() ) );
bbCorners.push_back( VECTOR2I( bb.GetX() + bb.GetWidth(), bb.GetY() ) );
bbCorners.push_back( VECTOR2I( bb.GetX() + bb.GetWidth(), bb.GetY() + bb.GetHeight() ) );
bbCorners.push_back( VECTOR2I( bb.GetX(), bb.GetY() + bb.GetHeight() ) );
}
BuildConvexHull( hullVertices, bbCorners );

11
pcbnew/zone.cpp
View File

@ -1394,6 +1394,17 @@ void ZONE::TransformSolidAreasShapesToPolygon( PCB_LAYER_ID aLayer, SHAPE_POLY_S
bool ZONE::operator==( const BOARD_ITEM& aOther ) const
{
if( aOther.Type() != Type() )
return false;
const ZONE& other = static_cast<const ZONE&>( aOther );
return *this == other;
}
bool ZONE::operator==( const ZONE& aOther ) const
{
if( aOther.Type() != Type() )
return false;