Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Moved Merge subsystem into merge namespace.

Browse Source
This commit is contained in:
Jim Evins
2016-05-22 14:38:59 -04:00
parent b1e7a6507c
commit c7f02f027a
34 changed files with 1434 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/LabelModelObject.h
+4 -4
View File
@@ -27,6 +27,7 @@
#include <QPainter>
#include "libglabels/Distance.h"
#include "Merge/Record.h"
#include "ColorNode.h"
#include "TextNode.h"
#include "BarcodeStyle.h"
@@ -36,7 +37,6 @@
// Forward References
class LabelRegion;
class MergeRecord;
///
@@ -338,12 +338,12 @@ public:
// Drawing operations
///////////////////////////////////////////////////////////////
public:
void draw( QPainter* painter, bool inEditor, MergeRecord* record ) const;
void draw( QPainter* painter, bool inEditor, merge::Record* record ) const;
void drawSelectionHighlight( QPainter* painter, double scale ) const;
protected:
virtual void drawShadow( QPainter* painter, bool inEditor, MergeRecord* record ) const = 0;
virtual void drawObject( QPainter* painter, bool inEditor, MergeRecord* record ) const = 0;
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 QPainterPath hoverPath( double scale ) const = 0;