mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-11 17:18:10 +03:00
Code

Finish 1.4.60

Browse Source 
# Conflicts:
#	limereport/lrreportrender.cpp
#	limereport/lrreportrender.h
This commit is contained in:
Arin Alexander 2018-01-18 22:01:24 +03:00
commit 576ebf11ec
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/lrreportrender.cpp
View File

@ -147,7 +147,7 @@ void ReportRender::renameChildItems(BaseDesignIntf *item){
ReportRender::ReportRender(QObject *parent) ReportRender::ReportRender(QObject *parent)
:QObject(parent), m_renderPageItem(0), m_pageCount(0), :QObject(parent), m_renderPageItem(0), m_pageCount(0),
m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0), m_renderingFirstTOC(false) m_lastDataBand(0), m_lastRenderedFooter(0), m_currentColumn(0), m_newPageStarted(false), m_renderingFirstTOC(false)
{ {
initColumns(); initColumns();
} }
@ -557,6 +557,7 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
renderBand(header, 0, StartNewPageAsNeeded); renderBand(header, 0, StartNewPageAsNeeded);
renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext()); renderBand(dataBand, rawData, StartNewPageAsNeeded, !bandDatasource->hasNext());
m_newPageStarted = false;
renderChildBands(dataBand); renderChildBands(dataBand);
} }
@ -770,7 +771,7 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
gb->startGroup(m_datasources); gb->startGroup(m_datasources);
openDataGroup(band); openDataGroup(band);
BandDesignIntf* renderedHeader = 0; BandDesignIntf* renderedHeader = 0;
if (!firstTime && gb->startNewPage()){ if (!firstTime && gb->startNewPage() && !m_newPageStarted){
if (gb->resetPageNumber()) resetPageNumber(BandReset); if (gb->resetPageNumber()) resetPageNumber(BandReset);
if (band->reprintOnEachPage()){ if (band->reprintOnEachPage()){
savePage(); savePage();
@ -1164,8 +1165,9 @@ void ReportRender::startNewColumn(){
void ReportRender::startNewPage(bool isFirst) void ReportRender::startNewPage(bool isFirst)
{ {
m_renderPageItem=0; m_renderPageItem = 0;
m_currentColumn=0; m_currentColumn = 0;
m_newPageStarted = true;
initColumns(); initColumns();
initRenderPage(); initRenderPage();

1
limereport/lrreportrender.h
View File

@ -191,6 +191,7 @@ private:
QList<PagesRange> m_ranges; QList<PagesRange> m_ranges;
QVector<BandDesignIntf*> m_columnedBandItems; QVector<BandDesignIntf*> m_columnedBandItems;
unsigned long long m_curentNameIndex; unsigned long long m_curentNameIndex;
bool m_newPageStarted;
bool m_renderingFirstTOC; bool m_renderingFirstTOC;
}; };
} // namespace LimeReport } // namespace LimeReport