0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-26 01:24:39 +03:00

Finish 1.4.35

This commit is contained in:
Arin Alexander 2017-07-21 20:35:50 +03:00
commit fa876aa815
2 changed files with 9 additions and 0 deletions

View File

@ -226,6 +226,8 @@ DataSourceManager::DataSourceManager(QObject *parent) :
m_groupFunctionFactory.registerFunctionCreator(QLatin1String("MAX"),new ConstructorGroupFunctionCreator<MaxGroupFunction>); m_groupFunctionFactory.registerFunctionCreator(QLatin1String("MAX"),new ConstructorGroupFunctionCreator<MaxGroupFunction>);
setSystemVariable(QLatin1String("#PAGE"),1,FirstPass); setSystemVariable(QLatin1String("#PAGE"),1,FirstPass);
setSystemVariable(QLatin1String("#PAGE_COUNT"),0,SecondPass); setSystemVariable(QLatin1String("#PAGE_COUNT"),0,SecondPass);
setSystemVariable(QLatin1String("#IS_LAST_PAGEFOOTER"),false,FirstPass);
setSystemVariable(QLatin1String("#IS_FIRST_PAGEFOOTER"),false,FirstPass);
m_datasourcesModel.setDataSourceManager(this); m_datasourcesModel.setDataSourceManager(this);
} }

View File

@ -282,6 +282,8 @@ void ReportRender::initVariables()
{ {
m_datasources->setReportVariable("#PAGE",1); m_datasources->setReportVariable("#PAGE",1);
m_datasources->setReportVariable("#PAGE_COUNT",0); m_datasources->setReportVariable("#PAGE_COUNT",0);
m_datasources->setReportVariable("#IS_LAST_PAGEFOOTER",false);
m_datasources->setReportVariable("#IS_FIRST_PAGEFOOTER",false);
} }
void ReportRender::clearPageMap() void ReportRender::clearPageMap()
@ -1257,6 +1259,11 @@ void ReportRender::moveTearOffBand(){
void ReportRender::savePage(bool isLast) void ReportRender::savePage(bool isLast)
{ {
m_datasources->setReportVariable("#IS_LAST_PAGEFOOTER",isLast);
m_datasources->setReportVariable("#IS_FISRT_PAGEFOOTER",m_datasources->variable("#PAGE").toInt()==1);
renderPageItems(m_patternPageItem); renderPageItems(m_patternPageItem);
checkFooterGroup(m_lastDataBand); checkFooterGroup(m_lastDataBand);
cutGroups(); cutGroups();