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

Correctly handle invalid barcode data cases in label editor.

Browse Source
This commit is contained in:
Jim Evins
2017-05-13 15:37:16 -04:00
parent 276756a317
commit 446d580f13
3 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/LabelModelBarcodeObject.cpp
+42 -37
View File
@@ -348,34 +348,60 @@ namespace glabels
///
/// Draw text in editor from cached information
/// Draw barcode in editor from cached information
///
void LabelModelBarcodeObject::drawBcInEditor( QPainter* painter, const QColor& color ) const
{
painter->setPen( QPen( color ) );
if ( mEditorBarcode->isDataValid() )
if ( mBcData.isEmpty() )
{
drawPlaceHolder( painter, color, tr("No barcode data") );
}
else if ( mBcData.hasPlaceHolders() )
{
drawPlaceHolder( painter, color, mBcData.toString() );
}
else if ( mEditorBarcode->isDataValid() )
{
painter->setPen( QPen( color ) );
glbarcode::QtRenderer renderer(painter);
mEditorBarcode->render( renderer );
}
else
{
QString text;
if ( mBcData.isEmpty() )
{
text = tr("No barcode data");
drawPlaceHolder( painter, color, tr("Invalid barcode data") );
}
else if ( mBcData.hasPlaceHolders() )
{
text = mBcData.toString();
}
else
{
text = tr("Invalid barcode data");
}
///
/// Draw barcode in final printout or preview
///
void
LabelModelBarcodeObject::drawBc( QPainter* painter,
const QColor& color,
merge::Record* record ) const
{
painter->setPen( QPen( color ) );
glbarcode::Barcode* bc = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
bc->setChecksum(mBcChecksumFlag);
bc->setShowText(mBcTextFlag);
bc->build( mBcData.toStdString(), mW.pt(), mH.pt() );
glbarcode::QtRenderer renderer(painter);
bc->render( renderer );
}
///
/// Draw place holder in editor
///
void
LabelModelBarcodeObject::drawPlaceHolder( QPainter* painter,
const QColor& color,
const QString& text ) const
{
painter->setPen( Qt::NoPen );
painter->setBrush( QBrush( emptyFillColor ) );
painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
@@ -401,27 +427,6 @@ namespace glabels
Qt::AlignCenter,
text );
}
}
///
/// Draw text in final printout or preview
///
void
LabelModelBarcodeObject::drawBc( QPainter* painter,
const QColor& color,
merge::Record* record ) const
{
painter->setPen( QPen( color ) );
glbarcode::Barcode* bc = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
bc->setChecksum(mBcChecksumFlag);
bc->setShowText(mBcTextFlag);
bc->build( mBcData.toStdString(), mW.pt(), mH.pt() );
glbarcode::QtRenderer renderer(painter);
bc->render( renderer );
}
} // namespace glabels
glabels/LabelModelBarcodeObject.h
+1
View File
@@ -125,6 +125,7 @@ namespace glabels
void drawBcInEditor( QPainter* painter, const QColor& color ) const;
void drawBc( QPainter* painter, const QColor& color, merge::Record* record ) const;
void drawPlaceHolder( QPainter* painter, const QColor& color, const QString& text ) const;
translations/glabels_C.ts
+2 -2
View File
@@ -1115,12 +1115,12 @@
<context>
<name>glabels::LabelModelBarcodeObject</name>
<message>
<location filename="../glabels/LabelModelBarcodeObject.cpp" line="368"/>
<location filename="../glabels/LabelModelBarcodeObject.cpp" line="357"/>
<source>No barcode data</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../glabels/LabelModelBarcodeObject.cpp" line="376"/>
<location filename="../glabels/LabelModelBarcodeObject.cpp" line="371"/>
<source>Invalid barcode data</source>
<translation type="unfinished"></translation>
</message>