Commit 4e772301 authored by Don Gagne's avatar Don Gagne

Onboard Files is PX4 only

parent 2c1e6a37
...@@ -24,31 +24,37 @@ ...@@ -24,31 +24,37 @@
#include "QGCUASFileView.h" #include "QGCUASFileView.h"
#include "FileManager.h" #include "FileManager.h"
#include "QGCFileDialog.h" #include "QGCFileDialog.h"
#include "UAS.h"
#include <QFileDialog> #include <QFileDialog>
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
QGCUASFileView::QGCUASFileView(QWidget *parent, FileManager *manager) : QGCUASFileView::QGCUASFileView(QWidget *parent, Vehicle* vehicle)
QWidget(parent), : QWidget(parent)
_manager(manager), , _manager(vehicle->uas()->getFileManager())
_currentCommand(commandNone) , _currentCommand(commandNone)
{ {
_ui.setupUi(this); _ui.setupUi(this);
_ui.progressBar->reset();
// Connect UI signals
connect(_ui.listFilesButton, &QPushButton::clicked, this, &QGCUASFileView::_refreshTree);
connect(_ui.downloadButton, &QPushButton::clicked, this, &QGCUASFileView::_downloadFile);
connect(_ui.uploadButton, &QPushButton::clicked, this, &QGCUASFileView::_uploadFile);
connect(_ui.treeWidget, &QTreeWidget::currentItemChanged, this, &QGCUASFileView::_currentItemChanged);
// Connect signals from FileManager if (vehicle->px4Firmware()) {
connect(_manager, &FileManager::commandProgress, this, &QGCUASFileView::_commandProgress); _ui.progressBar->reset();
connect(_manager, &FileManager::commandComplete, this, &QGCUASFileView::_commandComplete);
connect(_manager, &FileManager::commandError, this, &QGCUASFileView::_commandError); // Connect UI signals
connect(_manager, &FileManager::listEntry, this, &QGCUASFileView::_listEntryReceived); connect(_ui.listFilesButton, &QPushButton::clicked, this, &QGCUASFileView::_refreshTree);
connect(_ui.downloadButton, &QPushButton::clicked, this, &QGCUASFileView::_downloadFile);
connect(_ui.uploadButton, &QPushButton::clicked, this, &QGCUASFileView::_uploadFile);
connect(_ui.treeWidget, &QTreeWidget::currentItemChanged, this, &QGCUASFileView::_currentItemChanged);
// Connect signals from FileManager
connect(_manager, &FileManager::commandProgress, this, &QGCUASFileView::_commandProgress);
connect(_manager, &FileManager::commandComplete, this, &QGCUASFileView::_commandComplete);
connect(_manager, &FileManager::commandError, this, &QGCUASFileView::_commandError);
connect(_manager, &FileManager::listEntry, this, &QGCUASFileView::_listEntryReceived);
} else {
_setAllButtonsEnabled(false);
_ui.statusText->setText(QStringLiteral("Onboard Files not supported by this Vehicle"));
}
} }
/// @brief Downloads the file currently selected in the tree view /// @brief Downloads the file currently selected in the tree view
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <QWidget> #include <QWidget>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include "Vehicle.h"
#include "uas/FileManager.h" #include "uas/FileManager.h"
#include "ui_QGCUASFileView.h" #include "ui_QGCUASFileView.h"
...@@ -35,7 +36,7 @@ class QGCUASFileView : public QWidget ...@@ -35,7 +36,7 @@ class QGCUASFileView : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit QGCUASFileView(QWidget *parent, FileManager *manager); explicit QGCUASFileView(QWidget *parent, Vehicle* vehicle);
protected: protected:
FileManager* _manager; FileManager* _manager;
......
...@@ -41,7 +41,7 @@ void QGCUASFileViewMulti::_vehicleAdded(Vehicle* vehicle) ...@@ -41,7 +41,7 @@ void QGCUASFileViewMulti::_vehicleAdded(Vehicle* vehicle)
UAS* uas = vehicle->uas(); UAS* uas = vehicle->uas();
if (!lists.contains(uas)) { if (!lists.contains(uas)) {
QGCUASFileView* list = new QGCUASFileView(ui->stackedWidget, uas->getFileManager()); QGCUASFileView* list = new QGCUASFileView(ui->stackedWidget, vehicle);
lists.insert(uas, list); lists.insert(uas, list);
ui->stackedWidget->addWidget(list); ui->stackedWidget->addWidget(list);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment