Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4e772301
Commit
4e772301
authored
Jan 10, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Onboard Files is PX4 only
parent
2c1e6a37
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
19 deletions
+26
-19
QGCUASFileView.cc
src/ui/QGCUASFileView.cc
+23
-17
QGCUASFileView.h
src/ui/QGCUASFileView.h
+2
-1
QGCUASFileViewMulti.cc
src/ui/QGCUASFileViewMulti.cc
+1
-1
No files found.
src/ui/QGCUASFileView.cc
View file @
4e772301
...
@@ -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
...
...
src/ui/QGCUASFileView.h
View file @
4e772301
...
@@ -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
;
...
...
src/ui/QGCUASFileViewMulti.cc
View file @
4e772301
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment