UserVariables branch merge

2019-08-21 03:37:56 +01:00
parent 6ab3a12b92 6a789c9632
commit 2444cacb74
92 changed files with 3624 additions and 1283 deletions
@@ -27,6 +27,7 @@
 #include "Handles.h"
 #include "Outline.h"
 #include "TextNode.h"
+#include "Variables.h"

 #include "barcode/Style.h"
 #include "merge/Record.h"
@@ -411,12 +412,24 @@ namespace glabels
 			// Drawing operations
 			///////////////////////////////////////////////////////////////
 		public:
-			void draw( QPainter* painter, bool inEditor, merge::Record* record ) const;
+			void draw( QPainter*      painter,
+			           bool           inEditor,
+			           merge::Record* record,
+			           Variables*     variables ) const;
+			
 			void drawSelectionHighlight( QPainter* painter, double scale ) const;

 		protected:
-			virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
-			virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const = 0;
+			virtual void drawShadow( QPainter*      painter,
+			                         bool           inEditor,
+			                         merge::Record* record,
+			                         Variables*     variables ) const = 0;
+			
+			virtual void drawObject( QPainter*      painter,
+			                         bool           inEditor,
+			                         merge::Record* record,
+			                         Variables*     variables ) const = 0;
+			
 			virtual QPainterPath hoverPath( double scale ) const = 0;

 			virtual void sizeUpdated();