From 446d580f13a5acb42faab874b6c507c4124b1999 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sat, 13 May 2017 15:37:16 -0400
Subject: [PATCH] Correctly handle invalid barcode data cases in label editor.

---
 glabels/LabelModelBarcodeObject.cpp | 93 +++++++++++++++--------------
 glabels/LabelModelBarcodeObject.h   |  1 +
 translations/glabels_C.ts           |  4 +-
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/glabels/LabelModelBarcodeObject.cpp b/glabels/LabelModelBarcodeObject.cpp
index a56c6e3..5ef9253 100644
--- a/glabels/LabelModelBarcodeObject.cpp
+++ b/glabels/LabelModelBarcodeObject.cpp
@@ -348,64 +348,33 @@ 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");
-			}
-			else if ( mBcData.hasPlaceHolders() )
-			{
-				text = mBcData.toString();
-			}
-			else
-			{
-				text = tr("Invalid barcode data");
-			}
-
-			painter->setPen( Qt::NoPen );
-			painter->setBrush( QBrush( emptyFillColor ) );
-			painter->drawRect( QRectF( 0, 0, mW.pt(), mH.pt() ) );
-
-			QFont font( "Sans" );
-			font.setPointSizeF( 6 );
-
-			QFontMetricsF fm(font);
-			QRectF textRect = fm.boundingRect( text );
-
-			double wPts = (mW - 2*pad).pt();
-			double hPts = (mH - 2*pad).pt();
-			if ( (wPts < textRect.width()) || (hPts < textRect.height()) )
-			{
-				double scaleX = wPts / textRect.width();
-				double scaleY = hPts / textRect.height();
-				font.setPointSizeF( 6 * std::min( scaleX, scaleY ) );
-			}
-
-			painter->setFont( font );
-			painter->setPen( QPen( color ) );
-			painter->drawText( QRectF( 0, 0, mW.pt(), mH.pt() ),
-			                   Qt::AlignCenter,
-			                   text );
+			drawPlaceHolder( painter, color, tr("Invalid barcode data") );
 		}
 	}
 
 
 	///
-	/// Draw text in final printout or preview
+	/// Draw barcode in final printout or preview
 	///
 	void
 	LabelModelBarcodeObject::drawBc( QPainter*      painter,
@@ -424,4 +393,40 @@ namespace glabels
 		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() ) );
+
+		QFont font( "Sans" );
+		font.setPointSizeF( 6 );
+
+		QFontMetricsF fm(font);
+		QRectF textRect = fm.boundingRect( text );
+
+		double wPts = (mW - 2*pad).pt();
+		double hPts = (mH - 2*pad).pt();
+		if ( (wPts < textRect.width()) || (hPts < textRect.height()) )
+		{
+			double scaleX = wPts / textRect.width();
+			double scaleY = hPts / textRect.height();
+			font.setPointSizeF( 6 * std::min( scaleX, scaleY ) );
+		}
+
+		painter->setFont( font );
+		painter->setPen( QPen( color ) );
+		painter->drawText( QRectF( 0, 0, mW.pt(), mH.pt() ),
+		                   Qt::AlignCenter,
+		                   text );
+	}
+
+	
 } // namespace glabels
diff --git a/glabels/LabelModelBarcodeObject.h b/glabels/LabelModelBarcodeObject.h
index 380e697..fe2779c 100644
--- a/glabels/LabelModelBarcodeObject.h
+++ b/glabels/LabelModelBarcodeObject.h
@@ -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;
 
 	
 
diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts
index eed1e2d..86a9358 100644
--- a/translations/glabels_C.ts
+++ b/translations/glabels_C.ts
@@ -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>