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
a5e8264b
Commit
a5e8264b
authored
Jan 20, 2018
by
Gus Grubba
Browse files
Make it possible to have a build without Airmap
parent
f55279d9
Changes
7
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pro
View file @
a5e8264b
...
@@ -1075,6 +1075,9 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
...
@@ -1075,6 +1075,9 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
src
/
Airmap
/
AirspaceManagement
.
cc
\
src
/
Airmap
/
AirspaceManagement
.
cc
\
src
/
Airmap
/
AirspaceController
.
cc
\
src
/
Airmap
/
AirspaceController
.
cc
\
src
/
Airmap
/
AirMapSettings
.
cc
src
/
Airmap
/
AirMapSettings
.
cc
}
else
{
RESOURCES
+=
\
src
/
Airmap
/
dummy
/
airmap_dummy
.
qrc
}
}
#-------------------------------------------------------------------------------------
#-------------------------------------------------------------------------------------
...
...
src/Airmap/QGroundControl.Airmap.qmldir
View file @
a5e8264b
Module QGroundControl.Airmap
Module
QGroundControl.Airmap
AirspaceControl 1.0 AirspaceControl.qml
AirspaceControl 1.0 AirspaceControl.qml
AirspaceRegulation 1.0 AirspaceRegulation.qml
AirspaceRegulation 1.0 AirspaceRegulation.qml
src/Airmap/dummy/AirspaceControl.qml
0 → 100644
View file @
a5e8264b
import
QtQuick
2.3
Item
{
property
bool
colapsed
:
true
property
bool
showColapse
:
false
}
src/Airmap/dummy/AirspaceRegulation.qml
0 → 100644
View file @
a5e8264b
import
QtQuick
2.3
Item
{
}
src/Airmap/dummy/QGroundControl.Airmap.qmldir
0 → 100644
View file @
a5e8264b
Module QGroundControl.Airmap
AirspaceControl 1.0 AirspaceControl.qml
AirspaceRegulation 1.0 AirspaceRegulation.qml
src/Airmap/dummy/airmap_dummy.qrc
0 → 100644
View file @
a5e8264b
<RCC>
<qresource prefix="/qml">
<file alias="QGroundControl/Airmap/qmldir">QGroundControl.Airmap.qmldir</file>
<file alias="QGroundControl/Airmap/AirspaceControl.qml">AirspaceControl.qml</file>
<file alias="QGroundControl/Airmap/AirspaceRegulation.qml">AirspaceRegulation.qml</file>
</qresource>
</RCC>
src/PlanView/PlanView.qml
View file @
a5e8264b
...
@@ -96,9 +96,13 @@ QGCView {
...
@@ -96,9 +96,13 @@ QGCView {
}
}
on_EnableAirMapChanged
:
{
on_EnableAirMapChanged
:
{
if
(
_enableAirMap
)
{
if
(
QGroundControl
.
airmapSupported
)
{
planControlColapsed
=
true
if
(
_enableAirMap
)
{
airspaceControl
.
colapsed
=
false
planControlColapsed
=
true
airspaceControl
.
colapsed
=
false
}
else
{
planControlColapsed
=
false
}
}
else
{
}
else
{
planControlColapsed
=
false
planControlColapsed
=
false
}
}
...
@@ -565,14 +569,16 @@ QGCView {
...
@@ -565,14 +569,16 @@ QGCView {
width
:
height
width
:
height
height
:
ScreenTools
.
defaultFontPixelWidth
*
2.5
height
:
ScreenTools
.
defaultFontPixelWidth
*
2.5
sourceSize.height
:
height
sourceSize.height
:
height
source
:
"
qrc:/airmap/expand.svg
"
source
:
QGroundControl
.
airmapSupported
?
"
qrc:/airmap/expand.svg
"
:
""
color
:
"
white
"
color
:
"
white
"
visible
:
QGroundControl
.
airmapSupported
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
}
}
MouseArea
{
MouseArea
{
anchors.fill
:
parent
anchors.fill
:
parent
enabled
:
QGroundControl
.
airmapSupported
onClicked
:
{
onClicked
:
{
airspaceControl
.
colapsed
=
true
airspaceControl
.
colapsed
=
true
planControlColapsed
=
false
planControlColapsed
=
false
...
...
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