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

Very minor fixes.

parent 52211afb

bitmaps/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ set(BITMAP_SRCS 
    axis3d_right.xpm

    axis3d_top.xpm

    axis3d.xpm

    backanno.xpm

    book.xpm

    Break_Bus.xpm

    Break_Line.xpm

bitmaps/backanno.xpm

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/* XPM */

#ifndef XPMMAIN

extern const char *backanno_xpm[];



#else

const char *backanno_xpm[] = {

/* width height num_colors chars_per_pixel */

"    16    16        3            1",

/* colors */

"  c None",

". c yellow",

"# c black",

/* pixels */

"                ",

"      ....      ",

"     ......     ",

"    ...##...    ",

"   ....##....   ",

"  .####.......  ",

" ..#.###..##... ",

" .###########.. ",

" ...##....##... ",

" ...###.....#.. ",

"  ..#.#..##...  ",

"   .#.#.####.   ",

"    ........    ",

"     ......     ",

"      ....      ",

"                "

};

#endif

common/build_version.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-06-08)"

#define KICAD_BUILD_VERSION "(2011-07-03)"

#endif

eeschema/bus-wire-junction.cpp

+0 −28
Original line number Diff line number Diff line
@@ -543,31 +543,3 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC ) 
    }

}



/* Routine incrementing labels, ie for the text ending with a number, adding

 * that a number <RepeatDeltaLabel>

 */

void IncrementLabelMember( wxString& name )

{

    int  ii, nn;

    long number = 0;



    ii = name.Len() - 1; nn = 0;



    if( !isdigit( name.GetChar( ii ) ) )

        return;



    while( (ii >= 0) && isdigit( name.GetChar( ii ) ) )

    {

        ii--; nn++;

    }



    ii++;   /* digits are starting at ii position */

    wxString litt_number = name.Right( nn );



    if( litt_number.ToLong( &number ) )

    {

        number += g_RepeatDeltaLabel;

        name.Remove( ii ); name << number;

    }

}

eeschema/edit_label.cpp

+30 −0
Original line number Diff line number Diff line
@@ -301,3 +301,33 @@ void SCH_EDIT_FRAME::OnConvertTextType( wxCommandEvent& aEvent ) 
        delete text;

    }

}





/* Function to increment bus label members numbers,

 * i.e. when a text is ending with a number, adds

 * <RepeatDeltaLabel> to this number

 */

void IncrementLabelMember( wxString& name )

{

    int  ii, nn;

    long number = 0;



    ii = name.Len() - 1; nn = 0;



    if( !isdigit( name.GetChar( ii ) ) )

        return;



    while( (ii >= 0) && isdigit( name.GetChar( ii ) ) )

    {

        ii--; nn++;

    }



    ii++;   /* digits are starting at ii position */

    wxString litt_number = name.Right( nn );



    if( litt_number.ToLong( &number ) )

    {

        number += g_RepeatDeltaLabel;

        name.Remove( ii ); name << number;

    }

}