Commit de96452c authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Minor common PCB library code fixes. 

* More common header file compiler fixes.
* Translate French code naming and comments.
* Remove global variable ScreenPcb.
* Dead code removal.
parent 063c56be

common/footprint_info.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString & aFootprintsLibNames ) 
        char * line = reader.Line();

        char * line = reader.Line();

        StrPurge( line );

        StrPurge( line );





        if( strnicmp( line, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )

        if( strnicmp( line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )

        {

        {

            wxString msg;

            wxString msg;

            msg.Printf( _( "<%s> is not a valid Kicad PCB footprint library." ),

            msg.Printf( _( "<%s> is not a valid Kicad PCB footprint library." ),

common/pcbcommon.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -112,11 +112,8 @@ class BOARD_DESIGN_SETTINGS g_DesignSettings; 
 */

 */

DLIST<TRACK> g_CurrentTrackList;

DLIST<TRACK> g_CurrentTrackList;





PCB_SCREEN* ScreenPcb = NULL;

BOARD* g_ModuleEditor_Pcb = NULL;

BOARD* g_ModuleEditor_Pcb = NULL;





int g_GridRoutingSize = 250;



bool g_Zone_45_Only = FALSE;

bool g_Zone_45_Only = FALSE;





// Default setting used when creating a new zone

// Default setting used when creating a new zone

cvpcb/class_DisplayFootprintsFrame.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -74,8 +74,9 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father, 




    // Initialize some display options

    // Initialize some display options

    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning here

    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning here

    DisplayOpt.ShowTrackClearanceMode = 0;  /* tracks and vias clearance has



                                             * no meaning here. */

    // Track and via clearance has no meaning here.

    DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE;





    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );

    SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );

    ReCreateHToolbar();

    ReCreateHToolbar();
@@ -84,7 +85,6 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father, 




    m_auimgr.SetManagedWindow( this );

    m_auimgr.SetManagedWindow( this );







    EDA_PANEINFO horiz;

    EDA_PANEINFO horiz;

    horiz.HorizontalToolbarPane();

    horiz.HorizontalToolbarPane();

cvpcb/loadcmp.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ found in the default search paths." ), 
        Line = reader.Line();

        Line = reader.Line();

        StrPurge( Line );

        StrPurge( Line );





        if( strnicmp( Line, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )

        if( strnicmp( Line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )

        {

        {

            msg.Printf( _( "<%s> is not a valid Kicad PCB foot print library." ),

            msg.Printf( _( "<%s> is not a valid Kicad PCB foot print library." ),

                        GetChars( tmp ) );

                        GetChars( tmp ) );

gerbview/gerbview.cpp

+7 −7
Original line number Original line Diff line number Diff line 
/************************************************/

/**

/*			GERBVIEW		 main file			*/

 * @file gerbview.cpp

/************************************************/

 * @brief GERBVIEW main file.

 */





#include "fctsys.h"

#include "fctsys.h"

#include "appl_wxstruct.h"

#include "appl_wxstruct.h"
@@ -71,9 +72,6 @@ bool EDA_APP::OnInit() 
            return false;

            return false;

    }

    }





    ScreenPcb = new PCB_SCREEN();

    ScreenPcb->m_CurrentSheetDesc = &g_Sheet_GERBER;



    // read current setup and reopen last directory if no filename to open in

    // read current setup and reopen last directory if no filename to open in

    // command line

    // command line

    bool reopenLastUsedDirectory = argc == 1;

    bool reopenLastUsedDirectory = argc == 1;
@@ -92,7 +90,9 @@ bool EDA_APP::OnInit() 




    // Initialize some display options

    // Initialize some display options

    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning here

    DisplayOpt.DisplayPadIsol = false;      // Pad clearance has no meaning here

    DisplayOpt.ShowTrackClearanceMode = 0;  // tracks and vias clearance has no meaning here



    // Track and via clearance has no meaning here.

    DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE;





    SetTopWindow( frame );                  // Set GerbView mainframe on top

    SetTopWindow( frame );                  // Set GerbView mainframe on top

    frame->Show( true );                    // Show GerbView mainframe

    frame->Show( true );                    // Show GerbView mainframe