python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-09 05:57:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander
2016-07-21 00:15:04 +03:00
parent 378ed68ec1 942dc47b8f
commit fe67575691
8 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
limereport/lrreportrender.cpp
View File

@@ -404,12 +404,18 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
if (dataBand && !dataBand->datasourceName().isEmpty())
bandDatasource = datasources()->dataSource(dataBand->datasourceName());
BandDesignIntf* header = dataBand->bandHeader();
BandDesignIntf* footer = dataBand->bandFooter();
if (header && header->printAlways()) renderBand(header);
if(bandDatasource && !bandDatasource->eof() && !m_renderCanceled){
QString varName = QLatin1String("line_")+dataBand->objectName().toLower();
datasources()->setReportVariable(varName,1);
renderBand(dataBand->bandHeader());
if (header && !header->printAlways())
renderBand(header);
if (dataBand->bandHeader() && dataBand->bandHeader()->reprintOnEachPage())
m_reprintableBands.append(dataBand->bandHeader());
@@ -456,11 +462,17 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
renderGroupFooter(dataBand);
renderBand(dataBand->bandFooter(),StartNewPageAsNeeded);
if (footer && !footer->printAlways())
renderBand(footer,StartNewPageAsNeeded);
datasources()->deleteVariable(varName);
} else if (bandDatasource==0) {
renderBand(dataBand,StartNewPageAsNeeded);
}
if (footer && footer->printAlways())
renderBand(footer,StartNewPageAsNeeded);
}
void ReportRender::renderPageHeader(PageItemDesignIntf *patternPage)