Commit af445e70 authored by CHARRAS's avatar CHARRAS
Browse files

remove the old EDGEZONE class. Cleaning code in polyline.x

parent b62a69fc

change_log.txt

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ Started 2007-June-11 
Please add newer entries at the top, list the date and your name with

email address.



2008-Jan-31 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

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

+pcbnew:

	remove the old EDGEZONE class.

	A ZONE_CONTAINER class is used instead to handle the creation of a new zone outline

	



2008-Jan-29 UPDATE   Dick Hollenbeck <dick@softplc.com>

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

+pcbnew:

include/base_struct.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ enum KICAD_T { 
    TYPEMIRE,

    TYPESCREEN,

    TYPEBLOCK,

    TYPEEDGEZONE,

    TYPEZONE_UNUSED,

    TYPEZONE_EDGE_CORNER,

    TYPEZONE_CONTAINER,

include/pcbstruct.h

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ 
#define ECO2_LAYER              (1 << ECO2_N)

#define EDGE_LAYER              (1 << EDGE_N)



#define FIRST_NON_COPPER_LAYER  ADHESIVE_N_CU

#define LAST_NON_COPPER_LAYER  EDGE_N



//      extra bits              0xE0000000

/* masques generaux : */

#define ALL_LAYERS              0x1FFFFFFF

include/wxPcbStruct.h

+9 −10
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ class MODULE; 
class TRACK;

class SEGZONE;

class SEGVIA;

class EDGE_ZONE;

class D_PAD;

class TEXTE_MODULE;

class MIREPCB;
@@ -268,13 +267,6 @@ public: 
    void                        Block_Duplicate( wxDC* DC );





    /**

     * Function DelLimitesZone

     * deletes the limits of a zone.

     * @param DC A wxDC to draw onto.

     * @param Redraw If true, means redraw the pcb without the zone limits

     */

    void                        DelLimitesZone( wxDC* DC, bool Redraw );



    // layerhandling:

    // (See pcbnew/sel_layer.cpp for description of why null_layer parameter is provided)
@@ -487,14 +479,21 @@ public: 
     */

    void                Delete_Zone_Fill( wxDC* DC, SEGZONE* Track, long aTimestamp = 0 );



    EDGE_ZONE*          Del_LastSegmEdgeZone( wxDC* DC );





	/** Function Delete_LastCreatedCorner

	 * Used only while creating a new zone outline

	 * Remove and delete the current outline segment in progress

	 * @return 0 if no corner in list, or corner number

	 */

	int Delete_LastCreatedCorner( wxDC* DC);



    /**

     * Function Begin_Zone

     * initiates a zone edge creation process,

     * or terminates the current zone edge and creates a new zone edge stub

     */

    EDGE_ZONE*          Begin_Zone( wxDC* DC );

    int          Begin_Zone( wxDC* DC );



    /**

     * Function End_Zone

pcbnew/class_board.cpp

+5 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ BOARD::BOARD( EDA_BaseStruct* parent, WinEDA_BasePcbFrame* frame ) : 
    m_Pads             = NULL;          // pointeur liste d'acces aux pads

    m_Ratsnest         = NULL;          // pointeur liste rats

    m_LocalRatsnest    = NULL;          // pointeur liste rats local

    m_CurrentLimitZone = NULL;          // pointeur liste des EDEGE_ZONES

    m_CurrentZoneContour = NULL;        // This ZONE_CONTAINER handle the zone contour cuurently in progress

                                        // de determination des contours de zone

}
@@ -61,9 +61,6 @@ BOARD::~BOARD() 
    m_Zone->DeleteStructList();

    m_Zone = 0;

    

    m_CurrentLimitZone->DeleteStructList();

    m_CurrentLimitZone = 0;

    

    MyFree( m_Pads );

    m_Pads = 0;
@@ -75,6 +72,9 @@ BOARD::~BOARD() 


    DeleteMARKERs();

	DeleteZONEOutlines();

	

	delete m_CurrentZoneContour;

	m_CurrentZoneContour = NULL;

}
@@ -588,9 +588,7 @@ SEARCH_RESULT BOARD::Visit( INSPECTOR* inspector, const void* testData, 
            ++p;

            break;

            

        case TYPEEDGEZONE:

            result = IterateForward( m_CurrentLimitZone, inspector, testData, p );

            ++p;

        case TYPEZONE_UNUSED:	// Unused type

            break;            

            

        default:        // catch EOT or ANY OTHER type here and return.