Commit e9b3322f authored by CHARRAS's avatar CHARRAS
Browse files

On line DRC when creating a zone outline

parent da3f4430

change_log.txt

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

email address.



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

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

+pcbnew:

	On line DRC when creating a zone outline.

	Needs more work to display errors DRC.





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

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

include/wxPcbStruct.h

+3 −2
Original line number Diff line number Diff line
@@ -491,10 +491,11 @@ public: 


    /**

     * Function End_Zone

     * terminates the zone edge creation process

     * terminates (if no DRC error ) the zone edge creation process

     * @param DC = current Device Context

	 * @return true if Ok, false if DRC error

     */

    void                End_Zone( wxDC* DC );

    bool                End_Zone( wxDC* DC );



    /** Function Fill_Zone()

     *  Calculate the zone filling for the outline zone_container

pcbnew/class_drawsegment.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public: 
     * Is virtual from EDA_BaseStruct.

     * @param frame A WinEDA_BasePcbFrame in which to print status information.

     */

    void    Display_Infos( WinEDA_DrawFrame* frame );

    virtual void    Display_Infos( WinEDA_DrawFrame* frame );





    /**

pcbnew/class_drc_item.cpp

+5 −2
Original line number Diff line number Diff line
@@ -70,7 +70,10 @@ wxString DRC_ITEM::GetErrorText() const 
    case COPPERAREA_INSIDE_COPPERAREA:

        return wxString( _("Copper area inside copper area"));

    case COPPERAREA_CLOSE_TO_COPPERAREA:

        return wxString( _("Copper areas intersect or too close"));

        return wxString( _("Copper areas intersect or are too close"));

	case DRCE_NON_EXISTANT_NET_FOR_ZONE_OUTLINE:

        return wxString( _("Copper area has a non existent net name"));

		

        

    default:

        return wxString( wxT("PROGRAM BUG, PLEASE LEAVE THE ROOM.") );

pcbnew/class_module.h

+46 −45
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ enum Mod_Attribut /* Attributs d'un module */ 


class MODULE : public BOARD_ITEM

{

    

public:

    wxPoint          m_Pos;             // Real coord on board

    D_PAD*           m_Pads;            /* Pad list (linked list) */
@@ -46,6 +45,8 @@ public: 
    TEXTE_MODULE*    m_Reference;       // texte reference du composant (U34, R18..)

    TEXTE_MODULE*    m_Value;           // texte valeur du composant (74LS00, 22K..)

    wxString         m_LibRef;          /* nom du module en librairie */

    wxString         m_AlternateReference;  /* Used when m_Reference cannot be used to

                                              * identify the footprint ( after a full reannotation of the schematic */



    int           m_Attributs;          /* Flags bits a bit ( voir enum Mod_Attribut ) */

    int           m_Orient;             /* orientation en 1/10 degres */
@@ -216,6 +217,7 @@ public: 




 #if defined (DEBUG)



    /**

     * Function Show

     * is used to output the object tree, currently for debugging only.
@@ -226,5 +228,4 @@ public: 
    virtual void Show( int nestLevel, std::ostream& os );



#endif

    

};