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
f788d380
Commit
f788d380
authored
Mar 02, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disconnect Vehicle support
parent
903459f7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
7 deletions
+11
-7
QGCInstrumentWidget.qml
src/FlightMap/Widgets/QGCInstrumentWidget.qml
+1
-2
ValuesWidget.qml
src/FlightMap/Widgets/ValuesWidget.qml
+1
-2
VibrationWidget.qml
src/FlightMap/Widgets/VibrationWidget.qml
+1
-2
QGroundControlQmlGlobal.h
src/QmlControls/QGroundControlQmlGlobal.h
+1
-1
MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.cc
+3
-0
MultiVehicleManager.h
src/Vehicle/MultiVehicleManager.h
+4
-0
No files found.
src/FlightMap/Widgets/QGCInstrumentWidget.qml
View file @
f788d380
...
@@ -131,7 +131,7 @@ Item {
...
@@ -131,7 +131,7 @@ Item {
Rectangle
{
Rectangle
{
anchors.fill
:
_valuesWidget
anchors.fill
:
_valuesWidget
color
:
_backgroundColor
color
:
_backgroundColor
visible
:
!
_showCompass
&&
_activeVehicle
visible
:
!
_showCompass
radius
:
_spacing
radius
:
_spacing
}
}
...
@@ -145,7 +145,6 @@ Item {
...
@@ -145,7 +145,6 @@ Item {
}
}
}
}
Rectangle
{
Rectangle
{
id
:
_spacer2
id
:
_spacer2
height
:
1
height
:
1
...
...
src/FlightMap/Widgets/ValuesWidget.qml
View file @
f788d380
...
@@ -33,7 +33,6 @@ import QGroundControl 1.0
...
@@ -33,7 +33,6 @@ import QGroundControl 1.0
QGCFlickable
{
QGCFlickable
{
id
:
_root
id
:
_root
visible
:
_activeVehicle
height
:
Math
.
min
(
maxHeight
,
_smallFlow
.
y
+
_smallFlow
.
height
)
height
:
Math
.
min
(
maxHeight
,
_smallFlow
.
y
+
_smallFlow
.
height
)
contentHeight
:
_smallFlow
.
y
+
_smallFlow
.
height
contentHeight
:
_smallFlow
.
y
+
_smallFlow
.
height
flickableDirection
:
Flickable
.
VerticalFlick
flickableDirection
:
Flickable
.
VerticalFlick
...
@@ -43,7 +42,7 @@ QGCFlickable {
...
@@ -43,7 +42,7 @@ QGCFlickable {
property
color
textColor
property
color
textColor
property
var
maxHeight
property
var
maxHeight
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
?
QGroundControl
.
multiVehicleManager
.
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
disconnectedVehicle
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
/
2
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
/
2
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
true
}
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
true
}
...
...
src/FlightMap/Widgets/VibrationWidget.qml
View file @
f788d380
...
@@ -33,7 +33,6 @@ import QGroundControl 1.0
...
@@ -33,7 +33,6 @@ import QGroundControl 1.0
QGCFlickable
{
QGCFlickable
{
id
:
_root
id
:
_root
visible
:
_activeVehicle
height
:
Math
.
min
(
maxHeight
,
innerItem
.
height
)
height
:
Math
.
min
(
maxHeight
,
innerItem
.
height
)
contentHeight
:
innerItem
.
height
contentHeight
:
innerItem
.
height
flickableDirection
:
Flickable
.
VerticalFlick
flickableDirection
:
Flickable
.
VerticalFlick
...
@@ -43,7 +42,7 @@ QGCFlickable {
...
@@ -43,7 +42,7 @@ QGCFlickable {
property
color
backgroundColor
property
color
backgroundColor
property
var
maxHeight
property
var
maxHeight
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
?
QGroundControl
.
multiVehicleManager
.
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
disconnectedVehicle
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
/
2
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
/
2
property
real
_barWidth
:
Math
.
round
(
ScreenTools
.
defaultFontPixelWidth
*
3
)
property
real
_barWidth
:
Math
.
round
(
ScreenTools
.
defaultFontPixelWidth
*
3
)
...
...
src/QmlControls/QGroundControlQmlGlobal.h
View file @
f788d380
...
@@ -55,7 +55,7 @@ public:
...
@@ -55,7 +55,7 @@ public:
Q_PROPERTY
(
LinkManager
*
linkManager
READ
linkManager
CONSTANT
)
Q_PROPERTY
(
LinkManager
*
linkManager
READ
linkManager
CONSTANT
)
Q_PROPERTY
(
MissionCommands
*
missionCommands
READ
missionCommands
CONSTANT
)
Q_PROPERTY
(
MissionCommands
*
missionCommands
READ
missionCommands
CONSTANT
)
Q_PROPERTY
(
MultiVehicleManager
*
multiVehicleManager
READ
multiVehicleManager
CONSTANT
)
Q_PROPERTY
(
MultiVehicleManager
*
multiVehicleManager
READ
multiVehicleManager
CONSTANT
)
Q_PROPERTY
(
QGCMapEngineManager
*
mapEngineManager
READ
mapEngineManager
CONSTANT
)
Q_PROPERTY
(
QGCMapEngineManager
*
mapEngineManager
READ
mapEngineManager
CONSTANT
)
Q_PROPERTY
(
qreal
zOrderTopMost
READ
zOrderTopMost
CONSTANT
)
///< z order for top most items, toolbar, main window sub view
Q_PROPERTY
(
qreal
zOrderTopMost
READ
zOrderTopMost
CONSTANT
)
///< z order for top most items, toolbar, main window sub view
Q_PROPERTY
(
qreal
zOrderWidgets
READ
zOrderWidgets
CONSTANT
)
///< z order value to widgets, for example: zoom controls, hud widgetss
Q_PROPERTY
(
qreal
zOrderWidgets
READ
zOrderWidgets
CONSTANT
)
///< z order value to widgets, for example: zoom controls, hud widgetss
...
...
src/Vehicle/MultiVehicleManager.cc
View file @
f788d380
...
@@ -50,6 +50,7 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
...
@@ -50,6 +50,7 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
,
_activeVehicleAvailable
(
false
)
,
_activeVehicleAvailable
(
false
)
,
_parameterReadyVehicleAvailable
(
false
)
,
_parameterReadyVehicleAvailable
(
false
)
,
_activeVehicle
(
NULL
)
,
_activeVehicle
(
NULL
)
,
_disconnectedVehicle
(
NULL
)
,
_firmwarePluginManager
(
NULL
)
,
_firmwarePluginManager
(
NULL
)
,
_autopilotPluginManager
(
NULL
)
,
_autopilotPluginManager
(
NULL
)
,
_joystickManager
(
NULL
)
,
_joystickManager
(
NULL
)
...
@@ -66,6 +67,8 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
...
@@ -66,6 +67,8 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
if
(
_gcsHeartbeatEnabled
)
{
if
(
_gcsHeartbeatEnabled
)
{
_gcsHeartbeatTimer
.
start
();
_gcsHeartbeatTimer
.
start
();
}
}
_disconnectedVehicle
=
new
Vehicle
(
this
);
}
}
void
MultiVehicleManager
::
setToolbox
(
QGCToolbox
*
toolbox
)
void
MultiVehicleManager
::
setToolbox
(
QGCToolbox
*
toolbox
)
...
...
src/Vehicle/MultiVehicleManager.h
View file @
f788d380
...
@@ -57,6 +57,9 @@ public:
...
@@ -57,6 +57,9 @@ public:
Q_PROPERTY
(
QmlObjectListModel
*
vehicles
READ
vehicles
CONSTANT
)
Q_PROPERTY
(
QmlObjectListModel
*
vehicles
READ
vehicles
CONSTANT
)
Q_PROPERTY
(
bool
gcsHeartBeatEnabled
READ
gcsHeartbeatEnabled
WRITE
setGcsHeartbeatEnabled
NOTIFY
gcsHeartBeatEnabledChanged
)
Q_PROPERTY
(
bool
gcsHeartBeatEnabled
READ
gcsHeartbeatEnabled
WRITE
setGcsHeartbeatEnabled
NOTIFY
gcsHeartBeatEnabledChanged
)
/// A disconnected vehicle is used to access FactGroup information for the Vehicle object when no active vehicle is available
Q_PROPERTY
(
Vehicle
*
disconnectedVehicle
MEMBER
_disconnectedVehicle
CONSTANT
)
// Methods
// Methods
Q_INVOKABLE
Vehicle
*
getVehicleById
(
int
vehicleId
);
Q_INVOKABLE
Vehicle
*
getVehicleById
(
int
vehicleId
);
...
@@ -104,6 +107,7 @@ private:
...
@@ -104,6 +107,7 @@ private:
bool
_activeVehicleAvailable
;
///< true: An active vehicle is available
bool
_activeVehicleAvailable
;
///< true: An active vehicle is available
bool
_parameterReadyVehicleAvailable
;
///< true: An active vehicle with ready parameters is available
bool
_parameterReadyVehicleAvailable
;
///< true: An active vehicle with ready parameters is available
Vehicle
*
_activeVehicle
;
///< Currently active vehicle from a ui perspective
Vehicle
*
_activeVehicle
;
///< Currently active vehicle from a ui perspective
Vehicle
*
_disconnectedVehicle
;
///< Disconnected vechicle for FactGroup access
QList
<
Vehicle
*>
_vehiclesBeingDeleted
;
///< List of Vehicles being deleted in queued phases
QList
<
Vehicle
*>
_vehiclesBeingDeleted
;
///< List of Vehicles being deleted in queued phases
Vehicle
*
_vehicleBeingSetActive
;
///< Vehicle being set active in queued phases
Vehicle
*
_vehicleBeingSetActive
;
///< Vehicle being set active in queued phases
...
...
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