Merge lp:~cern-kicad/kicad/aligned_text_fix into lp:kicad/product

[Maciej Suminski]

=== modified file 'common/gal/stroke_font.cpp'
--- common/gal/stroke_font.cpp	2013-12-08 06:48:25 +0000
+++ common/gal/stroke_font.cpp	2013-12-20 10:07:46 +0000
@@ -153,6 +153,7 @@
     m_gal->Save();
 
     m_gal->Translate( aPosition );
+    m_gal->Rotate( -aRotationAngle );
 
     // Single line height
     int lineHeight = getInterline();
@@ -177,8 +178,6 @@
         break;
     }
 
-    m_gal->Rotate( -aRotationAngle );
-
     m_gal->SetIsStroke( true );
     m_gal->SetIsFill( false );
 

=== modified file 'pcbnew/class_pcb_text.cpp'
--- pcbnew/class_pcb_text.cpp	2013-12-05 12:24:27 +0000
+++ pcbnew/class_pcb_text.cpp	2013-12-20 10:07:46 +0000
@@ -205,40 +205,3 @@
 {
     return new TEXTE_PCB( *this );
 }
-
-
-const BOX2I TEXTE_PCB::ViewBBox() const
-{
-    EDA_RECT rect = GetTextBox();
-
-    if( m_Orient != 0.0 )
-    {
-        // If the text is rotated, we need to take it into account
-        wxPoint p1 = rect.GetOrigin();
-        wxPoint p2 = wxPoint( p1.x + rect.GetWidth(), p1.y );
-        wxPoint p3 = rect.GetEnd();
-        wxPoint p4 = wxPoint( p1.x, p1.y + rect.GetHeight() );
-
-        // Transform all the corners of the bounding box according to the rotation angle
-        RotatePoint( &p1, m_Pos, -m_Orient );
-        RotatePoint( &p2, m_Pos, -m_Orient );
-        RotatePoint( &p3, m_Pos, -m_Orient );
-        RotatePoint( &p4, m_Pos, -m_Orient );
-
-        // Find the new bounding box origin and dimensions
-        int minX = std::min( std::min( p1.x, p2.x ), std::min( p3.x, p4.x ) );
-        int minY = std::min( std::min( p1.y, p2.y ), std::min( p3.y, p4.y ) );
-        int maxX = std::max( std::max( p1.x, p2.x ), std::max( p3.x, p4.x ) );
-        int maxY = std::max( std::max( p1.y, p2.y ), std::max( p3.y, p4.y ) );
-
-        int width = maxX - minX;
-        int height = maxY - minY;
-
-        return BOX2I( VECTOR2I( minX, minY ), VECTOR2I( width, height ) );
-    }
-    else
-    {
-        return BOX2I( rect.GetOrigin(), rect.GetSize() );
-    }
-}
-

=== modified file 'pcbnew/class_pcb_text.h'
--- pcbnew/class_pcb_text.h	2013-12-05 12:24:27 +0000
+++ pcbnew/class_pcb_text.h	2013-12-20 10:07:46 +0000
@@ -135,9 +135,6 @@
 
     EDA_ITEM* Clone() const;
 
-    /// @copydoc VIEW_ITEM::ViewBBox()
-    virtual const BOX2I ViewBBox() const;
-
 #if defined(DEBUG)
     virtual void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); }    // override
 #endif