Skip to content

Q
qgroundcontrol
Commit c615f477 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Finished. Needs testing and debugging.

parent 4d23912a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 55 deletions
src/uas/MavlinkLogManager.cc
View file @ c615f477
This diff is collapsed.
src/uas/MavlinkLogManager.h
View file @ c615f477
...@@ -31,25 +31,31 @@ public: ...@@ -31,25 +31,31 @@ public:
MavlinkLogFiles (MavlinkLogManager* manager, const QString& filePath); MavlinkLogFiles (MavlinkLogManager* manager, const QString& filePath);
Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString name READ name CONSTANT)
Q_PROPERTY(quint32 size READ size CONSTANT) Q_PROPERTY(quint32 size READ size NOTIFY sizeChanged)
Q_PROPERTY(bool selected READ selected WRITE setSelected NOTIFY selectedChanged) Q_PROPERTY(bool selected READ selected WRITE setSelected NOTIFY selectedChanged)
Q_PROPERTY(bool uploading READ uploading NOTIFY uploadingChanged) Q_PROPERTY(bool uploading READ uploading NOTIFY uploadingChanged)
Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
Q_PROPERTY(bool writing READ writing NOTIFY writingChanged)
QString name () { return _name; } QString name () { return _name; }
quint32 size () { return _size; } quint32 size () { return _size; }
bool selected () { return _selected; } bool selected () { return _selected; }
bool uploading () { return _uploading; } bool uploading () { return _uploading; }
qreal progress () { return _progress; } qreal progress () { return _progress; }
bool writing () { return _writing; }
void setSelected (bool selected); void setSelected (bool selected);
void setUploading (bool uploading); void setUploading (bool uploading);
void setProgress (qreal progress); void setProgress (qreal progress);
void setWriting (bool writing);
void setSize (quint32 size);
signals: signals:
void sizeChanged ();
void selectedChanged (); void selectedChanged ();
void uploadingChanged (); void uploadingChanged ();
void progressChanged (); void progressChanged ();
void writingChanged ();
private: private:
MavlinkLogManager* _manager; MavlinkLogManager* _manager;
...@@ -58,8 +64,37 @@ private: ...@@ -58,8 +64,37 @@ private:
bool _selected; bool _selected;
bool _uploading; bool _uploading;
qreal _progress; qreal _progress;
bool _writing;
}; };
//-----------------------------------------------------------------------------
class CurrentRunningLog
{
public:
CurrentRunningLog()
: fd(NULL)
, record(NULL)
, written(0)
{
}
~CurrentRunningLog()
{
close();
}
void close()
{
if(fd) {
fclose(fd);
fd = NULL;
}
}
FILE* fd;
QString fileName;
MavlinkLogFiles* record;
quint32 written;
};
//-----------------------------------------------------------------------------
class MavlinkLogManager : public QGCTool class MavlinkLogManager : public QGCTool
{ {
Q_OBJECT Q_OBJECT
...@@ -73,7 +108,8 @@ public: ...@@ -73,7 +108,8 @@ public:
Q_PROPERTY(QString uploadURL READ uploadURL WRITE setUploadURL NOTIFY uploadURLChanged) Q_PROPERTY(QString uploadURL READ uploadURL WRITE setUploadURL NOTIFY uploadURLChanged)
Q_PROPERTY(bool enableAutoUpload READ enableAutoUpload WRITE setEnableAutoUpload NOTIFY enableAutoUploadChanged) Q_PROPERTY(bool enableAutoUpload READ enableAutoUpload WRITE setEnableAutoUpload NOTIFY enableAutoUploadChanged)
Q_PROPERTY(bool enableAutoStart READ enableAutoStart WRITE setEnableAutoStart NOTIFY enableAutoStartChanged) Q_PROPERTY(bool enableAutoStart READ enableAutoStart WRITE setEnableAutoStart NOTIFY enableAutoStartChanged)
Q_PROPERTY(bool busy READ busy NOTIFY busyChanged) Q_PROPERTY(bool deleteAfterUpload READ deleteAfterUpload WRITE setDeleteAfterUpload NOTIFY deleteAfterUploadChanged)
Q_PROPERTY(bool uploading READ uploading NOTIFY uploadingChanged)
Q_PROPERTY(bool logRunning READ logRunning NOTIFY logRunningChanged) Q_PROPERTY(bool logRunning READ logRunning NOTIFY logRunningChanged)
Q_PROPERTY(bool canStartLog READ canStartLog NOTIFY canStartLogChanged) Q_PROPERTY(bool canStartLog READ canStartLog NOTIFY canStartLogChanged)
Q_PROPERTY(QmlObjectListModel* logFiles READ logFiles NOTIFY logFilesChanged) Q_PROPERTY(QmlObjectListModel* logFiles READ logFiles NOTIFY logFilesChanged)
...@@ -89,9 +125,10 @@ public: ...@@ -89,9 +125,10 @@ public:
QString uploadURL () { return _uploadURL; } QString uploadURL () { return _uploadURL; }
bool enableAutoUpload () { return _enableAutoUpload; } bool enableAutoUpload () { return _enableAutoUpload; }
bool enableAutoStart () { return _enableAutoStart; } bool enableAutoStart () { return _enableAutoStart; }
bool busy (); bool uploading ();
bool logRunning () { return _logRunning; } bool logRunning () { return _logRunning; }
bool canStartLog () { return _vehicle != NULL; } bool canStartLog () { return _vehicle != NULL; }
bool deleteAfterUpload () { return _deleteAfterUpload; }
QmlObjectListModel* logFiles () { return &_logFiles; } QmlObjectListModel* logFiles () { return &_logFiles; }
...@@ -100,6 +137,7 @@ public: ...@@ -100,6 +137,7 @@ public:
void setUploadURL (QString url); void setUploadURL (QString url);
void setEnableAutoUpload (bool enable); void setEnableAutoUpload (bool enable);
void setEnableAutoStart (bool enable); void setEnableAutoStart (bool enable);
void setDeleteAfterUpload(bool enable);
// Override from QGCTool // Override from QGCTool
void setToolbox (QGCToolbox *toolbox); void setToolbox (QGCToolbox *toolbox);
...@@ -112,13 +150,14 @@ signals: ...@@ -112,13 +150,14 @@ signals:
void enableAutoStartChanged (); void enableAutoStartChanged ();
void logFilesChanged (); void logFilesChanged ();
void selectedCountChanged (); void selectedCountChanged ();
void busyChanged (); void uploadingChanged ();
void readyRead (QByteArray data); void readyRead (QByteArray data);
void failed (); void failed ();
void succeed (); void succeed ();
void abortUpload (); void abortUpload ();
void logRunningChanged (); void logRunningChanged ();
void canStartLogChanged (); void canStartLogChanged ();
void deleteAfterUploadChanged ();
private slots: private slots:
void _uploadFinished (); void _uploadFinished ();
...@@ -133,6 +172,8 @@ private: ...@@ -133,6 +172,8 @@ private:
bool _processUploadResponse (int http_code, QByteArray &data); bool _processUploadResponse (int http_code, QByteArray &data);
bool _createNewLog (); bool _createNewLog ();
int _getFirstSelected (); int _getFirstSelected ();
void _insertNewLog (MavlinkLogFiles* newLog);
void _deleteLog (MavlinkLogFiles* log);
private: private:
QString _description; QString _description;
...@@ -147,9 +188,9 @@ private: ...@@ -147,9 +188,9 @@ private:
Vehicle* _vehicle; Vehicle* _vehicle;
bool _logRunning; bool _logRunning;
bool _loggingDisabled; bool _loggingDisabled;
FILE* _currentSavingFileFd; CurrentRunningLog* _currentSavingFile;
QString _currentSavingFileStr;
uint16_t _sequence; uint16_t _sequence;
bool _deleteAfterUpload;
}; };
#endif #endif
src/ui/preferences/MavlinkSettings.qml
View file @ c615f477
...@@ -262,6 +262,7 @@ Rectangle { ...@@ -262,6 +262,7 @@ Rectangle {
//----------------------------------------------------------------- //-----------------------------------------------------------------
//-- Automatic Upload //-- Automatic Upload
QGCCheckBox { QGCCheckBox {
id: autoUploadCheck
text: qsTr("Enable automatic log uploads") text: qsTr("Enable automatic log uploads")
checked: QGroundControl.mavlinkLogManager.enableAutoUpload checked: QGroundControl.mavlinkLogManager.enableAutoUpload
enabled: emailField.text !== "" && urlField !== "" enabled: emailField.text !== "" && urlField !== ""
...@@ -269,6 +270,16 @@ Rectangle { ...@@ -269,6 +270,16 @@ Rectangle {
QGroundControl.mavlinkLogManager.enableAutoUpload = checked QGroundControl.mavlinkLogManager.enableAutoUpload = checked
} }
} }
//-----------------------------------------------------------------
//-- Delete log after upload
QGCCheckBox {
text: qsTr("Delete log file after uploading")
checked: QGroundControl.mavlinkLogManager.deleteAfterUpload
enabled: emailField.text !== "" && urlField !== "" && autoUploadCheck.checked
onClicked: {
QGroundControl.mavlinkLogManager.deleteAfterUpload = checked
}
}
} }
} }
//----------------------------------------------------------------- //-----------------------------------------------------------------
...@@ -327,11 +338,13 @@ Rectangle { ...@@ -327,11 +338,13 @@ Rectangle {
QGCLabel { QGCLabel {
text: object.name text: object.name
width: ScreenTools.defaultFontPixelWidth * 28 width: ScreenTools.defaultFontPixelWidth * 28
color: object.writing ? qgcPal.warningText : qgcPal.text
} }
QGCLabel { QGCLabel {
text: Number(object.size).toLocaleString(Qt.locale(), 'f', 0) text: Number(object.size).toLocaleString(Qt.locale(), 'f', 0)
visible: !object.uploading visible: !object.uploading
width: ScreenTools.defaultFontPixelWidth * 20; width: ScreenTools.defaultFontPixelWidth * 20;
color: object.writing ? qgcPal.warningText : qgcPal.text
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
} }
ProgressBar { ProgressBar {
...@@ -352,7 +365,7 @@ Rectangle { ...@@ -352,7 +365,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCButton { QGCButton {
text: "Check All" text: "Check All"
enabled: !QGroundControl.mavlinkLogManager.busy enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: { onClicked: {
for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i) var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i)
...@@ -362,7 +375,7 @@ Rectangle { ...@@ -362,7 +375,7 @@ Rectangle {
} }
QGCButton { QGCButton {
text: "Check None" text: "Check None"
enabled: !QGroundControl.mavlinkLogManager.busy enabled: !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: { onClicked: {
for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) { for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i) var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i)
...@@ -372,7 +385,7 @@ Rectangle { ...@@ -372,7 +385,7 @@ Rectangle {
} }
QGCButton { QGCButton {
text: "Delete Selected" text: "Delete Selected"
enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.busy enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
onClicked: deleteDialog.open() onClicked: deleteDialog.open()
MessageDialog { MessageDialog {
id: deleteDialog id: deleteDialog
...@@ -388,8 +401,8 @@ Rectangle { ...@@ -388,8 +401,8 @@ Rectangle {
} }
QGCButton { QGCButton {
text: "Upload Selected" text: "Upload Selected"
enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.busy enabled: _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
visible: !QGroundControl.mavlinkLogManager.busy visible: !QGroundControl.mavlinkLogManager.uploading
onClicked: { onClicked: {
QGroundControl.mavlinkLogManager.emailAddress = emailField.text QGroundControl.mavlinkLogManager.emailAddress = emailField.text
if(QGroundControl.mavlinkLogManager.emailAddress === "") if(QGroundControl.mavlinkLogManager.emailAddress === "")
...@@ -411,8 +424,8 @@ Rectangle { ...@@ -411,8 +424,8 @@ Rectangle {
} }
QGCButton { QGCButton {
text: "Cancel" text: "Cancel"
enabled: QGroundControl.mavlinkLogManager.busy enabled: QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
visible: QGroundControl.mavlinkLogManager.busy visible: QGroundControl.mavlinkLogManager.uploading
onClicked: cancelDialog.open() onClicked: cancelDialog.open()
MessageDialog { MessageDialog {
id: cancelDialog id: cancelDialog
......
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