Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added RawText type for text and barcode objects.

Browse Source
This commit is contained in:
Jim Evins
2017-05-06 20:08:17 -04:00
parent 6d764bbf4d
commit 409ca1bf57
8 changed files with 198 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/LabelModelTextObject.cpp
+5 -33
View File
@@ -121,7 +121,7 @@ namespace glabels
///
QString LabelModelTextObject::text() const
{
return mText;
return mText.toString();
}
@@ -130,7 +130,7 @@ namespace glabels
///
void LabelModelTextObject::setText( const QString& value )
{
if ( mText != value )
if ( mText.toString() != value )
{
mText = value;
update();
@@ -365,7 +365,7 @@ namespace glabels
QFontMetricsF fontMetrics( font );
double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
QString displayText = mText.isEmpty() ? tr("Text") : mText;
QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
QTextDocument document( displayText );
// Do layouts
@@ -487,7 +487,7 @@ namespace glabels
QFontMetricsF fontMetrics( font );
double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
QString displayText = mText.isEmpty() ? tr("Text") : mText;
QString displayText = mText.isEmpty() ? tr("Text") : mText.toString();
QTextDocument document( displayText );
qDeleteAll( mEditorLayouts );
@@ -597,7 +597,7 @@ namespace glabels
QFontMetricsF fontMetrics( font );
double dy = fontMetrics.lineSpacing() * mTextLineSpacing;
QTextDocument document( expandText( mText, record ) );
QTextDocument document( mText.expand( record ) );
QList<QTextLayout*> layouts;
@@ -664,32 +664,4 @@ namespace glabels
qDeleteAll( layouts );
}
///
/// Expand text by replacing fields with their values from the given record
///
QString LabelModelTextObject::expandText( QString text, merge::Record* record ) const
{
if ( record )
{
foreach ( QString key, record->keys() )
{
// Special case: remove line when it contains only an empty field.
// e.g. an optional ${ADDR2} line. To bypass this case, include
// whitespace at end of line.
if ( record->value(key).isEmpty() )
{
QStringList v = text.split( '\n' );
v.removeAll( "${"+key+"}" );
text = v.join( '\n' );
}
// Nominal case: simple replacement
text.replace( "${"+key+"}", record->value(key) );
}
}
return text;
}
} // namespace glabels