Implemented variables in merge print jobs.

2019-03-24 20:22:12 -04:00
parent 37f0a8890d
commit efbb052856
1 changed files with 48 additions and 32 deletions
@@ -294,46 +294,62 @@ namespace glabels
 	
 		void PageRenderer::printMergePage( QPainter* painter, int iPage ) const
 		{
-			int iRecord = 0;
-			int iStart = 0;
-			int iEnd = mNLabelsPerPage;
-
-			if ( iPage == 0 )
-			{
-				iStart = mStartLabel;
-			}
-
-			if ( (mLastLabel / mNLabelsPerPage) == iPage )
-			{
-				iEnd = mLastLabel % mNLabelsPerPage;
-			}
-
-			const QList<merge::Record*> records = mMerge->selectedRecords();
-			if ( records.size() )
-			{
-				iRecord = (iPage*mNLabelsPerPage + iStart - mStartLabel) % records.size();
-			}
-
 			printCropMarks( painter );

-			for ( int i = iStart; i < iEnd; i++ )
+			int iCopy = 0;
+			int iLabel = mStartLabel;
+			int iCurrentPage = 0;
+
+			const QList<merge::Record*> records = mMerge->selectedRecords();
+			int iRecord = 0;
+			int nRecords = records.size();
+
+			if ( nRecords == 0 )
 			{
-				painter->save();
+				return;
+			}
 			
-				painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
+			mVariables->resetVariables();

-				painter->save();
+			while ( (iCopy < mNCopies) && (iCurrentPage <= iPage) )
+			{
+				if ( iCurrentPage == iPage )
+				{
+					int i = iLabel % mNLabelsPerPage;
 					
-				clipLabel( painter );
-				printLabel( painter, records[iRecord], mVariables );
+					painter->save();

-				painter->restore();  // From before clip
+					painter->translate( mOrigins[i].x().pt(), mOrigins[i].y().pt() );
 			
-				printOutline( painter );
+					painter->save();

-				painter->restore();  // From before translation
+					clipLabel( painter );
+					printLabel( painter, records[iRecord], mVariables );

-				iRecord = (iRecord + 1) % records.size();
+					painter->restore();  // From before clip
+
+					printOutline( painter );
+			
+					painter->restore();  // From before translation
+				}
+
+				iRecord = (iRecord + 1) % nRecords;
+				if ( iRecord == 0 )
+				{
+					iCopy++;
+				}
+				iLabel++;
+				iCurrentPage = iLabel / mNLabelsPerPage;
+
+				mVariables->incrementVariablesOnMerge();
+				if ( iRecord == 0 )
+				{
+					mVariables->incrementVariablesOnCopy();
+				}
+				if ( (iLabel % mNLabelsPerPage) == 0 /* starting a new page */ )
+				{
+					mVariables->incrementVariablesOnPage();
+				}
 			}
 		}