mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander 2016-06-25 00:33:44 +04:00
commit b55582fad2
17 changed files with 233 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/lrglobal.cpp
View File

@ -31,10 +31,24 @@
#include <QDebug>
#include "lrglobal.h"
QString LimeReport::extractClassName(QString className)
namespace LimeReport {
QString extractClassName(QString className)
{
int startPos=className.lastIndexOf("::");
if(startPos==-1) startPos=0;
else startPos+=2;
return className.right(className.length()-startPos);
}
bool ReportSettings::suppressAbsentFieldsAndVarsWarnings() const
{
return m_suppressAbsentFieldsAndVarsWarnings;
}
void ReportSettings::setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings)
{
m_suppressAbsentFieldsAndVarsWarnings = suppressAbsentFieldsAndVarsWarnings;
}
} //namespace LimeReport

10
include/lrglobal.h
View File

@ -84,6 +84,16 @@ namespace Const{
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
};
class ReportSettings{
public:
ReportSettings():m_suppressAbsentFieldsAndVarsWarnings(false){}
void setDefaultValues(){m_suppressAbsentFieldsAndVarsWarnings = false;}
bool suppressAbsentFieldsAndVarsWarnings() const;
void setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings);
private:
bool m_suppressAbsentFieldsAndVarsWarnings;
};
} // namespace LimeReport

17
limereport/lrbasedesignintf.cpp
View File

@ -75,7 +75,8 @@ BaseDesignIntf::BaseDesignIntf(const QString &storageTypeName, QObject *owner, Q
m_margin(4),
m_itemAlign(DesignedItemAlign),
m_changingItemAlign(false),
m_borderColor(Qt::black)
m_borderColor(Qt::black),
m_reportSettings(0)
{
setGeometry(QRectF(0, 0, m_width, m_height));
if (BaseDesignIntf *item = dynamic_cast<BaseDesignIntf *>(parent)) {
@ -626,6 +627,19 @@ void BaseDesignIntf::turnOnSelectionMarker(bool value)
}
}
ReportSettings *BaseDesignIntf::reportSettings() const
{
return m_reportSettings;
}
void BaseDesignIntf::setReportSettings(ReportSettings *reportSettings)
{
m_reportSettings = reportSettings;
foreach(BaseDesignIntf* child, childBaseItems()){
child->setReportSettings(reportSettings);
}
}
QColor BaseDesignIntf::borderColor() const
{
return m_borderColor;
@ -1187,6 +1201,7 @@ BaseDesignIntf *BaseDesignIntf::cloneItemWOChild(ItemMode mode, QObject *owner,
clone->setObjectName(this->objectName());
clone->setItemMode(mode);
clone->objectLoadStarted();
clone->setReportSettings(this->reportSettings());
for (int i = 0; i < clone->metaObject()->propertyCount(); i++) {
if (clone->metaObject()->property(i).isWritable())
clone->setProperty(clone->metaObject()->property(i).name(), property(clone->metaObject()->property(i).name()));

5
limereport/lrbasedesignintf.h
View File

@ -245,7 +245,9 @@ public:
QColor borderColor() const;
void setBorderColor(const QColor &borderColor);
void setItemVisible(const bool& value);
virtual bool canContainChildren(){ return false;}
virtual bool canContainChildren(){ return false;}
ReportSettings* reportSettings() const;
void setReportSettings(ReportSettings *reportSettings);
protected:
//ICollectionContainer
@ -347,6 +349,7 @@ private:
ItemAlign m_itemAlign;
bool m_changingItemAlign;
QColor m_borderColor;
ReportSettings* m_reportSettings;
signals:
void geometryChanged(QObject* object, QRectF newGeometry, QRectF oldGeometry);
void posChanged(QObject* object, QPointF newPos, QPointF oldPos);

7
limereport/lrdatasourcemanager.cpp
View File

@ -323,13 +323,16 @@ QSharedPointer<QAbstractItemModel>DataSourceManager::previewSQL(const QString &c
query.exec();
model->setQuery(query);
m_lastError = model->lastError().text();
putError(m_lastError);
if (model->query().isActive())
return QSharedPointer<QAbstractItemModel>(model);
else
return QSharedPointer<QAbstractItemModel>(0);
}
if (!db.isOpen())
if (!db.isOpen()){
m_lastError = tr("Connection \"%1\" is not open").arg(connectionName);
putError(m_lastError);
}
return QSharedPointer<QAbstractItemModel>(0);
}
@ -657,7 +660,7 @@ void DataSourceManager::putProxyDesc(ProxyDesc *proxyDesc)
bool DataSourceManager::connectConnection(ConnectionDesc *connectionDesc)
{
bool connected = false;
clearErrorsList();
clearErrors();
QString lastError ="";
foreach(QString datasourceName, dataSourceNames()){

2
limereport/lrdatasourcemanager.h
View File

@ -178,7 +178,7 @@ public:
QString lastError() const { return m_lastError;}
void putError(QString error){ if (!m_errorsList.contains(error)) m_errorsList.append(error);}
void clearErrorsList(){ m_errorsList.clear();}
void clearErrors(){ m_errorsList.clear(); m_lastError = "";}
QStringList errorsList(){ return m_errorsList;}
bool designTime() const;
void setDesignTime(bool designTime);

16
limereport/lrglobal.cpp
View File

@ -31,10 +31,24 @@
#include <QDebug>
#include "lrglobal.h"
QString LimeReport::extractClassName(QString className)
namespace LimeReport {
QString extractClassName(QString className)
{
int startPos=className.lastIndexOf("::");
if(startPos==-1) startPos=0;
else startPos+=2;
return className.right(className.length()-startPos);
}
bool ReportSettings::suppressAbsentFieldsAndVarsWarnings() const
{
return m_suppressAbsentFieldsAndVarsWarnings;
}
void ReportSettings::setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings)
{
m_suppressAbsentFieldsAndVarsWarnings = suppressAbsentFieldsAndVarsWarnings;
}
} //namespace LimeReport

10
limereport/lrglobal.h
View File

@ -84,6 +84,16 @@ namespace Const{
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
};
class ReportSettings{
public:
ReportSettings():m_suppressAbsentFieldsAndVarsWarnings(false){}
void setDefaultValues(){m_suppressAbsentFieldsAndVarsWarnings = false;}
bool suppressAbsentFieldsAndVarsWarnings() const;
void setSuppressAbsentFieldsAndVarsWarnings(bool suppressAbsentFieldsAndVarsWarnings);
private:
bool m_suppressAbsentFieldsAndVarsWarnings;
};
} // namespace LimeReport

22
limereport/lritemdesignintf.cpp
View File

@ -149,14 +149,12 @@ QString ContentItemDesignIntf::expandDataFields(QString context, ExpandType expa
context.replace(rx.cap(0),fieldValue);
} else {
QString error;
if (dataManager->lastError().isEmpty()){
error = QString("Field %1 not found in %2 !!! ").arg(field).arg(this->objectName());
dataManager->putError(error);
} else {
error = dataManager->lastError();
}
context.replace(rx.cap(0),error);
QString error = QString("Field %1 not found in %2 !!! ").arg(field).arg(this->objectName());
dataManager->putError(error);
if (!reportSettings() || !reportSettings()->suppressAbsentFieldsAndVarsWarnings())
context.replace(rx.cap(0),error);
else
context.replace(rx.cap(0),"");
}
}
}
@ -188,7 +186,13 @@ QString ContentItemDesignIntf::expandUserVariables(QString context, RenderPass p
pos=0;
}
} else {
context.replace(rx.cap(0),tr("Variable %1 not found").arg(variable));
QString error;
error = tr("Variable %1 not found").arg(variable);
dataManager->putError(error);
if (!reportSettings() || reportSettings()->suppressAbsentFieldsAndVarsWarnings())
context.replace(rx.cap(0),error);
else
context.replace(rx.cap(0),"");
}
}
}

