Commit 6886e50d authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Pcbnew: For zone filling algo, change the default polygon library from Kbool... 

Pcbnew: For zone filling algo, change the default polygon library from Kbool to Boost::polygon (USE_BOOST_POLYGON_LIBRARY default is ON). (need to rebuild makefile)
Gerbview: added decimal format for coordinates, sometimes found in Gerber files.
parent 8c407521

CHANGELOG.txt

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ KiCad ChangeLog 2010 
Please add newer entries at the top, list the date and your name with

email address.



2010-dec-02, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

Pcbnew:

    For zone filling algo, change the default polygon library from Kbool to Boost::polygon.





2010-dec-01, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

Gerbview:

CMakeLists.txt

+4 −3
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ option(USE_WX_OVERLAY 
       "Use wxOverlay: Always ON for MAC (default OFF). Warning, this is experimental")



option(USE_BOOST_POLYGON_LIBRARY

       "Use boost polygon library instead of Kbool to calculate filled areas in zones (default OFF). Warning, this is experimental")

       "Use boost polygon library instead of Kbool to calculate filled areas in zones (default ON)."

       ON )



#================================================

# Set flags for GCC.
@@ -41,7 +42,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) 
    # Set default flags for Release build.

    set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG ")

    set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")

    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")

    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s -static-libgcc")



    # Set default flags for Debug build.

    set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

common/dialog_about/AboutDialog_main.cpp

+12 −5
Original line number Diff line number Diff line
@@ -73,7 +73,14 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) 
#else

        << wxT( " Ansi " );

#endif

    libVersion << wxT( "and " )



#if USE_BOOST_POLYGON_LIBRARY

        << wxT( "boost::polygon" );

#else

        << wxT( "kbool library" );

#endif

    libVersion << wxT( "\n" );



    /* Operating System Information */
@@ -281,8 +288,8 @@ bool ShowAboutDialog( wxWindow* parent ) 
 * Wraps the given url with a HTML anchor tag containing a hyperlink text reference

 * to form a HTML hyperlink.

 *

 * @url the url that will be embedded in an anchor tag containing a hyperlink reference

 * @description the optional describing text that will be represented as a hyperlink.

 * @param url the url that will be embedded in an anchor tag containing a hyperlink reference

 * @param description the optional describing text that will be represented as a hyperlink.

 *  If not specified the url will be used as hyperlink.

 * @return a HTML conform hyperlink like <a href='url'>description</a>

 */

gerbview/class_GERBER.cpp

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ void GERBER_IMAGE::ResetDefaultValues() 
    m_Relative = false;                             // false = absolute Coord,

                                                    // true = relative Coord

    m_NoTrailingZeros = false;                      // true: trailing zeros deleted

    m_DecimalFormat = false;                        // true: use floating point notations for coordinates

    m_ImageOffset.x   = m_ImageOffset.y = 0;        // Coord Offset, from IO command

    m_ImageRotation = 0;                            // Allowed 0, 90, 180, 270 (in degree)

    m_LocalRotation = 0.0;                          // Layer totation from RO command (in 0.1 degree)

gerbview/class_GERBER.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ public: 
    bool               m_GerbMetric;                            // false = Inches, true = metric

    bool               m_Relative;                              // false = absolute Coord, true = relative Coord

    bool               m_NoTrailingZeros;                       // true: remove tailing zeros.

    bool               m_DecimalFormat;                         // true: use floating point notations for coordinates

                                                                // If true, overrides m_NoTrailingZeros parameter.

    wxPoint            m_ImageOffset;                           // Coord Offset, from IO command

    wxSize             m_FmtScale;                              // Fmt 2.3: m_FmtScale = 3, fmt 3.4: m_FmtScale = 4

    wxSize             m_FmtLen;                                // Nb chars per coord. ex fmt 2.3, m_FmtLen = 5