Commit 4ac27702 authored by Maciej Suminski's avatar Maciej Suminski

Code formatting.

parent 77d8b2d8
This diff is collapsed.
...@@ -41,16 +41,15 @@ class BOARD_ITEM; ...@@ -41,16 +41,15 @@ class BOARD_ITEM;
class DXF2BRD_CONVERTER : public DRW_Interface class DXF2BRD_CONVERTER : public DRW_Interface
{ {
private: private:
std::vector<BOARD_ITEM*> m_newItemsList; // The list of new items added std::vector<BOARD_ITEM*> m_newItemsList; // The list of new items added to the board
// to the board BOARD* m_brd;
BOARD * m_brd;
double m_xOffset; // X coord offset for conversion (in mm) double m_xOffset; // X coord offset for conversion (in mm)
double m_yOffset; // Y coord offset for conversion (in mm) double m_yOffset; // Y coord offset for conversion (in mm)
double m_defaultThickness; // default line thickness for conversion (in mm) double m_defaultThickness; // default line thickness for conversion (in mm)
double m_Dfx2mm; // The scale factor to convert DXF units to mm double m_Dfx2mm; // The scale factor to convert DXF units to mm
// Seems DRW_Interface always converts DXF coordinates in mm // Seems DRW_Interface always converts DXF coordinates in mm
// (to be confirmed) // (to be confirmed)
int m_brdLayer; // The board layer to place imported dfx items int m_brdLayer; // The board layer to place imported dfx items
int m_version; // the dxf version, not used here int m_version; // the dxf version, not used here
std::string m_codePage; // The code page, not used here std::string m_codePage; // The code page, not used here
...@@ -85,7 +84,7 @@ public: ...@@ -85,7 +84,7 @@ public:
* @param aFile = the full filename. * @param aFile = the full filename.
* @param aBoard = where to store the graphical items and text * @param aBoard = where to store the graphical items and text
*/ */
bool ImportDxfFile( const wxString& aFile, BOARD * aBoard ); bool ImportDxfFile( const wxString& aFile, BOARD* aBoard );
/** /**
* @return the list of new BOARD_ITEM * @return the list of new BOARD_ITEM
...@@ -104,65 +103,65 @@ private: ...@@ -104,65 +103,65 @@ private:
// Add aItem the the board // Add aItem the the board
// this item is also added to the list of new items // this item is also added to the list of new items
// (for undo command for instance) // (for undo command for instance)
void appendToBoard( BOARD_ITEM * aItem ); void appendToBoard( BOARD_ITEM* aItem );
// Methods from DRW_CreationInterface: // Methods from DRW_CreationInterface:
// They are "call back" fonctions, called when the corresponding object // They are "call back" fonctions, called when the corresponding object
// is read in dxf file // is read in dxf file
// Depending of the application, they can do something or not // Depending of the application, they can do something or not
virtual void addHeader( const DRW_Header* data ); virtual void addHeader( const DRW_Header* aData );
virtual void addLType( const DRW_LType& data ){} virtual void addLType( const DRW_LType& aData ) {}
virtual void addLayer( const DRW_Layer& data ); virtual void addLayer( const DRW_Layer& aData );
virtual void addDimStyle( const DRW_Dimstyle& data ){} virtual void addDimStyle( const DRW_Dimstyle& aData ) {}
virtual void addBlock(const DRW_Block& data ){} virtual void addBlock( const DRW_Block& aData ) {}
virtual void endBlock(){} virtual void endBlock() {}
virtual void addPoint(const DRW_Point& data ){} virtual void addPoint( const DRW_Point& aData ) {}
virtual void addLine(const DRW_Line& data); virtual void addLine( const DRW_Line& aData);
virtual void addRay(const DRW_Ray& data ){} virtual void addRay( const DRW_Ray& aData ) {}
virtual void addXline(const DRW_Xline& data ){} virtual void addXline( const DRW_Xline& aData ) {}
virtual void addCircle(const DRW_Circle& data ); virtual void addCircle( const DRW_Circle& aData );
virtual void addArc(const DRW_Arc& data ); virtual void addArc( const DRW_Arc& aData );
virtual void addEllipse(const DRW_Ellipse& data ){} virtual void addEllipse( const DRW_Ellipse& aData ) {}
virtual void addLWPolyline(const DRW_LWPolyline& data ); virtual void addLWPolyline( const DRW_LWPolyline& aData );
virtual void addText(const DRW_Text& data ); virtual void addText( const DRW_Text& aData );
virtual void addPolyline(const DRW_Polyline& data ); virtual void addPolyline( const DRW_Polyline& aData );
virtual void addSpline(const DRW_Spline* data ){} virtual void addSpline( const DRW_Spline* aData ) {}
virtual void addKnot(const DRW_Entity&) {} virtual void addKnot( const DRW_Entity&) {}
virtual void addInsert(const DRW_Insert& data ){} virtual void addInsert( const DRW_Insert& aData ){}
virtual void addTrace(const DRW_Trace& data ){} virtual void addTrace( const DRW_Trace& aData ){}
virtual void addSolid(const DRW_Solid& data ){} virtual void addSolid( const DRW_Solid& aData ){}
virtual void addMText(const DRW_MText& data); virtual void addMText( const DRW_MText& aData);
virtual void addDimAlign(const DRW_DimAligned *data ){} virtual void addDimAlign( const DRW_DimAligned* aData ) {}
virtual void addDimLinear(const DRW_DimLinear *data ){} virtual void addDimLinear( const DRW_DimLinear* aData ) {}
virtual void addDimRadial(const DRW_DimRadial *data ){} virtual void addDimRadial( const DRW_DimRadial* aData ) {}
virtual void addDimDiametric(const DRW_DimDiametric *data ){} virtual void addDimDiametric( const DRW_DimDiametric* aData ) {}
virtual void addDimAngular(const DRW_DimAngular *data ){} virtual void addDimAngular( const DRW_DimAngular* aData ) {}
virtual void addDimAngular3P(const DRW_DimAngular3p *data ){} virtual void addDimAngular3P( const DRW_DimAngular3p* aData ) {}
virtual void addDimOrdinate(const DRW_DimOrdinate *data ){} virtual void addDimOrdinate( const DRW_DimOrdinate* aData ) {}
virtual void addLeader(const DRW_Leader *data ){} virtual void addLeader( const DRW_Leader* aData ) {}
virtual void addHatch(const DRW_Hatch* data ){} virtual void addHatch( const DRW_Hatch* aData ) {}
virtual void addImage(const DRW_Image* data ){} virtual void addImage( const DRW_Image* aData ) {}
virtual void linkImage(const DRW_ImageDef* data ){} virtual void linkImage( const DRW_ImageDef* aData ) {}
virtual void add3dFace(const DRW_3Dface& data ){} virtual void add3dFace( const DRW_3Dface& aData ) {}
virtual void addComment(const char*){} virtual void addComment( const char*) {}
virtual void addVport(const DRW_Vport& data) {} virtual void addVport( const DRW_Vport& aData ) {}
virtual void addTextStyle(const DRW_Textstyle& data); virtual void addTextStyle( const DRW_Textstyle& aData );
virtual void addViewport(const DRW_Viewport& data) {} virtual void addViewport( const DRW_Viewport& aData ) {}
virtual void setBlock(const int handle) {} virtual void setBlock( const int aHandle ) {}
static wxString toDxfString(const wxString& str); static wxString toDxfString( const wxString& aStr );
static wxString toNativeString(const wxString& data); static wxString toNativeString( const wxString& aData );
// These functions are not used in Kicad. // These functions are not used in Kicad.
// But because they are virtual pure in DRW_Interface, they should be defined // But because they are virtual pure in DRW_Interface, they should be defined
virtual void writeTextstyles() {} virtual void writeTextstyles() {}
virtual void writeVports() {} virtual void writeVports() {}
virtual void writeHeader(DRW_Header& data) {} virtual void writeHeader( DRW_Header& aData ) {}
virtual void writeEntities() {} virtual void writeEntities() {}
virtual void writeLTypes() {} virtual void writeLTypes() {}
virtual void writeLayers() {} virtual void writeLayers() {}
...@@ -172,7 +171,6 @@ private: ...@@ -172,7 +171,6 @@ private:
void writeLine(); void writeLine();
void writeMtext(); void writeMtext();
}; };
#endif // FILTERDXFRW_H #endif // FILTERDXFRW_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment