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

Shape Assertions: print the correct type names 

It still asserts, but at least for the right reason.
This commit is contained in:
Mike Williams 2022-05-26 15:31:52 -04:00
parent 2a9d7314ca
commit 9d90699358
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/kimath/src/geometry/shape_collisions.cpp
View File

@ -290,8 +290,8 @@ static inline bool Collide( const SHAPE_LINE_CHAIN_BASE& aA, const SHAPE_LINE_CH
int aClearance, int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
int closest_dist = INT_MAX;
VECTOR2I nearest;
@ -372,8 +372,8 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_LINE_CHAIN_BASE& a
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
int closest_dist = INT_MAX;
VECTOR2I nearest;
@ -429,8 +429,8 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_SEGMENT& aB, int a
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
@ -445,8 +445,8 @@ static inline bool Collide( const SHAPE_SEGMENT& aA, const SHAPE_SEGMENT& aB, in
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
@ -461,8 +461,8 @@ static inline bool Collide( const SHAPE_LINE_CHAIN_BASE& aA, const SHAPE_SEGMENT
int aClearance, int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
@ -484,8 +484,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_RECT& aB, int aClea
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
const SHAPE_LINE_CHAIN lc( aA );
@ -502,8 +502,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_CIRCLE& aB, int aCl
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
const SHAPE_LINE_CHAIN lc( aA );
@ -520,8 +520,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN& aB, int
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
int closest_dist = INT_MAX;
VECTOR2I nearest;
@ -592,8 +592,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_SEGMENT& aB, int aC
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
const SHAPE_LINE_CHAIN lc( aA );
@ -610,8 +610,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN_BASE& aB
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
int closest_dist = INT_MAX;
VECTOR2I nearest;
@ -667,8 +667,8 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_ARC& aB, int aClear
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
wxASSERT_MSG( !aMTV, wxString::Format( wxT( "MTV not implemented for %s : %s collisions" ),
aA.Type(),
aB.Type() ) );
SHAPE_TYPE_asString( aA.Type() ),
SHAPE_TYPE_asString( aB.Type() ) ) );
SEG mediatrix( aA.GetCenter(), aB.GetCenter() );