14
limereport/lrpagedesignintf.cpp
View File

@ -92,7 +92,8 @@ PageDesignIntf::PageDesignIntf(QObject *parent):
m_multiSelectStarted(false),
m_movedItem(0),
m_joinItem(0),
m_magneticMovement(false)
m_magneticMovement(false),
m_reportSettings(0)
{
m_reportEditor = dynamic_cast<ReportEnginePrivate *>(parent);
updatePageRect();
@ -1044,6 +1045,17 @@ void PageDesignIntf::changeSelectedGroupProperty(const QString &name, const QVar
}
}
ReportSettings *PageDesignIntf::getReportSettings() const
{
return m_reportSettings;
}
void PageDesignIntf::setReportSettings(ReportSettings *reportSettings)
{
m_reportSettings = reportSettings;
m_pageItem->setReportSettings(m_reportSettings);
}
bool PageDesignIntf::magneticMovement() const
{
return m_magneticMovement;

4
limereport/lrpagedesignintf.h
View File

@ -179,6 +179,9 @@ namespace LimeReport {
bool magneticMovement() const;
void setMagneticMovement(bool magneticMovement);
ReportSettings *getReportSettings() const;
void setReportSettings(ReportSettings *reportSettings);
protected:
virtual void keyPressEvent(QKeyEvent *event);
@ -310,6 +313,7 @@ namespace LimeReport {
BaseDesignIntf* m_joinItem;
JoinType m_joinType;
bool m_magneticMovement;
ReportSettings* m_reportSettings;
};
class AbstractPageCommand : public CommandIf{

2
limereport/lrreportdesignwidget.cpp
View File

@ -506,11 +506,13 @@ void ReportDesignWidget::editSetting()
setting.setVerticalGridStep(m_verticalGridStep);
setting.setHorizontalGridStep(m_horizontalGridStep);
setting.setDefaultFont(m_defaultFont);
setting.setSuppressAbsentFieldsAndVarsWarnings(m_report->suppressFieldAndVarError());
if (setting.exec()){
m_horizontalGridStep = setting.horizontalGridStep();
m_verticalGridStep = setting.verticalGridStep();
m_defaultFont = setting.defaultFont();
m_report->setSuppressFieldAndVarError(setting.suppressAbsentFieldsAndVarsWarnings());
applySettings();
}
}

16
limereport/lrreportengine.cpp
View File

@ -94,6 +94,7 @@ PageDesignIntf *ReportEnginePrivate::createPage(const QString &pageName)
PageDesignIntf* page =new PageDesignIntf();
page->setObjectName(pageName);
page->setReportEditor(this);
page->setReportSettings(&m_reportSettings);
return page;
}
@ -129,6 +130,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);
@ -165,6 +167,7 @@ void ReportEnginePrivate::clearReport()
m_datasources->clear(DataSourceManager::Owned);
m_fileName="";
m_scriptEngineContext->clear();
m_reportSettings.setDefaultValues();
emit cleared();
}
@ -614,6 +617,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;
@ -637,7 +650,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)),
@ -649,6 +662,7 @@ ReportPages ReportEnginePrivate::renderToPages()
m_reportRender->setScriptContext(scriptContext());
foreach(PageDesignIntf* page , m_pages){
m_pages.at(0)->setReportSettings(&m_reportSettings);
result.append(m_reportRender->renderPageToPages(page));
}
emit renderFinished();

