Commit 1b6ad8c7 authored by charras's avatar charras
Browse files

code cleaning and a minor problem fixed in Gerbview printing option

parent ef29dabf

CMakeModules/CreateSVNVersionHeader.cmake

+3 −6
Original line number Diff line number Diff line
@@ -37,14 +37,12 @@ macro(create_svn_version_header) 
    endif(Subversion_FOUND)



    # Check to make sure 'svn info' command did not fail.  Otherwise fallback

    # to vesion strings defined in "<kicad-src-dir>/include/build_version.h".

    # to version strings defined in "<kicad-src-dir>/include/build_version.h".

    if(Kicad_WC_LAST_CHANGED_DATE)

        string(REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+).*" "\\1\\2\\3"

               _kicad_svn_date ${Kicad_WC_LAST_CHANGED_DATE})

        set(KICAD_SVN_VERSION

        set(KICAD_BUILD_VERSION

            "(${_kicad_svn_date} SVN-R${Kicad_WC_LAST_CHANGED_REV})")

        set(KICAD_ABOUT_VERSION

            "SVN-R${Kicad_WC_LAST_CHANGED_REV} (${_kicad_svn_date})")



        # Definition to conditionally use date and revision returned from the

        # Subversion info command instead of hand coded date and revision in
@@ -58,7 +56,6 @@ macro(create_svn_version_header) 
        configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/version.h.cmake

                       ${CMAKE_BINARY_DIR}/version.h)



        message(STATUS "Kicad SVN version: ${KICAD_SVN_VERSION}")

        message(STATUS "Kicad about version: ${KICAD_ABOUT_VERSION}")

        message(STATUS "Kicad SVN build version: ${KICAD_BUILD_VERSION}")

    endif(Kicad_WC_LAST_CHANGED_DATE)

endmacro(create_svn_version_header)

CMakeModules/version.h.cmake

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#ifndef __KICAD_SVN_VERSION_H__

#define __KICAD_SVN_VERSION_H__



#cmakedefine KICAD_SVN_VERSION "@KICAD_SVN_VERSION@"

#cmakedefine KICAD_ABOUT_VERSION "@KICAD_ABOUT_VERSION@"

#cmakedefine KICAD_BUILD_VERSION "@KICAD_BUILD_VERSION@"



#endif  /* __KICAD_SVN_VERSION_H__ */

common/about_kicad.cpp

+14 −15
Original line number Diff line number Diff line
@@ -8,29 +8,28 @@ 
#include "appl_wxstruct.h"





#define BUILD_VERSION "(2009-12-05-unstable)"





#if defined(HAVE_SVN_VERSION) || defined(HAVE_SVN_REVISION)

#  include "version.h"

#ifndef KICAD_ABOUT_VERSION

#define KICAD_ABOUT_VERSION BUILD_VERSION

#ifdef HAVE_SVN_VERSION

#include "version.h"    // define the KICAD_BUILD_VERSION

#endif

wxString g_BuildAboutVersion( wxT( KICAD_ABOUT_VERSION ) );

#else

wxString g_BuildAboutVersion( wxT( BUILD_VERSION ) );



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2010-01-04)"

#endif



#define VERSION_STABILITY "unstable"



/** Function GetAboutBuildVersion()

 * Return custom build date for about dialog

/** Function GetBuildVersion()

 * Return the build date and version

 */

wxString GetAboutBuildVersion()

wxString GetBuildVersion()

{

    return g_BuildAboutVersion;

    wxString msg;

    msg.Printf( wxT("%s-%s"),

        wxT( KICAD_BUILD_VERSION ), wxT(VERSION_STABILITY));

    return msg;

}





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

wxString SetMsg( const wxString& msg )

/**********************************/
@@ -62,7 +61,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info ) 
    wxString description;



    /* KiCad build version */

    description << ( _T( "Build: " ) ) << GetAboutBuildVersion();

    description << ( _T( "Build: " ) ) << GetBuildVersion();



    /* Print for wxversion */

    description << ( wxT( "\n\nwxWidgets " ) )

common/common.cpp

+0 −20
Original line number Diff line number Diff line
@@ -118,26 +118,6 @@ StructColors ColorRefs[NBCOLOR] = 
};





#define BUILD_VERSION "(2009-12-05-unstable)"





#ifdef HAVE_SVN_VERSION

#include "version.h"

wxString g_BuildVersion( wxT( KICAD_SVN_VERSION ) );

#else

wxString g_BuildVersion( wxT( BUILD_VERSION ) );

#endif





/** Function GetBuildVersion()

 * Return the build date

 */

wxString GetBuildVersion()

{

    return g_BuildVersion;

}





/** function SetLocaleTo_C_standard

 * because kicad is internationalized, switch internalization to "C" standard

 * i.e. uses the . (dot) as separator in print/read float numbers

common/gr_basic.cpp

+7 −12
Original line number Diff line number Diff line
@@ -285,8 +285,13 @@ void GRResetPenAndBrush( wxDC* DC ) 
void SetPenMinWidth( int minwidth )

{

    PenMinWidth = minwidth;

    if( PenMinWidth < 1 )

        PenMinWidth = 1;

    if( PenMinWidth < 0 )

        PenMinWidth = 0;

}



int GetPenMinWidth( )

{

    return PenMinWidth;

}
@@ -1037,16 +1042,6 @@ static void GRSClosedPoly( EDA_Rect* ClipBox, 
}





/* not used

 * static void GRSClosedPoly( EDA_Rect* ClipBox, wxDC* DC, int n, wxPoint

 * Points[],

 *                 bool Fill, int Color, int BgColor )

 * {

 * GRSClosedPoly( ClipBox, DC, n, Points, Fill, 0, Color, BgColor );

 * }

 */





/*

 * Draw a new polyline and fill it if Fill, in drawing space.

 */