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

TableBuilder has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2020-06-04 21:58:33 +03:00
parent d734b584f3
commit 9aadc5b077
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -133,7 +133,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 57 LIMEREPORT_VERSION_RELEASE = 58
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

5
limereport/lrscriptenginemanager.cpp
View File

@ -1937,7 +1937,10 @@ bool DatasourceFunctions::invalidate(const QString& datasourceName)
QObject* DatasourceFunctions::createTableBuilder(QObject* horizontalLayout) QObject* DatasourceFunctions::createTableBuilder(QObject* horizontalLayout)
{ {
return new TableBuilder(dynamic_cast<LimeReport::HorizontalLayout*>(horizontalLayout), dynamic_cast<DataSourceManager*>(m_dataManager)); LimeReport::HorizontalLayout* l = dynamic_cast<LimeReport::HorizontalLayout*>(horizontalLayout);
if (l)
return new TableBuilder(l, m_dataManager);
return 0;
} }
TableBuilder::TableBuilder(HorizontalLayout* layout, DataSourceManager* dataManager) TableBuilder::TableBuilder(HorizontalLayout* layout, DataSourceManager* dataManager)

4
limereport/lrscriptenginemanager.h
View File

@ -332,7 +332,7 @@ class DatasourceFunctions : public QObject{
Q_OBJECT Q_OBJECT
public: public:
explicit DatasourceFunctions(IDataSourceManager* dataManager) explicit DatasourceFunctions(IDataSourceManager* dataManager)
: m_dataManager(dataManager){} : m_dataManager(dynamic_cast<DataSourceManager*>(dataManager)){}
Q_INVOKABLE bool first(const QString& datasourceName); Q_INVOKABLE bool first(const QString& datasourceName);
Q_INVOKABLE bool next(const QString& datasourceName); Q_INVOKABLE bool next(const QString& datasourceName);
Q_INVOKABLE bool prior(const QString& datasourceName); Q_INVOKABLE bool prior(const QString& datasourceName);
@ -340,7 +340,7 @@ public:
Q_INVOKABLE bool invalidate(const QString& datasourceName); Q_INVOKABLE bool invalidate(const QString& datasourceName);
Q_INVOKABLE QObject *createTableBuilder(QObject *horizontalLayout); Q_INVOKABLE QObject *createTableBuilder(QObject *horizontalLayout);
private: private:
IDataSourceManager* m_dataManager; DataSourceManager* m_dataManager;
}; };
class ScriptFunctionsManager : public QObject{ class ScriptFunctionsManager : public QObject{