Commit fdc61126 authored by dickelbeck's avatar dickelbeck
Browse files

mires fixes

parent a93fd711

change_log.txt

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

email address.



2007-Oct-10 UPDATE   Dick Hollenbeck <dick@softplc.com>

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

+ pcbnew

  * prevent OnRightClick() from calling PcbGeneralLocateAndDisplay() when creating

    a new track.

  * bug fix: popup menu was not handling Mires, because the collector was not 

    being asked to find them.

+ all

    Changed English UI text "Mire" to "Target" according to this post:

    http://tech.groups.yahoo.com/group/kicad-users/message/1380

    



2007-Oct-9 UPDATE   Dick Hollenbeck <dick@softplc.com>

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

+ pcbnew

gerbview/tool_gerber.cpp

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ void WinEDA_GerberFrame::ReCreateVToolbar( void ) 
                        BITMAP( junction_xpm ),

                        wxNullBitmap, TRUE,

                        -1, -1, (wxObject*) NULL,

                        _( "Add Mires" ) );

                        _( "Add layer alignment target" ) );



    m_VToolBar->AddSeparator();

    m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT,

pcbnew/class_board_item.cpp

+4 −1
Original line number Diff line number Diff line
@@ -187,7 +187,10 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const 
        break;



    case TYPEMIRE:

        text << _( "Mire" );          // @todo: extend text,  Mire is not an english word!

        text << _( "Target" ) //<< wxT( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim()

            // could use if problem with decimal point and user units was fixed:

            // << wxT( " " ) << wxT( "size" ) << wxT( " " ) << ((MIREPCB*)item)->m_Size

            ;

        break;



    case TYPEEDGEZONE:

pcbnew/collectors.cpp

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = { 
    TYPEDRAWSEGMENT, 

    TYPEMARQUEUR,

    TYPECOTATION,

    TYPEMIRE,

    TYPEVIA,

    TYPETRACK,

    TYPEPAD,
@@ -50,6 +51,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = { 
};    





/*

const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = {

    TYPETEXTE, 

    TYPEDRAWSEGMENT,
@@ -60,6 +62,7 @@ const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = { 
    TYPEMODULE,

    EOT

};

*/





const KICAD_T GENERAL_COLLECTOR::AllButZones[] = {
@@ -67,6 +70,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = { 
    TYPEDRAWSEGMENT, 

    TYPEMARQUEUR,

    TYPECOTATION,

    TYPEMIRE,

    TYPEVIA,

    TYPETRACK,

    TYPEPAD,

pcbnew/collectors.h

+1 −1
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ public: 
    /** 

     * A scan list for all primary board items, omitting items which are subordinate to

     * a MODULE, such as D_PAD and TEXTEMODULE.

     */

    static const KICAD_T PrimaryItems[];

     */





    /**