Browse Source

Merge pull request #5543 from DonLakeFlyer/Fixes

Fixes: Mission linux libs, Console save to file
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
bb25081bbe
  1. 2
      QGCSetup.pri
  2. 4
      src/QmlControls/AppMessages.cc
  3. 2
      src/QmlControls/AppMessages.h
  4. 2
      src/QmlControls/AppMessages.qml

2
QGCSetup.pri

@ -114,6 +114,8 @@ LinuxBuild {
libQt5PrintSupport.so.5 \ libQt5PrintSupport.so.5 \
libQt5Qml.so.5 \ libQt5Qml.so.5 \
libQt5Quick.so.5 \ libQt5Quick.so.5 \
libQt5QuickControls2.so.5 \
libQt5QuickTemplates2.so.5 \
libQt5QuickWidgets.so.5 \ libQt5QuickWidgets.so.5 \
libQt5SerialPort.so.5 \ libQt5SerialPort.so.5 \
libQt5Sql.so.5 \ libQt5Sql.so.5 \

4
src/QmlControls/AppMessages.cc

@ -60,14 +60,14 @@ AppLogModel::AppLogModel() : QStringListModel()
connect(this, &AppLogModel::emitLog, this, &AppLogModel::threadsafeLog, contype); connect(this, &AppLogModel::emitLog, this, &AppLogModel::threadsafeLog, contype);
} }
void AppLogModel::writeMessages(const QUrl dest_file) void AppLogModel::writeMessages(const QString dest_file)
{ {
const QString writebuffer(stringList().join('\n').append('\n')); const QString writebuffer(stringList().join('\n').append('\n'));
QtConcurrent::run([dest_file, writebuffer] { QtConcurrent::run([dest_file, writebuffer] {
emit debug_model->writeStarted(); emit debug_model->writeStarted();
bool success = false; bool success = false;
QFile file(dest_file.toLocalFile()); QFile file(dest_file);
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
QTextStream out(&file); QTextStream out(&file);
out << writebuffer; out << writebuffer;

2
src/QmlControls/AppMessages.h

@ -23,7 +23,7 @@ class AppLogModel : public QStringListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
Q_INVOKABLE void writeMessages(const QUrl dest_file); Q_INVOKABLE void writeMessages(const QString dest_file);
static void log(const QString message); static void log(const QString message);
signals: signals:

2
src/QmlControls/AppMessages.qml

@ -118,7 +118,7 @@ QGCView {
selectExisting: false selectExisting: false
title: qsTr("Select log save file") title: qsTr("Select log save file")
onAcceptedForSave: { onAcceptedForSave: {
debugMessageModel.writeMessages(fileUrl); debugMessageModel.writeMessages(file);
visible = false; visible = false;
} }
} }

Loading…
Cancel
Save