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
048ff809
Unverified
Commit
048ff809
authored
Jul 30, 2018
by
Don Gagne
Committed by
GitHub
Jul 30, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6743 from DonLakeFlyer/ParameterFileSave
Set parameter file extension if needed
parents
8935598f
7bf50ed9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
14 deletions
+13
-14
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+6
-12
ParameterEditorController.cc
src/QmlControls/ParameterEditorController.cc
+7
-2
No files found.
src/QmlControls/ParameterEditor.qml
View file @
048ff809
...
...
@@ -33,6 +33,7 @@ QGCView {
property
var
_searchResults
///< List of parameter names from search results
property
bool
_showRCToParam
:
!
ScreenTools
.
isMobile
&&
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
px4Firmware
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
_appSettings
:
QGroundControl
.
settingsManager
.
appSettings
ParameterEditorController
{
id
:
controller
;
...
...
@@ -112,28 +113,18 @@ QGCView {
MenuItem
{
text
:
qsTr
(
"
Load from file...
"
)
onTriggered
:
{
var
appSettings
=
QGroundControl
.
settingsManager
.
appSettings
fileDialog
.
qgcView
=
qgcView
fileDialog
.
title
=
qsTr
(
"
Select Parameter File
"
)
fileDialog
.
title
=
qsTr
(
"
Load Parameters
"
)
fileDialog
.
selectExisting
=
true
fileDialog
.
folder
=
appSettings
.
parameterSavePath
fileDialog
.
fileExtension
=
appSettings
.
parameterFileExtension
fileDialog
.
nameFilters
=
[
qsTr
(
"
Parameter Files (*.%1)
"
).
arg
(
appSettings
.
parameterFileExtension
)
,
qsTr
(
"
All Files (*.*)
"
)
]
fileDialog
.
openForLoad
()
}
}
MenuItem
{
text
:
qsTr
(
"
Save to file...
"
)
onTriggered
:
{
var
appSettings
=
QGroundControl
.
settingsManager
.
appSettings
fileDialog
.
qgcView
=
qgcView
fileDialog
.
title
=
qsTr
(
"
Save Parameters
"
)
fileDialog
.
selectExisting
=
false
fileDialog
.
folder
=
appSettings
.
parameterSavePath
fileDialog
.
fileExtension
=
appSettings
.
parameterFileExtension
fileDialog
.
nameFilters
=
[
qsTr
(
"
Parameter Files (*.%1)
"
).
arg
(
appSettings
.
parameterFileExtension
)
,
qsTr
(
"
All Files (*.*)
"
)
]
fileDialog
.
openForSave
()
}
}
...
...
@@ -292,7 +283,10 @@ QGCView {
}
// QGCViewPanel
QGCFileDialog
{
id
:
fileDialog
id
:
fileDialog
folder
:
_appSettings
.
parameterSavePath
fileExtension
:
_appSettings
.
parameterFileExtension
nameFilters
:
[
qsTr
(
"
Parameter Files (*.%1)
"
).
arg
(
_appSettings
.
parameterFileExtension
)
,
qsTr
(
"
All Files (*.*)
"
)
]
onAcceptedForSave
:
{
controller
.
saveToFile
(
file
)
...
...
src/QmlControls/ParameterEditorController.cc
View file @
048ff809
...
...
@@ -98,10 +98,15 @@ void ParameterEditorController::clearRCToParam(void)
void
ParameterEditorController
::
saveToFile
(
const
QString
&
filename
)
{
if
(
!
filename
.
isEmpty
())
{
QFile
file
(
filename
);
QString
parameterFilename
=
filename
;
if
(
!
QFileInfo
(
filename
).
fileName
().
contains
(
"."
))
{
parameterFilename
+=
QString
(
".%1"
).
arg
(
AppSettings
::
parameterFileExtension
);
}
QFile
file
(
parameterFilename
);
if
(
!
file
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Text
))
{
qgcApp
()
->
showMessage
(
tr
(
"Unable to create file: %1"
).
arg
(
f
ilename
));
qgcApp
()
->
showMessage
(
tr
(
"Unable to create file: %1"
).
arg
(
parameterF
ilename
));
return
;
}
...
...
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