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
5a69605a
Commit
5a69605a
authored
Aug 15, 2013
by
tstellanova
Browse files
Fix param widget init
parent
f1b83268
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/QGCBaseParamWidget.cc
View file @
5a69605a
...
...
@@ -20,8 +20,6 @@ QGCBaseParamWidget::QGCBaseParamWidget(QWidget *parent) :
QGCBaseParamWidget
*
QGCBaseParamWidget
::
initWithUAS
(
UASInterface
*
uas
)
{
setUAS
(
uas
);
layoutWidget
();
return
this
;
}
...
...
@@ -34,11 +32,16 @@ void QGCBaseParamWidget::setUAS(UASInterface* uas)
clearOnboardParamDisplay
();
clearPendingParamDisplay
();
}
mav
=
uas
;
connectToParamManager
();
connectViewSignalsAndSlots
();
paramMgr
->
requestParameterListIfEmpty
();
if
(
mav
)
{
connectToParamManager
();
connectViewSignalsAndSlots
();
layoutWidget
();
paramMgr
->
requestParameterListIfEmpty
();
}
}
...
...
src/ui/QGCPX4VehicleConfig.cc
View file @
5a69605a
...
...
@@ -85,8 +85,13 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
//TODO connect buttons here to save/clear actions?
mav
=
UASManager
::
instance
()
->
getActiveUAS
();
ui
->
pendingCommitsWidget
->
initWithUAS
(
mav
);
ui
->
pendingCommitsWidget
->
update
();
if
(
!
mav
)
{
qWarning
()
<<
"No active mav! "
;
}
else
{
ui
->
pendingCommitsWidget
->
initWithUAS
(
mav
);
ui
->
pendingCommitsWidget
->
update
();
}
//TODO the following methods are not yet implemented
...
...
@@ -872,6 +877,8 @@ void QGCPX4VehicleConfig::setActiveUAS(UASInterface* active)
paramMgr
=
mav
->
getParamManager
();
ui
->
pendingCommitsWidget
->
setUAS
(
mav
);
// Reset current state
resetCalibrationRC
();
//TODO eliminate the separate RC_TYPE call
...
...
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