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
@@ -103,7 +103,10 @@ namespace glabels
 		///
 		/// Draw shadow of object
 		///
-		void ModelEllipseObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+		void ModelEllipseObject::drawShadow( QPainter*      painter,
+		                                     bool           inEditor,
+		                                     merge::Record* record,
+		                                     Variables*     variables ) const
 		{
 			QColor lineColor = mLineColorNode.color( record );
 			QColor fillColor = mFillColorNode.color( record );
@@ -148,7 +151,10 @@ namespace glabels
 		///
 		/// Draw object itself
 		///
-		void ModelEllipseObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+		void ModelEllipseObject::drawObject( QPainter*      painter,
+		                                     bool           inEditor,
+		                                     merge::Record* record,
+		                                     Variables*     variables ) const
 		{
 			QColor lineColor = mLineColorNode.color( record );
 			QColor fillColor = mFillColorNode.color( record );