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
@@ -66,7 +66,7 @@ namespace glabels
 		///
 		/// Expand all place holders
 		///
-		QString RawText::expand( merge::Record* record ) const
+		QString RawText::expand( merge::Record* record, Variables* variables ) const
 		{
 			QString text;
 		
@@ -74,7 +74,7 @@ namespace glabels
 			{
 				if ( token.isField )
 				{
-					text += token.field.evaluate( record );
+					text += token.field.evaluate( record, variables );
 				}
 				else
 				{