mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Merge branch 'master' into 1.4
# Conflicts: # limereport/lrreportrender.cpp
This commit is contained in:
commit
2b63fa1149
@ -183,6 +183,16 @@ void ReportRender::initDatasources(){
|
||||
}
|
||||
}
|
||||
|
||||
void ReportRender::initDatasource(const QString& name){
|
||||
try{
|
||||
if (datasources()->containsDatasource(name))
|
||||
datasources()->dataSource(name)->first();
|
||||
} catch(ReportError &exception){
|
||||
QMessageBox::critical(0,tr("Error"),exception.what());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void ReportRender::renderPage(PageDesignIntf* patternPage)
|
||||
{
|
||||
m_curentNameIndex = 0;
|
||||
@ -222,7 +232,7 @@ void ReportRender::renderPage(PageDesignIntf* patternPage)
|
||||
BandDesignIntf* lastRenderedBand = 0;
|
||||
for (int i=0;i<m_patternPageItem->dataBandCount() && !m_renderCanceled;i++){
|
||||
lastRenderedBand = m_patternPageItem->dataBandAt(i);
|
||||
initDatasources();
|
||||
initDatasource(lastRenderedBand->datasourceName());
|
||||
renderDataBand(lastRenderedBand);
|
||||
if (i<m_patternPageItem->dataBandCount()-1) closeFooterGroup(lastRenderedBand);
|
||||
}
|
||||
|
@ -88,6 +88,7 @@ public slots:
|
||||
private:
|
||||
void renderPage(PageDesignIntf *patternPage);
|
||||
void initDatasources();
|
||||
void initDatasource(const QString &name);
|
||||
void initRenderPage();
|
||||
#ifdef HAVE_UI_LOADER
|
||||
void initDialogs();
|
||||
@ -177,6 +178,7 @@ private:
|
||||
QList<PagesRange> m_ranges;
|
||||
QVector<BandDesignIntf*> m_columnedBandItems;
|
||||
unsigned long long m_curentNameIndex;
|
||||
|
||||
};
|
||||
} // namespace LimeReport
|
||||
#endif // LRREPORTRENDER_H
|
||||
|
Loading…
Reference in New Issue
Block a user