Commit 4d12bd3e authored by charras's avatar charras
Browse files

Solved problems with mirrored texts. cleaning obsolete files

parent af048ff2

bitmaps/makefile.g95

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ libbitmaps.a: $(OBJECTS) 


clean:

#	rm -f *.o

"	rm -f *.a
 
#	rm -f *.a

common/base_struct.cpp

+5 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ EDA_TextStruct::EDA_TextStruct( const wxString& text ) 
    m_Size.x    = m_Size.y = DEFAULT_SIZE_TEXT;     /* XY size of font */

    m_Orient    = 0;                                /* Orient in 0.1 degrees */

    m_Attributs = 0;

    m_Miroir    = 0;                                // display mirror if 1

    m_Mirror    = false;                            // display mirror if true

    m_HJustify  = GR_TEXT_HJUSTIFY_CENTER;

    m_VJustify  = GR_TEXT_VJUSTIFY_CENTER;          /* Justifications Horiz et Vert du texte */

    m_Width  = 0;                                   /* thickness */
@@ -301,10 +301,13 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, 


    if( aDisplayMode == SKETCH )

        width = -width;

	wxSize size = m_Size;

	if ( m_Mirror )

		size.x = -size.x;



    DrawGraphicText( aPanel, aDC,

                     aOffset + m_Pos, aColor, m_Text,

                     m_Orient, m_Size,

                     m_Orient, size,

                     m_HJustify, m_VJustify, width, m_Italic );

}

common/drawtxt.cpp

+4 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC, 
    int            ox, oy;              // Draw coordinates for the current char

    int            coord[100];          // Buffer coordinate used to draw polylines (char shapes)

    bool           sketch_mode = false;

	bool			italic_reverse = false;		// true for mirrored texts with m_Size.x < 0



    if ( aPanel )

        zoom = aPanel->GetZoom();
@@ -76,6 +77,8 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC, 
        sketch_mode = TRUE;

    }

    int thickness = aWidth;

	if ( aSize.x < 0 )		// text is mirrored using size.x < 0 (mirror / Y axis)

		italic_reverse = true;



    kk = 0;

    ptr = 0;   /* ptr = text index */
@@ -289,7 +292,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC, 
                    k2    = (k2 * size_h) / 9;

                    // To simulate an italic font, add a x offset depending on the y offset

                    if ( aItalic )

                        k2 -= k1/8;

                        k2 -= italic_reverse ? - k1/8 : k1/8;

                    dx    = k2 + ox; dy = k1 + oy;



                    RotatePoint( &dx, &dy, cX, cY, aOrient );

eeschema/class_sch_cmp_field.cpp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void SCH_CMP_FIELD::SwapData( SCH_CMP_FIELD* copyitem ) 
    EXCHG( m_Size, copyitem->m_Size );

    EXCHG( m_Width, copyitem->m_Width );

    EXCHG( m_Orient, copyitem->m_Orient );

    EXCHG( m_Miroir, copyitem->m_Miroir );

    EXCHG( m_Mirror, copyitem->m_Mirror );

    EXCHG( m_Attributs, copyitem->m_Attributs );

    EXCHG( m_Italic, copyitem->m_Italic );

    EXCHG( m_HJustify, copyitem->m_HJustify );

gerbview/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
                    ../polygon)



set(GERBVIEW_SRCS

    affiche.cpp

    block.cpp

    controle.cpp

    dcode.cpp