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.cpp
+5 -5
View File
@@ -22,8 +22,8 @@
#include "LabelModel.h"
#include "Merge/Merge.h"
#include "Merge/MergeNone.h"
#include "Merge/MergeRecord.h"
#include "Merge/None.h"
#include "Merge/Record.h"
#include <QPainter>
#include <QtDebug>
@@ -52,7 +52,7 @@ void PageRenderer::setModel( const LabelModel* model )
mMerge = mModel->merge();
mOrigins = mModel->frame()->getOrigins();
mNLabelsPerPage = mModel->frame()->nLabels();
mIsMerge = ( dynamic_cast<const MergeNone*>(mMerge) == 0 );
mIsMerge = ( dynamic_cast<const merge::None*>(mMerge) == 0 );
updateNPages();
}
@@ -226,7 +226,7 @@ void PageRenderer::printMergePage( QPainter* painter, int iPage ) const
iEnd = mLastLabel % mNLabelsPerPage;
}
const QList<MergeRecord*> records = mMerge->selectedRecords();
const QList<merge::Record*> records = mMerge->selectedRecords();
int iRecord = (iPage*mNLabelsPerPage + iStart - mStartLabel) % records.size();
printCropMarks( painter );
@@ -336,7 +336,7 @@ void PageRenderer::clipLabel( QPainter* painter ) const
}
void PageRenderer::printLabel( QPainter* painter, MergeRecord* record ) const
void PageRenderer::printLabel( QPainter* painter, merge::Record* record ) const
{
painter->save();