mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-24 16:18:04 +03:00
Code Activity

mixWitPriorPage property has been added to PageItem

Browse Source
This commit is contained in:
Arin Alexander
2021-02-17 21:53:55 +03:00
parent 088a6eadce
commit 38e698fc21
7 changed files with 72 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
limereport/lrreportengine.cpp
View File

@@ -1321,7 +1321,11 @@ ReportPages ReportEnginePrivate::renderToPages()
PageItemDesignIntf* page = m_renderingPages.at(i);
if (!page->isTOC() && page->isPrintable()){
page->setReportSettings(&m_reportSettings);
result.append(m_reportRender->renderPageToPages(page));
result = appendPages(
result,
m_reportRender->renderPageToPages(page),
page->mixWithPriorPage() ? MixPages : AppendPages
);
} else {
startTOCPage = result.count();
pageAfterTOCIndex = i+1;
@@ -1347,7 +1351,11 @@ ReportPages ReportEnginePrivate::renderToPages()
}
} else {
result.append(m_reportRender->renderPageToPages(page));
result = appendPages(
result,
m_reportRender->renderPageToPages(page),
page->mixWithPriorPage() ? MixPages : AppendPages
);
}
}
}
@@ -1369,6 +1377,23 @@ ReportPages ReportEnginePrivate::renderToPages()
}
}
ReportPages ReportEnginePrivate::appendPages(ReportPages s1, ReportPages s2, AppendType appendType)
{
if (!s1.isEmpty()>0 && s1.size() == s2.size() && appendType == MixPages){
ReportPages result;
ReportPages::Iterator s1It;
ReportPages::Iterator s2It;
for (s1It = s1.begin(), s2It = s2.begin(); s1It != s1.end(); ++s1It,++s2It){
result.append(*s1It);
result.append(*s2It);
}
return result;
} else {
s1.append(s2);
return s1;
}
}
QString ReportEnginePrivate::lastError()
{
return m_lastError;