ReportSettings have been added to report items

This commit is contained in:
Arin Alex
2016-06-24 23:15:59 +03:00
parent 779eefcab5
commit ac98da1394
6 changed files with 57 additions and 4 deletions

View File

@@ -93,6 +93,7 @@ PageDesignIntf *ReportEnginePrivate::createPage(const QString &pageName)
PageDesignIntf* page =new PageDesignIntf();
page->setObjectName(pageName);
page->setReportEditor(this);
page->setReportSettings(&m_reportSettings);
return page;
}
@@ -117,6 +118,7 @@ void ReportEnginePrivate::collectionLoadFinished(const QString &)
{
foreach (PageDesignIntf* page, m_pages) {
page->setReportEditor(this);
page->setReportSettings(&m_reportSettings);
page->setSceneRect(-Const::SCENE_MARGIN,-Const::SCENE_MARGIN,
page->pageItem()->width()+Const::SCENE_MARGIN*2,
page->pageItem()->height()+Const::SCENE_MARGIN*2);
@@ -152,6 +154,7 @@ void ReportEnginePrivate::clearReport()
m_pages.clear();
m_datasources->clear(DataSourceManager::Owned);
m_fileName="";
m_reportSettings.setDefaultValues();
emit cleared();
}
@@ -559,6 +562,16 @@ QString ReportEnginePrivate::renderToString()
}else return QString();
}
bool ReportEnginePrivate::suppressFieldAndVarError() const
{
return m_reportSettings.suppressAbsentFieldsAndVarsWarnings();
}
void ReportEnginePrivate::setSuppressFieldAndVarError(bool suppressFieldAndVarError)
{
m_reportSettings.setSuppressAbsentFieldsAndVarsWarnings(suppressFieldAndVarError);
}
QString ReportEnginePrivate::previewWindowTitle() const
{
return m_previewWindowTitle;
@@ -582,7 +595,7 @@ void ReportEnginePrivate::setPreviewWindowIcon(const QIcon &previewWindowIcon)
ReportPages ReportEnginePrivate::renderToPages()
{
m_reportRender = ReportRender::Ptr(new ReportRender);
dataManager()->clearErrorsList();
dataManager()->clearErrors();
dataManager()->connectAllDatabases();
dataManager()->setDesignTime(false);
connect(m_reportRender.data(),SIGNAL(pageRendered(int)),
@@ -590,6 +603,7 @@ ReportPages ReportEnginePrivate::renderToPages()
if (m_pages.count()){
emit renderStarted();
m_reportRender->setDatasources(dataManager());
m_pages.at(0)->setReportSettings(&m_reportSettings);
ReportPages result = m_reportRender->renderPageToPages(m_pages.at(0));
emit renderFinished();
return result;