Commit 521f428c authored by charras's avatar charras
Browse files

Using the last version (1.9) of kbool, downloaded from the wxArt2D project site.

parent 5d5698d6

bitmaps/makefile.g95

+4 −0
Original line number Diff line number Diff line
@@ -8,3 +8,7 @@ include makefile.include 
libbitmaps.a: $(OBJECTS)

	ar ruv $@ $(OBJECTS)

	ranlib $@



clean:

	rm -f *.o

	rm -f *.a

change_log.txt

+11 −0
Original line number Diff line number Diff line
@@ -6,6 +6,17 @@ Please add newer entries at the top, list the date and your name with 
email address.





2008-Nov-14 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

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

kbool:

    Using the last version (1.9) of kbool, downloaded from the wxArt2D project site

    (see www.wxart2d.org)

    But the version 1.8 bug still is here.

    So using the workaround remains mandatory.

    (this is not a problem because thermal shapes are better...)







2008-Nov-14 UPDATE Dick Hollenbeck <dick@softplc.com>

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

+gerview

include/build_version.h

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ COMMON_GLOBL wxString g_BuildVersion 
#    include "config.h"

     (wxT(KICAD_SVN_VERSION))

#  else

     (wxT("(20081106-unstable)")) /* main program version */

     (wxT("(20081114-unstable)")) /* main program version */

#  endif

#endif

;
@@ -20,7 +20,7 @@ COMMON_GLOBL wxString g_BuildAboutVersion 
#    include "config.h"

     (wxT(KICAD_ABOUT_VERSION))

#  else

     (wxT("(20081106-unstable)")) /* svn date & rev (normally overridden) */

     (wxT("(20081114-unstable)")) /* svn date & rev (normally overridden) */

#  endif

#endif

;

pcbnew/dialog_copper_zones.cpp

+30 −22
Original line number Diff line number Diff line
@@ -189,8 +189,10 @@ void dialog_copper_zone::OnInitDialog( wxInitDialogEvent& event ) 


    m_NetNameFilter->SetValue( NetNameFilter );

    wxArrayString ListNetName;

    m_Parent->m_Pcb->ReturnSortedNetnamesList( ListNetName,

        m_NetSorting == 0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );

    m_Parent->m_Pcb->ReturnSortedNetnamesList(

        ListNetName,

        m_NetSorting ==

        0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );



    if( m_NetSorting != 0 )

    {
@@ -336,8 +338,10 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab 


    m_Parent->m_Parent->m_EDA_Config->Write( ZONE_THERMAL_RELIEF_GAP_STRING_KEY,

                                             (long) m_Zone_Setting->m_ThermalReliefGapValue );

    m_Parent->m_Parent->m_EDA_Config->Write( ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY,

        (long) m_Zone_Setting->m_ThermalReliefCopperBridgeValue );

    m_Parent->m_Parent->m_EDA_Config->Write(

        ZONE_THERMAL_RELIEF_COPPER_WIDTH_STRING_KEY,

        (long) m_Zone_Setting->

        m_ThermalReliefCopperBridgeValue );



    // If we use only exportable to others zones parameters, exit here:

    if( aUseExportableSetupOnly )
@@ -388,8 +392,10 @@ void dialog_copper_zone::OnNetSortingOptionSelected( wxCommandEvent& event ) 
    wxArrayString ListNetName;



    m_NetSorting = m_NetSortingOption->GetSelection();

    m_Parent->m_Pcb->ReturnSortedNetnamesList( ListNetName,

        m_NetSorting == 0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );

    m_Parent->m_Pcb->ReturnSortedNetnamesList(

        ListNetName,

        m_NetSorting ==

        0 ? BOARD::ALPHA_SORT : BOARD::PAD_CNT_SORT );

    if( m_NetSorting != 0 )

    {

        wxString Filter = m_NetNameFilter->GetValue();
@@ -448,12 +454,14 @@ void dialog_copper_zone::ExportSetupToOtherCopperZones( wxCommandEvent& event ) 
    if( !AcceptOptions( true, true ) )

        return;



    // Export to others zones:

    // Export settings ( but layer ) to others zones:

    BOARD* pcb = m_Parent->m_Pcb;

    for( int ii = 0; ii < pcb->GetAreaCount(); ii++ )

    {

        ZONE_CONTAINER* zone = pcb->GetArea( ii );

        int             zone_layer = zone->GetLayer();

        m_Zone_Setting->ExportSetting( *zone );

        zone->SetLayer( zone_layer );

        m_Parent->GetScreen()->SetModify();

    }

}

pcbnew/pcbframe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "protos.h"

#include "id.h"

#include "drc_stuff.h"

#include "kbool/include/booleng.h"

#include "kbool/include/kbool/booleng.h"



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

/* class WinEDA_PcbFrame */