Implemented variable substitution in simple print jobs.

2019-03-24 17:49:41 -04:00
parent dedbe07312
commit 37f0a8890d
34 changed files with 524 additions and 193 deletions
@@ -395,7 +395,10 @@ namespace glabels
 		///
 		/// Draw shadow of object
 		///
-		void ModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		void ModelImageObject::drawShadow( QPainter*      painter,
+		                                   bool           inEditor,
+		                                   merge::Record* record,
+		                                   Variables*     variables ) const
 		{
 			QRectF destRect( 0, 0, mW.pt(), mH.pt() );
 	
@@ -424,7 +427,10 @@ namespace glabels
 		///
 		/// Draw object itself
 		///
-		void ModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		void ModelImageObject::drawObject( QPainter*      painter,
+		                                   bool           inEditor,
+		                                   merge::Record* record,
+		                                   Variables*     variables ) const
 		{
 			QRectF destRect( 0, 0, mW.pt(), mH.pt() );