haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed std::wstring to wxString.

This commit is contained in:
Maciej Suminski 2013-12-05 16:00:24 +01:00
parent 7678983e38
commit ca11855f12
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/gal/stroke_font.cpp
View File

@ -26,6 +26,7 @@
#include <gal/stroke_font.h> #include <gal/stroke_font.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <wx/string.h>
using namespace KIGFX; using namespace KIGFX;
@ -142,7 +143,7 @@ BOX2D STROKE_FONT::computeBoundingBox( const GLYPH& aGLYPH, const VECTOR2D& aGLY
} }
void STROKE_FONT::Draw( std::wstring aText, const VECTOR2D& aPosition, double aRotationAngle ) void STROKE_FONT::Draw( wxString aText, const VECTOR2D& aPosition, double aRotationAngle )
{ {
// By default overbar is turned off // By default overbar is turned off
m_overbar = false; m_overbar = false;
@ -154,14 +155,14 @@ void STROKE_FONT::Draw( std::wstring aText, const VECTOR2D& aPosition, double aR
m_gal->Rotate( -aRotationAngle ); m_gal->Rotate( -aRotationAngle );
// Split multiline strings into separate ones and draw them line by line // Split multiline strings into separate ones and draw them line by line
size_t newlinePos = aText.find( '\n' ); int newlinePos = aText.Find( '\n' );
if( newlinePos != std::wstring::npos ) if( newlinePos != wxNOT_FOUND )
{ {
VECTOR2D nextlinePosition = VECTOR2D( 0.0, m_glyphSize.y * LINE_HEIGHT_RATIO ); VECTOR2D nextlinePosition = VECTOR2D( 0.0, m_glyphSize.y * LINE_HEIGHT_RATIO );
Draw( aText.substr( newlinePos + 1 ), nextlinePosition, 0.0 ); Draw( aText.Mid( newlinePos + 1 ), nextlinePosition, 0.0 );
aText = aText.substr( 0, newlinePos ); aText = aText.Mid( 0, newlinePos );
} }
// Compute the text size // Compute the text size
@ -233,7 +234,7 @@ void STROKE_FONT::Draw( std::wstring aText, const VECTOR2D& aPosition, double aR
m_gal->SetLineWidth( m_gal->GetLineWidth() * 1.3 ); m_gal->SetLineWidth( m_gal->GetLineWidth() * 1.3 );
} }
for( std::wstring::const_iterator chIt = aText.begin(); chIt != aText.end(); chIt++ ) for( wxString::const_iterator chIt = aText.begin(); chIt != aText.end(); chIt++ )
{ {
if( *chIt == '~' ) if( *chIt == '~' )
{ {
@ -292,11 +293,11 @@ void STROKE_FONT::Draw( std::wstring aText, const VECTOR2D& aPosition, double aR
} }
VECTOR2D STROKE_FONT::computeTextSize( const std::wstring& aText ) const VECTOR2D STROKE_FONT::computeTextSize( const wxString& aText ) const
{ {
VECTOR2D result = VECTOR2D( 0.0, m_glyphSize.y ); VECTOR2D result = VECTOR2D( 0.0, m_glyphSize.y );
for( std::wstring::const_iterator chIt = aText.begin(); chIt != aText.end(); chIt++ ) for( wxString::const_iterator chIt = aText.begin(); chIt != aText.end(); chIt++ )
{ {
if( *chIt == '~' ) if( *chIt == '~' )
continue; continue;

2
include/gal/graphics_abstraction_layer.h
View File

@ -277,7 +277,7 @@ public:
* @param aPosition is the text position in world coordinates. * @param aPosition is the text position in world coordinates.
* @param aRotationAngle is the text rotation angle. * @param aRotationAngle is the text rotation angle.
*/ */
inline virtual void StrokeText( const std::wstring& aText, const VECTOR2D& aPosition, inline virtual void StrokeText( const wxString& aText, const VECTOR2D& aPosition,
double aRotationAngle ) double aRotationAngle )
{ {
strokeFont.Draw( aText, aPosition, aRotationAngle ); strokeFont.Draw( aText, aPosition, aRotationAngle );

4
include/gal/stroke_font.h
View File

@ -73,7 +73,7 @@ public:
* @param aPosition is the text position in world coordinates. * @param aPosition is the text position in world coordinates.
* @param aRotationAngle is the text rotation angle. * @param aRotationAngle is the text rotation angle.
*/ */
void Draw( std::wstring aText, const VECTOR2D& aPosition, double aRotationAngle ); void Draw( wxString aText, const VECTOR2D& aPosition, double aRotationAngle );
/** /**
* @brief Set the scale factor of the font for the glyph size. * @brief Set the scale factor of the font for the glyph size.
@ -180,7 +180,7 @@ private:
* @param aText is the text string. * @param aText is the text string.
* @return is the text size. * @return is the text size.
*/ */
VECTOR2D computeTextSize( const std::wstring& aText ) const; VECTOR2D computeTextSize( const wxString& aText ) const;
static const double LINE_HEIGHT_RATIO; static const double LINE_HEIGHT_RATIO;
}; };

4
pcbnew/pcb_painter.cpp
View File

@ -719,7 +719,7 @@ void PCB_PAINTER::draw( const TEXTE_PCB* aText, int aLayer )
m_gal->SetStrokeColor( strokeColor ); m_gal->SetStrokeColor( strokeColor );
m_gal->SetLineWidth( aText->GetThickness() ); m_gal->SetLineWidth( aText->GetThickness() );
m_gal->SetTextAttributes( aText ); m_gal->SetTextAttributes( aText );
m_gal->StrokeText( std::wstring( aText->GetText().wc_str() ), position, orientation ); m_gal->StrokeText( aText->GetText(), position, orientation );
} }
@ -735,7 +735,7 @@ void PCB_PAINTER::draw( const TEXTE_MODULE* aText, int aLayer )
m_gal->SetStrokeColor( strokeColor ); m_gal->SetStrokeColor( strokeColor );
m_gal->SetLineWidth( aText->GetThickness() ); m_gal->SetLineWidth( aText->GetThickness() );
m_gal->SetTextAttributes( aText ); m_gal->SetTextAttributes( aText );
m_gal->StrokeText( std::wstring( aText->GetText().wc_str() ), position, orientation ); m_gal->StrokeText( aText->GetText(), position, orientation );
} }