Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c61648b3
Commit
c61648b3
authored
Mar 11, 2019
by
Valentin Platzgummer
Browse files
code edited
parent
d7e3f781
Changes
28
Hide whitespace changes
Inline
Side-by-side
src/
DroneDude
/SimpleItemMapVisual.qml
→
src/
QuadView
/SimpleItemMapVisual.qml
View file @
c61648b3
File moved
src/
DroneDude
/StructureScanEditor.qml
→
src/
QuadView
/StructureScanEditor.qml
View file @
c61648b3
File moved
src/
DroneDude
/StructureScanMapVisual.qml
→
src/
QuadView
/StructureScanMapVisual.qml
View file @
c61648b3
File moved
src/
DroneDude
/SurveyItemEditor.qml
→
src/
QuadView
/SurveyItemEditor.qml
View file @
c61648b3
File moved
src/
DroneDude
/SurveyMapVisual.qml
→
src/
QuadView
/SurveyMapVisual.qml
View file @
c61648b3
File moved
src/
DroneDude
/TransectStyleComplexItemStats.qml
→
src/
QuadView
/TransectStyleComplexItemStats.qml
View file @
c61648b3
File moved
src/ui/MainWindowInner.qml
View file @
c61648b3
...
...
@@ -33,11 +33,12 @@ Item {
property
var
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
string
formatedMessage
:
activeVehicle
?
activeVehicle
.
formatedMessage
:
""
property
var
_viewList
:
[
settingsViewLoader
,
setupViewLoader
,
flightView
,
planViewLoader
,
analyzeViewLoader
]
property
var
_viewList
:
[
settingsViewLoader
,
setupViewLoader
,
planViewLoader
,
quadViewLoader
,
flightView
,
analyzeViewLoader
]
readonly
property
string
_settingsViewSource
:
"
AppSettings.qml
"
readonly
property
string
_setupViewSource
:
"
SetupView.qml
"
readonly
property
string
_planViewSource
:
"
PlanView.qml
"
readonly
property
string
_quadViewSource
:
"
QuadView.qml
"
readonly
property
string
_analyzeViewSource
:
"
AnalyzeView.qml
"
onHeightChanged
:
{
...
...
@@ -109,6 +110,21 @@ Item {
planToolBar
.
visible
=
true
}
function
showQuadView
()
{
mainWindow
.
enableToolbar
()
rootLoader
.
sourceComponent
=
null
if
(
currentPopUp
)
{
currentPopUp
.
close
()
}
if
(
quadViewLoader
.
source
!=
_quadViewSource
)
{
quadViewLoader
.
source
=
_quadViewSource
}
ScreenTools
.
availableHeight
=
parent
.
height
-
toolBar
.
height
hideAllViews
()
quadViewLoader
.
visible
=
true
quadToolBar
.
visible
=
true
}
function
showFlyView
()
{
mainWindow
.
enableToolbar
()
rootLoader
.
sourceComponent
=
null
...
...
@@ -163,6 +179,16 @@ Item {
onYes
:
activeConnectionsCloseDialog
.
check
()
// here what to do?
function
check
()
{
if
(
planViewLoader
.
item
&&
planViewLoader
.
item
.
dirty
)
{
unsavedMissionCloseDialog
.
open
()
...
...
@@ -283,7 +309,7 @@ Item {
onShowSetupView
:
mainWindow
.
showSetupView
()
onShowFlyView
:
mainWindow
.
showFlyView
()
onShowPlanView
:
mainWindow
.
showPlanView
()
onShowQuadView
:
mainWindow
.
showQuadView
()
onShowAnalyzeView
:
mainWindow
.
showAnalyzeView
()
onArmVehicle
:
flightView
.
guidedController
.
confirmAction
(
flightView
.
guidedController
.
actionArm
)
onDisarmVehicle
:
{
...
...
@@ -318,6 +344,20 @@ Item {
}
}
QuadToolBar
{
id
:
quadToolBar
height
:
ScreenTools
.
toolbarHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
z
:
toolBar
.
z
+
1
onShowFlyView
:
{
quadToolBar
.
visible
=
false
mainWindow
.
showFlyView
()
}
}
Loader
{
id
:
settingsViewLoader
anchors.left
:
parent
.
left
...
...
@@ -353,6 +393,14 @@ Item {
property
var
toolbar
:
planToolBar
}
Loader
{
id
:
quadViewLoader
anchors.fill
:
parent
visible
:
false
property
var
toolbar
:
quadToolBar
}
FlightDisplayView
{
id
:
flightView
anchors.fill
:
parent
...
...
src/ui/toolbar/MainToolBar.qml
View file @
c61648b3
...
...
@@ -30,6 +30,7 @@ Rectangle {
signal
showSettingsView
signal
showSetupView
signal
showPlanView
signal
showQuadView
signal
showFlyView
signal
showAnalyzeView
signal
armVehicle
...
...
@@ -49,6 +50,10 @@ Rectangle {
planButton
.
checked
=
true
}
function
checkQuadButton
()
{
quadButton
.
checked
=
true
}
function
checkFlyButton
()
{
flyButton
.
checked
=
true
}
...
...
@@ -121,6 +126,15 @@ Rectangle {
onClicked
:
toolBar
.
showPlanView
()
}
QGCToolBarButton
{
id
:
quadButton
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
exclusiveGroup
:
mainActionGroup
source
:
"
/res/waves.svg
"
onClicked
:
toolBar
.
showQuadView
()
}
QGCToolBarButton
{
id
:
flyButton
anchors.top
:
parent
.
top
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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