Commit fafd74ca authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Fix problem with BOARD bounding box in saved *.brd files, 

and TEXTE_MODULE size in kicad_plugin.
Link in io_mgr and kicad_plugin but do not call them yet
parent 680a4407

pcbnew/CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -126,9 +126,9 @@ set(PCBNEW_SRCS 
    hotkeys_board_editor.cpp

    hotkeys_board_editor.cpp

    hotkeys_module_editor.cpp

    hotkeys_module_editor.cpp

    initpcb.cpp

    initpcb.cpp

#    io_mgr.cpp

    io_mgr.cpp

    ioascii.cpp

    ioascii.cpp

#    kicad_plugin.cpp

    kicad_plugin.cpp

    layer_widget.cpp

    layer_widget.cpp

    librairi.cpp

    librairi.cpp

    loadcmp.cpp

    loadcmp.cpp

pcbnew/files.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "class_board.h"

#include "class_board.h"

#include "build_version.h"      // BOARD_FILE_VERSION

#include "build_version.h"      // BOARD_FILE_VERSION







static const wxString pcbBackupFileExtension(  wxT( "000" ) );

static const wxString pcbBackupFileExtension(  wxT( "000" ) );
@@ -200,6 +201,7 @@ the changes?" ) ) ) 
    GetScreen()->SetFileName( fileName.GetFullPath() );

    GetScreen()->SetFileName( fileName.GetFullPath() );





#if 1

#if 1



    // Start read PCB file

    // Start read PCB file

    FILE* source = wxFopen( GetScreen()->GetFileName(), wxT( "rt" ) );

    FILE* source = wxFopen( GetScreen()->GetFileName(), wxT( "rt" ) );

pcbnew/io_mgr.cpp

+10 −3
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ 
// plugins coexisting.

// plugins coexisting.









static KICAD_PLUGIN kicad_plugin;       // a secret

// static KICAD_PLUGIN kicad_plugin;       // a secret

//static EAGLE_PLUGIN eagle_plugin;

//static EAGLE_PLUGIN eagle_plugin;





PLUGIN* IO_MGR::PluginFind( PCB_FILE_T aFileType )

PLUGIN* IO_MGR::PluginFind( PCB_FILE_T aFileType )
@@ -49,9 +49,14 @@ PLUGIN* IO_MGR::PluginFind( PCB_FILE_T aFileType ) 




    switch( aFileType )

    switch( aFileType )

    {

    {

    case KICAD:     return &kicad_plugin;

    case KICAD:

        return new KICAD_PLUGIN();







//    case EAGLE:     return &eagle_plugin;

/*

    case EAGLE:

        return &eagle_plugin;

*/

    }

    }





    return NULL;

    return NULL;
@@ -63,6 +68,8 @@ void IO_MGR::PluginRelease( PLUGIN* aPlugin ) 
    // This function is a place holder for a future point in time where

    // This function is a place holder for a future point in time where

    // the plugin is a DLL/DSO.  It could do reference counting, and then

    // the plugin is a DLL/DSO.  It could do reference counting, and then

    // unload the DLL/DSO when count goes to zero.

    // unload the DLL/DSO when count goes to zero.



    delete aPlugin;

}

}

pcbnew/io_mgr.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -225,6 +225,14 @@ public: 




    //-----</PUBLIC PLUGIN API>------------------------------------------------

    //-----</PUBLIC PLUGIN API>------------------------------------------------





    /*  The compiler writes the "zero argument" constructor for a PLUGIN

        automatically if you do not provide one. If you decide you need to

        provide a zero argument constructor of your own design, that is allowed,

        but there can only be one constructor and it must be a "zero argument"

        version. Normally you can do your initialization in a function like

        KICAD_PLUGIN::init( PROPERTIES* aProperties ) instead.

    */



    virtual ~PLUGIN() {}

    virtual ~PLUGIN() {}





    /**

    /**

pcbnew/ioascii.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ int PCB_BASE_FRAME::ReadGeneralDescrPcb( LINE_READER* aReader ) 
            data = strtok( NULL, delims );

            data = strtok( NULL, delims );

            int y2 = atoi( data );

            int y2 = atoi( data );





            EDA_RECT bbbox( wxPoint( x1, x2 ), wxSize( x2-x1, y2-y1 ) );

            EDA_RECT bbbox( wxPoint( x1, y1 ), wxSize( x2-x1, y2-y1 ) );





            GetBoard()->SetBoundingBox( bbbox );

            GetBoard()->SetBoundingBox( bbbox );