Commit 69905af7 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

EAGLE_PLUGIN now positions text correct for most cases

parent 7bdcad15

pcbnew/class_edge_mod.h

+6 −4
Original line number Diff line number Diff line
@@ -42,14 +42,11 @@ class EDA_DRAW_FRAME; 


class EDGE_MODULE : public DRAWSEGMENT

{

public:

    wxPoint m_Start0;       // Start point or center, relative to module origin, orient 0.

    wxPoint m_End0;         // End point, relative to module origin, orient 0.



public:

    EDGE_MODULE( MODULE* parent, STROKE_T aShape = S_SEGMENT );



    // Do not create a copy constructor.  The one generated by the compiler is adequate.

    // EDGE_MODULE( const EDGE_MODULE& );



    ~EDGE_MODULE();
@@ -90,6 +87,11 @@ public: 
#if defined(DEBUG)

    void Show( int nestLevel, std::ostream& os ) const;     // overload

#endif



//protected:  @todo: is it just me?



    wxPoint m_Start0;       // Start point or center, relative to module origin, orient 0.

    wxPoint m_End0;         // End point, relative to module origin, orient 0.

};



#endif    // CLASS_EDGE_MOD_H_

pcbnew/eagle_plugin.cpp

+655 −609

File changed.

Preview size limit exceeded, changes collapsed.

pcbnew/eagle_plugin.h

+0 −41
Original line number Diff line number Diff line
@@ -75,18 +75,6 @@ namespace boost { 
typedef boost::property_tree::ptree     PTREE;

typedef const PTREE                     CPTREE;



struct EWIRE;

struct EVIA;

struct EROT;

struct EATTR;

struct ECIRCLE;

struct ETEXT;

struct ERECT;

struct EPAD;

struct ESMD;

struct EVERTEX;

struct EPOLYGON;



/**

 * Class EAGLE_PLUGIN

 * works with Eagle 6.x XML board files and footprints.
@@ -194,35 +182,6 @@ private: 


    void loadElements( CPTREE& aElements, const std::string& aXpath );



    // none of the 'e'funcs do any "to KiCad" conversion, they merely read the XML into binary:



    /**

     * Function ewire

     * converts a <wire>'s xml attributes to binary without additional conversion.

     * @param aResult is an EWIRE to fill in with the <wire> data converted to binary.

     */

    EWIRE       ewire( CPTREE& aWire ) const;



    EVIA        evia( CPTREE& aVia ) const;



    ECIRCLE     ecircle( CPTREE& aCircle ) const;

    ETEXT       etext( CPTREE& aText )  const;

    ERECT       erect( CPTREE& aRect ) const;



    EROT        erot( const std::string& aRot ) const;

    EPAD        epad( CPTREE& aPad ) const;

    ESMD        esmd( CPTREE& aSMD ) const;

    EVERTEX     evertex( CPTREE& aVertex ) const;

    EPOLYGON    epolygon( CPTREE& aPolygon ) const;



    /**

     * Function eattr

     * parses an Eagle "attribute" element.  Note that an attribute element

     * is different than an XML element attribute.  The attribute element is a

     * full XML node in and of itself, and has attributes of its own.  Blame Eagle.

     */

    EATTR eattr( CPTREE& aAttribute ) const;



    /**

     * Function fmtDEG

     * formats an angle in a way particular to a board file format.  This function

pcbnew/files.cpp

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ the changes?" ) ) ) 


    // This is a subset of all PLUGINs which are trusted to be able to

    // load a BOARD.  Order is subject to change as KICAD plugin matures.

    // User may occasionally use the wrong pluging to load a *.brd file,

    // User may occasionally use the wrong plugin to load a *.brd file,

    // but eventually *.kicad_pcb will be more common than legacy *.brd files.

    static const struct {

        const wxString&     filter;