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
d6801ac6
Commit
d6801ac6
authored
Aug 15, 2013
by
tstellanova
Browse files
fix rendering of advanced parameters editors
parent
1b1e0f50
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/QGCBaseParamWidget.cc
View file @
d6801ac6
...
...
@@ -25,22 +25,24 @@ QGCBaseParamWidget* QGCBaseParamWidget::initWithUAS(UASInterface *uas)
void
QGCBaseParamWidget
::
setUAS
(
UASInterface
*
uas
)
{
if
(
mav
)
{
//TODO disconnect any connections as needed
disconnectViewSignalsAndSlots
();
disconnectFromParamManager
();
clearOnboardParamDisplay
();
clearPendingParamDisplay
();
}
mav
=
uas
;
if
(
mav
)
{
connectToParamManager
();
connectViewSignalsAndSlots
();
layoutWidget
();
paramMgr
->
requestParameterListIfEmpty
();
if
(
uas
!=
mav
)
{
if
(
mav
)
{
//TODO disconnect any connections as needed
disconnectViewSignalsAndSlots
();
disconnectFromParamManager
();
clearOnboardParamDisplay
();
clearPendingParamDisplay
();
}
mav
=
uas
;
if
(
mav
)
{
connectToParamManager
();
connectViewSignalsAndSlots
();
layoutWidget
();
paramMgr
->
requestParameterListIfEmpty
();
}
}
}
...
...
src/ui/QGCPX4VehicleConfig.cc
View file @
d6801ac6
...
...
@@ -84,15 +84,16 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
//connect(ui->setTrimButton, SIGNAL(clicked()), this, SLOT(setTrimPositions()));
//TODO connect buttons here to save/clear actions?
mav
=
UASManager
::
instance
()
->
getActiveUAS
();
if
(
!
mav
)
{
qWarning
()
<<
"No active mav! "
;
}
else
{
ui
->
pendingCommitsWidget
->
initWithUAS
(
mav
);
UASInterface
*
tmpMav
=
UASManager
::
instance
()
->
getActiveUAS
();
if
(
tmpMav
)
{
ui
->
pendingCommitsWidget
->
initWithUAS
(
tmpMav
);
ui
->
pendingCommitsWidget
->
update
();
setActiveUAS
(
tmpMav
);
}
connect
(
UASManager
::
instance
(),
SIGNAL
(
activeUASSet
(
UASInterface
*
)),
this
,
SLOT
(
setActiveUAS
(
UASInterface
*
)));
//TODO the following methods are not yet implemented
// Connect RC mapping assignments
...
...
@@ -115,9 +116,9 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
// connect(ui->invertCheckBox_7, SIGNAL(clicked(bool)), this, SLOT(setAux2Inverted(bool)));
// connect(ui->invertCheckBox_8, SIGNAL(clicked(bool)), this, SLOT(setAux3Inverted(bool)));
connect
(
UASManager
::
instance
(),
SIGNAL
(
activeUASSet
(
UASInterface
*
)),
this
,
SLOT
(
setActiveUAS
(
UASInterface
*
)));
setActiveUAS
(
UASManager
::
instance
()
->
getActiveUAS
());
for
(
unsigned
int
i
=
0
;
i
<
chanMax
;
i
++
)
{
rcValue
[
i
]
=
UINT16_MAX
;
...
...
@@ -1248,6 +1249,7 @@ void QGCPX4VehicleConfig::parameterChanged(int uas, int component, QString param
return
;
}
//TODO this may introduce a bug with param editor widgets not receiving param updates
if
(
parameterName
.
startsWith
(
"RC"
))
{
handleRcParameterChange
(
parameterName
,
value
);
return
;
...
...
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