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
a5e8264b
Commit
a5e8264b
authored
Jan 20, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it possible to have a build without Airmap
parent
f55279d9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
5 deletions
+35
-5
qgroundcontrol.pro
qgroundcontrol.pro
+3
-0
QGroundControl.Airmap.qmldir
src/Airmap/QGroundControl.Airmap.qmldir
+3
-1
AirspaceControl.qml
src/Airmap/dummy/AirspaceControl.qml
+5
-0
AirspaceRegulation.qml
src/Airmap/dummy/AirspaceRegulation.qml
+3
-0
QGroundControl.Airmap.qmldir
src/Airmap/dummy/QGroundControl.Airmap.qmldir
+4
-0
airmap_dummy.qrc
src/Airmap/dummy/airmap_dummy.qrc
+7
-0
PlanView.qml
src/PlanView/PlanView.qml
+10
-4
No files found.
qgroundcontrol.pro
View file @
a5e8264b
...
...
@@ -1075,6 +1075,9 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
src
/
Airmap
/
AirspaceManagement
.
cc
\
src
/
Airmap
/
AirspaceController
.
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
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 {
}
on_EnableAirMapChanged
:
{
if
(
_enableAirMap
)
{
planControlColapsed
=
true
airspaceControl
.
colapsed
=
false
if
(
QGroundControl
.
airmapSupported
)
{
if
(
_enableAirMap
)
{
planControlColapsed
=
true
airspaceControl
.
colapsed
=
false
}
else
{
planControlColapsed
=
false
}
}
else
{
planControlColapsed
=
false
}
...
...
@@ -565,14 +569,16 @@ QGCView {
width
:
height
height
:
ScreenTools
.
defaultFontPixelWidth
*
2.5
sourceSize.height
:
height
source
:
"
qrc:/airmap/expand.svg
"
source
:
QGroundControl
.
airmapSupported
?
"
qrc:/airmap/expand.svg
"
:
"
"
color
:
"
white
"
visible
:
QGroundControl
.
airmapSupported
anchors.right
:
parent
.
right
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.verticalCenter
:
parent
.
verticalCenter
}
MouseArea
{
anchors.fill
:
parent
enabled
:
QGroundControl
.
airmapSupported
onClicked
:
{
airspaceControl
.
colapsed
=
true
planControlColapsed
=
false
...
...
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