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/PageRenderer.h
+6 -5
View File
@@ -24,14 +24,15 @@
#include "libglabels/Point.h"
#include "Merge/Merge.h"
#include "Merge/Record.h"
#include <QVector>
#include <QRect>
// Forward references
class QPainter;
class LabelModel;
class Merge;
class MergeRecord;
///
@@ -74,15 +75,15 @@ private:
void printCropMarks( QPainter* painter ) const;
void printOutline( QPainter* painter ) const;
void clipLabel( QPainter* painter ) const;
void printLabel( QPainter* painter, MergeRecord* record ) const;
void printLabel( QPainter* painter, merge::Record* record ) const;
/////////////////////////////////
// Private Data
/////////////////////////////////
private:
const LabelModel* mModel;
const Merge* mMerge;
const LabelModel* mModel;
const merge::Merge* mMerge;
int mNCopies;
int mStartLabel;