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
8f6a4a95
Commit
8f6a4a95
authored
Jun 18, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AppImage added
parent
588989a0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
4 deletions
+32
-4
QGroundControl.AppImage
deploy/QGroundControl.AppImage
+0
-0
WimaController.cc
src/Wima/WimaController.cc
+16
-1
WimaController.h
src/Wima/WimaController.h
+1
-0
WimaView.qml
src/WimaView/WimaView.qml
+15
-3
No files found.
deploy/QGroundControl.AppImage
0 → 100755
View file @
8f6a4a95
File added
src/Wima/WimaController.cc
View file @
8f6a4a95
...
...
@@ -94,6 +94,21 @@ void WimaController::addVehicleCorridor()
emit
visualItemsChanged
();
}
void
WimaController
::
removeAllAreas
()
{
bool
changesApplied
=
false
;
while
(
_visualItems
->
count
()
>
0
)
{
_visualItems
->
removeAt
(
0
);
changesApplied
=
true
;
}
_currentFile
=
""
;
emit
currentFileChanged
();
if
(
changesApplied
)
emit
visualItemsChanged
();
}
void
WimaController
::
startMission
()
{
...
...
@@ -233,7 +248,7 @@ bool WimaController::updateMission()
void
WimaController
::
saveToCurrent
()
{
saveToFile
(
_currentFile
);
}
void
WimaController
::
saveToFile
(
const
QString
&
filename
)
...
...
src/Wima/WimaController.h
View file @
8f6a4a95
...
...
@@ -59,6 +59,7 @@ public:
Q_INVOKABLE
void
addServiceArea
();
/// @return true if a vehicle corridor was added sucessfully and false otherwise.
Q_INVOKABLE
void
addVehicleCorridor
();
Q_INVOKABLE
void
removeAllAreas
();
Q_INVOKABLE
void
startMission
();
Q_INVOKABLE
void
abortMission
();
...
...
src/WimaView/WimaView.qml
View file @
8f6a4a95
...
...
@@ -1006,6 +1006,17 @@ QGCView {
}
}
Component
{
id
:
wimaRemoveAllPromptDialog
QGCViewMessage
{
message
:
qsTr
(
"
Are you sure you want to remove all items and create a Wima mission?
"
)
function
accept
()
{
wimaController
.
removeAllAreas
();
hideDialog
()
}
}
}
Component
{
id
:
clearVehicleMissionDialog
QGCViewMessage
{
...
...
@@ -1058,12 +1069,12 @@ QGCView {
columnSpacing
:
ScreenTools
.
defaultFontPixelWidth
QGCButton
{
text
:
qsTr
(
"
New...T
oDo
"
)
text
:
qsTr
(
"
New...T
esting
"
)
Layout.fillWidth
:
true
enabled
:
_wimaVisualItems
.
count
>
1
onClicked
:
{
dropPanel
.
hide
()
_qgcView
.
showDialog
(
r
emoveAllPromptDialog
,
qsTr
(
"
New Plan
"
),
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Yes
|
StandardButton
.
No
)
_qgcView
.
showDialog
(
wimaR
emoveAllPromptDialog
,
qsTr
(
"
New Plan
"
),
_qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Yes
|
StandardButton
.
No
)
}
}
...
...
@@ -1084,6 +1095,7 @@ QGCView {
onClicked
:
{
dropPanel
.
hide
()
wimaController
.
saveToCurrent
()
console
.
log
(
"
saveing to:
"
,
wimaController
.
currentFile
)
}
}
...
...
@@ -1093,7 +1105,7 @@ QGCView {
enabled
:
_wimaVisualItems
.
count
>
1
onClicked
:
{
dropPanel
.
hide
()
master
Controller
.
saveToSelectedFile
()
wima
Controller
.
saveToSelectedFile
()
}
}
...
...
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