Skip to content

Commit db847eb

Browse files
author
ALeSSky
committed
dev: add file dialog for report name
1 parent a4a57be commit db847eb

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

include/IAdapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class IAdapter : public QObject
2222
Q_OBJECT
2323
public:
2424
IAdapter(DataModel* dataModel, QMLAdapter *qmlAdapter, QObject* parent = nullptr);
25-
Q_INVOKABLE void createPDFThreadSafe(const QString& fileName);
25+
Q_INVOKABLE void createPDFThreadSafe();
2626
Q_INVOKABLE void processColorIDFolderThreadSafe(const QString& folderName);
2727
Q_INVOKABLE void processColorIDThreadSafe(const QString& fileName);
2828
signals:

src/IAdapter.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "IAdapter.h"
2+
#include <QFileDialog>
23

34
IAdapter::IAdapter(DataModel *dataModel, QMLAdapter* qmlAdapter, QObject *parent)
45
: QObject(parent),
@@ -11,16 +12,18 @@ IAdapter::IAdapter(DataModel *dataModel, QMLAdapter* qmlAdapter, QObject *parent
1112
connect(this, &IAdapter::chooseMeControlEnabling, _qmlAdapter, &QMLAdapter::onChooseMeControlEnabling, Qt::DirectConnection);
1213
}
1314

14-
void IAdapter::createPDFThreadSafe(const QString &fileName)
15+
void IAdapter::createPDFThreadSafe()
1516
{
17+
QString reportName = QFileDialog::getSaveFileName();
18+
1619
if (thread() == QThread::currentThread())
1720
{
18-
createPDF(fileName);
21+
createPDF(reportName);
1922
}
2023
else
2124
{
2225
QMetaObject::invokeMethod(this, "createPDF", Qt::QueuedConnection,
23-
Q_ARG(QString, fileName));
26+
Q_ARG(QString, reportName));
2427
}
2528
}
2629

@@ -115,6 +118,7 @@ void IAdapter::createPDF(const QString &fileName)
115118
//Printer
116119
QPrinter printer(QPrinter::HighResolution);
117120
printer.setOutputFormat(QPrinter::PdfFormat);
121+
// printer.setOutputFileName(fileName);
118122
printer.setOutputFileName(fileName);
119123
document.print(&printer);
120124
}

src/main.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ApplicationWindow {
3939
}
4040
Menu {
4141
title: qsTr("&Report")
42-
Action { text: qsTr("Export &table"); onTriggered: adapter.createPDFThreadSafe("Report.pdf") }
42+
Action { text: qsTr("Export &table"); onTriggered: adapter.createPDFThreadSafe() }
4343
Action { text: qsTr("Export chart"); enabled: false; }
4444
Action { text: qsTr("Ex&port image"); enabled: false; }
4545
}

0 commit comments

Comments
 (0)