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
c9f56212
Commit
c9f56212
authored
May 09, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ViewWithDialog, support custom config
parent
52d149b7
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
161 additions
and
98 deletions
+161
-98
AirframeComponent.qml
src/AutoPilotPlugins/PX4/AirframeComponent.qml
+152
-93
AirframeComponentController.cc
src/AutoPilotPlugins/PX4/AirframeComponentController.cc
+5
-5
AirframeComponentController.h
src/AutoPilotPlugins/PX4/AirframeComponentController.h
+4
-0
No files found.
src/AutoPilotPlugins/PX4/AirframeComponent.qml
View file @
c9f56212
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/AirframeComponentController.cc
View file @
c9f56212
...
...
@@ -40,7 +40,8 @@ bool AirframeComponentController::_typesRegistered = false;
AirframeComponentController
::
AirframeComponentController
(
void
)
:
_uas
(
NULL
),
_currentVehicleIndex
(
0
),
_autostartId
(
0
)
_autostartId
(
0
),
_showCustomConfigPanel
(
false
)
{
_uas
=
UASManager
::
instance
()
->
getActiveUAS
();
Q_ASSERT
(
_uas
);
...
...
@@ -82,10 +83,9 @@ AirframeComponentController::AirframeComponentController(void) :
_airframeTypes
.
append
(
QVariant
::
fromValue
(
airframeType
));
}
if
(
_autostartId
!=
0
)
{
// FIXME: Should be a user error
Q_UNUSED
(
autostartFound
);
Q_ASSERT
(
autostartFound
);
if
(
_autostartId
!=
0
&&
!
autostartFound
)
{
_showCustomConfigPanel
=
true
;
emit
showCustomConfigPanelChanged
(
true
);
}
}
...
...
src/AutoPilotPlugins/PX4/AirframeComponentController.h
View file @
c9f56212
...
...
@@ -44,6 +44,8 @@ public:
AirframeComponentController
(
void
);
~
AirframeComponentController
();
Q_PROPERTY
(
bool
showCustomConfigPanel
MEMBER
_showCustomConfigPanel
NOTIFY
showCustomConfigPanelChanged
)
Q_PROPERTY
(
QVariantList
airframeTypes
MEMBER
_airframeTypes
CONSTANT
)
Q_PROPERTY
(
QString
currentAirframeType
MEMBER
_currentAirframeType
CONSTANT
)
...
...
@@ -59,6 +61,7 @@ public:
signals:
void
autostartIdChanged
(
int
newAutostartId
);
void
showCustomConfigPanelChanged
(
bool
show
);
private:
static
bool
_typesRegistered
;
...
...
@@ -69,6 +72,7 @@ private:
QString
_currentVehicleName
;
int
_currentVehicleIndex
;
int
_autostartId
;
bool
_showCustomConfigPanel
;
};
class
Airframe
:
public
QObject
...
...
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