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

libs/kimath: SHAPE::Format() can now produce C++ object construction and simple test dump of shapes

This commit is contained in:
Tomasz Wlostowski 2022-10-24 00:20:02 +02:00
parent 99bcdf7979
commit cd29dcf6e0
13 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/kimath/include/geometry/shape.h
View File

@ -243,7 +243,7 @@ public:
virtual bool Parse( std::stringstream& aStream );
virtual const std::string Format( ) const;
virtual const std::string Format( bool aCplusPlus = true ) const;
protected:
typedef VECTOR2I::extended_type ecoord;

2
libs/kimath/include/geometry/shape_circle.h
View File

@ -135,6 +135,8 @@ public:
return true;
}
virtual const std::string Format( bool aCplusPlus = true ) const override;
private:
CIRCLE m_circle;
};

2
libs/kimath/include/geometry/shape_compound.h
View File

@ -51,7 +51,7 @@ public:
~SHAPE_COMPOUND();
SHAPE_COMPOUND* Clone() const override;
const std::string Format() const override;
const std::string Format( bool aCplusPlus = true ) const override;
bool Collide( const SEG& aSeg, int aClearance = 0, int* aActual = nullptr,
VECTOR2I* aLocation = nullptr ) const override;

2
libs/kimath/include/geometry/shape_line_chain.h
View File

@ -714,7 +714,7 @@ public:
const VECTOR2I NearestPoint( const SEG& aSeg, int& dist ) const;
/// @copydoc SHAPE::Format()
const std::string Format() const override;
const std::string Format( bool aCplusPlus = true ) const override;
/// @copydoc SHAPE::Parse()
bool Parse( std::stringstream& aStream ) override;

2
libs/kimath/include/geometry/shape_poly_set.h
View File

@ -1054,7 +1054,7 @@ public:
int NormalizeAreaOutlines();
/// @copydoc SHAPE::Format()
const std::string Format() const override;
const std::string Format( bool aCplusPlus = true ) const override;
/// @copydoc SHAPE::Parse()
bool Parse( std::stringstream& aStream ) override;

2
libs/kimath/include/geometry/shape_rect.h
View File

@ -188,7 +188,7 @@ public:
return rv;
}
virtual const std::string Format( ) const override;
virtual const std::string Format( bool aCplusPlus = true ) const override;
private:
VECTOR2I m_p0; ///< Top-left corner

2
libs/kimath/include/geometry/shape_segment.h
View File

@ -157,7 +157,7 @@ public:
m_seg.B += aVector;
}
virtual const std::string Format( ) const override;
virtual const std::string Format( bool aCplusPlus = true ) const override;
private:
SEG m_seg;

7
libs/kimath/src/geometry/shape.cpp
View File

@ -38,10 +38,11 @@ bool SHAPE::Parse( std::stringstream& aStream )
}
const std::string SHAPE::Format() const
const std::string SHAPE::Format( bool aCplusPlus ) const
{
assert( false );
return std::string( "" );
std::stringstream ss;
ss << "shape " << m_type;
return ss.str();
}

2
libs/kimath/src/geometry/shape_compound.cpp
View File

@ -27,7 +27,7 @@
#include <geometry/shape_compound.h>
const std::string SHAPE_COMPOUND::Format() const
const std::string SHAPE_COMPOUND::Format( bool aCplusPlus ) const
{
std::stringstream ss;

2
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -1974,7 +1974,7 @@ int SHAPE_LINE_CHAIN::NearestSegment( const VECTOR2I& aP ) const
}
const std::string SHAPE_LINE_CHAIN::Format() const
const std::string SHAPE_LINE_CHAIN::Format( bool aCplusPlus ) const
{
std::stringstream ss;

2
libs/kimath/src/geometry/shape_poly_set.cpp
View File

@ -1624,7 +1624,7 @@ int SHAPE_POLY_SET::NormalizeAreaOutlines()
}
const std::string SHAPE_POLY_SET::Format() const
const std::string SHAPE_POLY_SET::Format( bool aCplusPlus ) const
{
std::stringstream ss;

2
libs/kimath/src/geometry/shape_rect.cpp
View File

@ -91,7 +91,7 @@ bool SHAPE_RECT::Collide( const SEG& aSeg, int aClearance, int* aActual, VECTOR2
return false;
}
const std::string SHAPE_RECT::Format( ) const
const std::string SHAPE_RECT::Format( bool aCplusPlus ) const
{
std::stringstream ss;

45
libs/kimath/src/geometry/shape_segment.cpp
View File

@ -25,11 +25,14 @@
#include <sstream>
#include <geometry/shape_segment.h>
#include <geometry/shape_circle.h>
const std::string SHAPE_SEGMENT::Format() const
const std::string SHAPE_SEGMENT::Format( bool aCplusPlus ) const
{
std::stringstream ss;
if( aCplusPlus )
{
ss << "SHAPE_SEGMENT( VECTOR2I( ";
ss << m_seg.A.x;
ss << ", ";
@ -41,6 +44,46 @@ const std::string SHAPE_SEGMENT::Format() const
ss << "), ";
ss << m_width;
ss << "); ";
}
else
{
ss << SHAPE::Format( aCplusPlus ) << " ";
ss << m_seg.A.x;
ss << " ";
ss << m_seg.A.y;
ss << " ";
ss << m_seg.B.x;
ss << " ";
ss << m_seg.B.y;
ss << " ";
ss << m_width;
}
return ss.str();
}
const std::string SHAPE_CIRCLE::Format( bool aCplusPlus ) const
{
std::stringstream ss;
if( aCplusPlus )
{
ss << "SHAPE_CIRCLE( VECTOR2I( ";
ss << m_circle.Center.x;
ss << ", ";
ss << m_circle.Center.y;
ss << "), ";
ss << m_circle.Radius;
ss << "); ";
} else
{
ss << SHAPE::Format( aCplusPlus ) << " ";
ss << m_circle.Center.x;
ss << " ";
ss << m_circle.Center.y;
ss << " ";
ss << m_circle.Radius;
}
return ss.str();
}