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

Fixup cherry-picks for v8

This commit is contained in:
Seth Hillbrand 2024-06-29 11:22:00 -07:00
parent a3d218ffbc
commit fb82130530
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sch_io/altium/sch_io_altium.cpp
View File

@ -2413,7 +2413,7 @@ void SCH_IO_ALTIUM::ParsePieChart( const std::map<wxString, wxString>& aProperti
if( aSymbol.empty() && !IsComponentPartVisible( elem ) ) if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return; return;
SCH_SHAPE* line = new SCH_SHAPE( SHAPE_T::POLY, LAYER_DEVICE ); LIB_SHAPE* line = new LIB_SHAPE( symbol, SHAPE_T::POLY );
symbol->AddDrawItem( line, false ); symbol->AddDrawItem( line, false );
line->SetUnit( std::max( 0, elem.ownerpartid ) ); line->SetUnit( std::max( 0, elem.ownerpartid ) );

18
libs/kimath/include/geometry/shape_arc.h
View File

@ -149,8 +149,6 @@ public:
*/ */
int Intersect( const SHAPE_ARC& aArc, std::vector<VECTOR2I>* aIpsBuffer ) const; int Intersect( const SHAPE_ARC& aArc, std::vector<VECTOR2I>* aIpsBuffer ) const;
bool IsClockwise() const;
void SetWidth( int aWidth ) void SetWidth( int aWidth )
{ {
m_width = aWidth; m_width = aWidth;
@ -249,15 +247,6 @@ public:
void TransformToPolygon( SHAPE_POLY_SET& aBuffer, int aError, void TransformToPolygon( SHAPE_POLY_SET& aBuffer, int aError,
ERROR_LOC aErrorLoc ) const override; ERROR_LOC aErrorLoc ) const override;
private:
bool ccw( const VECTOR2I& aA, const VECTOR2I& aB, const VECTOR2I& aC ) const
{
return ( ecoord{ aC.y } - aA.y ) * ( ecoord{ aB.x } - aA.x ) >
( ecoord{ aB.y } - aA.y ) * ( ecoord{ aC.x } - aA.x );
}
void update_bbox();
/** /**
* @return true if the arc is counter-clockwise. * @return true if the arc is counter-clockwise.
*/ */
@ -276,6 +265,13 @@ private:
bool IsClockwise() const { return !IsCCW(); } bool IsClockwise() const { return !IsCCW(); }
private: private:
bool ccw( const VECTOR2I& aA, const VECTOR2I& aB, const VECTOR2I& aC ) const
{
return ( ecoord{ aC.y } - aA.y ) * ( ecoord{ aB.x } - aA.x ) >
( ecoord{ aB.y } - aA.y ) * ( ecoord{ aC.x } - aA.x );
}
void update_bbox();
bool sliceContainsPoint( const VECTOR2I& p ) const; bool sliceContainsPoint( const VECTOR2I& p ) const;

6
libs/kimath/src/geometry/shape_arc.cpp
View File

@ -372,12 +372,6 @@ const BOX2I SHAPE_ARC::BBox( int aClearance ) const
} }
bool SHAPE_ARC::IsClockwise() const
{
return GetCentralAngle() < ANGLE_0;
}
VECTOR2I SHAPE_ARC::NearestPoint( const VECTOR2I& aP ) const VECTOR2I SHAPE_ARC::NearestPoint( const VECTOR2I& aP ) const
{ {
const static int s_epsilon = 8; const static int s_epsilon = 8;

6
qa/qa_utils/mocks.cpp
View File

@ -514,6 +514,12 @@ PCB_SELECTION& PCB_TOOL_BASE::selection()
} }
BOX2I PCB_SELECTION::GetBoundingBox( bool aOnlyVisible ) const
{
return BOX2I();
}
EDA_ITEM* PCB_SELECTION::GetTopLeftItem( bool onlyModules ) const EDA_ITEM* PCB_SELECTION::GetTopLeftItem( bool onlyModules ) const
{ {
return nullptr; return nullptr;