Browse Source

Onboard Files is PX4 only

QGC4.4
Don Gagne 10 years ago
parent
commit
4e77230156
  1. 14
      src/ui/QGCUASFileView.cc
  2. 3
      src/ui/QGCUASFileView.h
  3. 2
      src/ui/QGCUASFileViewMulti.cc

14
src/ui/QGCUASFileView.cc

@ -24,18 +24,20 @@
#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);
if (vehicle->px4Firmware()) {
_ui.progressBar->reset(); _ui.progressBar->reset();
// Connect UI signals // Connect UI signals
@ -49,6 +51,10 @@ QGCUASFileView::QGCUASFileView(QWidget *parent, FileManager *manager) :
connect(_manager, &FileManager::commandComplete, this, &QGCUASFileView::_commandComplete); connect(_manager, &FileManager::commandComplete, this, &QGCUASFileView::_commandComplete);
connect(_manager, &FileManager::commandError, this, &QGCUASFileView::_commandError); connect(_manager, &FileManager::commandError, this, &QGCUASFileView::_commandError);
connect(_manager, &FileManager::listEntry, this, &QGCUASFileView::_listEntryReceived); 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

3
src/ui/QGCUASFileView.h

@ -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
Q_OBJECT Q_OBJECT
public: public:
explicit QGCUASFileView(QWidget *parent, FileManager *manager); explicit QGCUASFileView(QWidget *parent, Vehicle* vehicle);
protected: protected:
FileManager* _manager; FileManager* _manager;

2
src/ui/QGCUASFileViewMulti.cc

@ -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);
} }

Loading…
Cancel
Save