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

Eeschema: bug 880132 : partial fix. 

Pcbnew: remove useless code.
Doc: remobe obsolete reference to MINIZIP (which do not exist now)
parent fc7189e6

Documentation/compiling/COMPILING.txt

+0 −2
Original line number Diff line number Diff line
@@ -215,8 +215,6 @@ One of these 2 option *must* be set to ON: 


 CMAKE_INSTALL_PREFIX (OPTIONAL)



 KICAD_MINIZIP ON/OFF



 USE_WX_GRAPHICS_CONTEXT ON/OFF (OPTIONAL)

   *Experimental* advanced drawing library code using wxGraphicsContext (for tests only).

   Under Windows, a very recent version of mingw is needed.

Documentation/compiling/linux-debian.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ dpatch cat-all >>patch-stampT 
mv -f patch-stampT patch-stamp

mkdir -p /home/david/Desktop/KICAD_SVN/build/kicad

mkdir -p /home/david/Desktop/KICAD_SVN/build/bitmaps

cd /home/david/Desktop/KICAD_SVN/build/kicad && cmake -DKICAD_MINIZIP=0 \

cd /home/david/Desktop/KICAD_SVN/build/kicad && cmake \



-DKICAD_DEMOS=/home/david/Desktop/KICAD_SVN/debian/kicad-common/usr/share/doc/ki\

cad/demos ../../kicad \

Documentation/compiling/linux-ubuntu.txt

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ dpatch cat-all >>patch-stampT 
mv -f patch-stampT patch-stamp

mkdir -p /home/david/Desktop/KICAD_SVN/build/kicad

mkdir -p /home/david/Desktop/KICAD_SVN/build/bitmaps

cd /home/david/Desktop/KICAD_SVN/build/kicad && cmake -DKICAD_MINIZIP=0 \

cd /home/david/Desktop/KICAD_SVN/build/kicad && cmake \



-DKICAD_DEMOS=/home/david/Desktop/KICAD_SVN/debian/kicad-common/usr/share/doc/ki\

cad/demos ../../kicad \

INSTALL.txt

+5 −8
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ configured and builded with "--enable-monolithic --disable-shared" parameters. 
For building dinamically linked executables. Can be used only if wxWidgets

configured and builded with "--disable-monolithic --enable-shared" parameters.



-DKICAD_MINIZIP=ON

Build the "minizip" executable. Use OFF to disable it building.



-DwxUSE_UNICODE=ON

Require on locale utf8 for build the KiCad with cyrillic fonts support.

eeschema/lib_field.cpp

+14 −11
Original line number Diff line number Diff line
@@ -320,12 +320,12 @@ void LIB_FIELD::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& a 
    /* Set to one (1) to draw bounding box around field text to validate

     * bounding box calculation. */

#if 0

    wxString tmp = m_Text;

    m_Text = *text;

    EDA_RECT bBox = GetBoundingBox();

    m_Text = tmp;

    bBox.Inflate( 1, 1 );

    GRRect( &aPanel->m_ClipBox, aDC, bBox, 0, LIGHTMAGENTA );

    EDA_RECT grBox;

    grBox.SetOrigin( aTransform.TransformCoordinate( bBox.GetOrigin() ) );

    grBox.SetEnd( aTransform.TransformCoordinate( bBox.GetEnd() ) );

    grBox.Move( aOffset );

    GRRect( &aPanel->m_ClipBox, aDC, grBox, 0, LIGHTMAGENTA );

#endif

}
@@ -511,18 +511,21 @@ wxString LIB_FIELD::GetFullText( int unit ) 


EDA_RECT LIB_FIELD::GetBoundingBox() const

{

    EDA_RECT rect = GetTextBox();

    rect.m_Pos.y *= -1;

    rect.m_Pos.y -= rect.GetHeight();

    /* Y coordinates for LIB_ITEMS are bottom to top, so we must invert the Y position when

     * calling GetTextBox() that works using top to bottom Y axis orientation.

     */

    EDA_RECT rect = GetTextBox( -1, -1, true );



    wxPoint orig = rect.GetOrigin();

    wxPoint end = rect.GetEnd();

    wxPoint center = rect.Centre();

    NEGATE( orig.y);

    NEGATE( end.y);



    RotatePoint( &orig, center, m_Orient );

    RotatePoint( &end, center, m_Orient );

    RotatePoint( &orig, m_Pos, -m_Orient );

    RotatePoint( &end, m_Pos, -m_Orient );

    rect.SetOrigin( orig );

    rect.SetEnd( end );

    rect.Normalize();



    return rect;

}