mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-23 20:22:58 +03:00
Group band has been fixed
This commit is contained in:
parent
f64a918ffe
commit
a80a1298eb
@ -724,13 +724,19 @@ void ReportRender::renderGroupHeader(BandDesignIntf *parentBand, IDataSource* da
|
||||
}
|
||||
|
||||
if (gb && !gb->isStarted()){
|
||||
if (band->reprintOnEachPage())
|
||||
if (band->reprintOnEachPage()){
|
||||
m_reprintableBands.append(band);
|
||||
}
|
||||
gb->startGroup(m_datasources);
|
||||
openDataGroup(band);
|
||||
if (!firstTime && gb->startNewPage()){
|
||||
if (gb->resetPageNumber()) resetPageNumber(BandReset);
|
||||
renderBand(band, 0, ForcedStartPage);
|
||||
if (band->reprintOnEachPage()){
|
||||
savePage();
|
||||
startNewPage();
|
||||
} else {
|
||||
renderBand(band, 0, ForcedStartPage);
|
||||
}
|
||||
} else {
|
||||
renderBand(band, 0, StartNewPageAsNeeded);
|
||||
}
|
||||
@ -845,6 +851,14 @@ void ReportRender::closeDataGroup(BandDesignIntf *band)
|
||||
if (groupBand){
|
||||
groupBand->closeGroup();
|
||||
if (band->reprintOnEachPage()) m_reprintableBands.removeOne(band);
|
||||
|
||||
QList<BandDesignIntf*>::Iterator it = m_reprintableBands.begin();
|
||||
while (it != m_reprintableBands.end()){
|
||||
if ((*it)->bandIndex()>band->bandIndex())
|
||||
it = m_reprintableBands.erase(it);
|
||||
else
|
||||
it++;
|
||||
}
|
||||
}
|
||||
closeGroup(band);
|
||||
}
|
||||
@ -1094,7 +1108,6 @@ void ReportRender::startNewPage()
|
||||
m_dataAreaSize = m_maxHeightByColumn[m_currentColumn];
|
||||
m_renderedDataBandCount = 0;
|
||||
|
||||
|
||||
foreach (BandDesignIntf* band, m_reprintableBands) {
|
||||
renderBand(band, 0);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user