5
limereport/lrreportengine_p.h
View File

@ -57,6 +57,7 @@ class ReportEnginePrivate : public QObject, public ICollectionContainer
Q_PROPERTY(ACollectionProperty pages READ fakeCollectionReader())
Q_PROPERTY(QObject* datasourcesManager READ dataManager)
Q_PROPERTY(QObject* scriptContext READ scriptContext)
Q_PROPERTY(bool suppressFieldAndVarError READ suppressFieldAndVarError WRITE setSuppressFieldAndVarError)
friend class PreviewReportWidget;
public:
static void printReport(ItemsReaderIntf::Ptr reader, QPrinter &printer);
@ -118,6 +119,9 @@ public:
QString previewWindowTitle() const;
void setPreviewWindowTitle(const QString &previewWindowTitle);
bool suppressFieldAndVarError() const;
void setSuppressFieldAndVarError(bool suppressFieldAndVarError);
signals:
void pagesLoadFinished();
void datasourceCollectionLoadFinished(const QString& collectionName);
@ -165,6 +169,7 @@ private:
QIcon m_previewWindowIcon;
QString m_previewWindowTitle;
QPointer<ReportDesignWindow> m_designerWindow;
ReportSettings m_reportSettings;
};
}

9
limereport/lrsettingdialog.cpp
View File

@ -32,6 +32,15 @@ QFont SettingDialog::defaultFont()
return result;
}
bool SettingDialog::suppressAbsentFieldsAndVarsWarnings()
{
return ui->cbSuppressWarnings->isChecked();
}
void SettingDialog::setSuppressAbsentFieldsAndVarsWarnings(bool value){
ui->cbSuppressWarnings->setChecked(value);
}
void SettingDialog::setHorizontalGridStep(int value)
{
ui->horizontalGridStep->setValue(value);

2
limereport/lrsettingdialog.h
View File

@ -19,6 +19,8 @@ public:
int verticalGridStep();
int horizontalGridStep();
QFont defaultFont();
bool suppressAbsentFieldsAndVarsWarnings();
void setSuppressAbsentFieldsAndVarsWarnings(bool value);
void setHorizontalGridStep(int value);
void setVerticalGridStep(int value);
void setDefaultFont(const QFont& value);

163
limereport/lrsettingdialog.ui
View File

@ -7,97 +7,122 @@
<x>0</x>
<y>0</y>
<width>351</width>
<height>185</height>
<height>318</height>
</rect>
</property>
<property name="windowTitle">
<string>Designer setting</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Default font</string>
</property>
</widget>
</item>
<item>
<widget class="QFontComboBox" name="defaultFont"/>
</item>
<item>
<widget class="QSpinBox" name="defaultFontSize">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Grid</string>
<string>Designer Setting</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Vertical grid step</string>
<string>Default font</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="verticalGridStep">
<item>
<widget class="QFontComboBox" name="defaultFont"/>
</item>
<item>
<widget class="QSpinBox" name="defaultFontSize">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Horizontal grid step</string>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="horizontalGridStep">
<property name="value">
<number>10</number>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Grid</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>73</width>
<height>20</height>
</size>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Vertical grid step</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="verticalGridStep">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Horizontal grid step</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="horizontalGridStep">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>73</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Report Setting</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="cbSuppressWarnings">
<property name="text">
<string>Suppress absent fields and variables warning</string>
</property>
</spacer>
</widget>
</item>
</layout>
</widget>
@ -153,8 +178,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>221</x>
<y>307</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@ -169,8 +194,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>221</x>
<y>307</y>
</hint>
<hint type="destinationlabel">
<x>286</x>