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
73ce117b
Commit
73ce117b
authored
Aug 07, 2013
by
tstellanova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More signal /slot fixes
parent
c1ed602e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
13 deletions
+17
-13
QGCUASParamManager.cc
src/uas/QGCUASParamManager.cc
+0
-5
QGCUASParamManager.h
src/uas/QGCUASParamManager.h
+1
-1
QGCParamWidget.cc
src/ui/QGCParamWidget.cc
+15
-6
QGCParamWidget.h
src/ui/QGCParamWidget.h
+1
-1
No files found.
src/uas/QGCUASParamManager.cc
View file @
73ce117b
...
...
@@ -30,16 +30,11 @@ QGCUASParamManager::QGCUASParamManager(UASInterface* uas, QWidget *parent) :
void
parameterUpdated
(
int
compId
,
QString
paramName
,
QVariant
value
);
connect
(
paramDataModel
,
SIGNAL
(
parameterUpdated
(
int
,
QString
,
QVariant
)),
this
,
SLOT
(
handleParameterUpdate
(
int
,
QString
,
QVariant
)));
// connect(uas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)),
// this, SLOT(receivedParameterUpdate(int,int,int,int,QString,QVariant)));
// Listen for param list reload finished
connect
(
paramCommsMgr
,
SIGNAL
(
parameterListUpToDate
()),
this
,
SLOT
(
handleParameterListUpToDate
()));
...
...
src/uas/QGCUASParamManager.h
View file @
73ce117b
...
...
@@ -52,7 +52,7 @@ public slots:
/** @brief Request a single parameter by name from the MAV */
virtual
void
requestParameterUpdate
(
int
component
,
const
QString
&
parameter
);
virtual
void
handleParameterUpdate
(
int
component
,
int
paramId
,
const
QString
&
parameterName
,
QVariant
value
)
=
0
;
virtual
void
handleParameterUpdate
(
int
component
,
const
QString
&
parameterName
,
QVariant
value
)
=
0
;
virtual
void
handleParameterListUpToDate
()
=
0
;
...
...
src/ui/QGCParamWidget.cc
View file @
73ce117b
...
...
@@ -133,17 +133,27 @@ QGCParamWidget::QGCParamWidget(UASInterface* uas, QWidget *parent) :
tree
->
setExpandsOnDoubleClick
(
true
);
// Connect signals/slots
connect
(
this
,
SIGNAL
(
parameterChanged
(
int
,
QString
,
QVariant
)),
mav
,
SLOT
(
setParameter
(
int
,
QString
,
QVariant
)));
connect
(
tree
,
SIGNAL
(
itemChanged
(
QTreeWidgetItem
*
,
int
)),
this
,
SLOT
(
parameterItemChanged
(
QTreeWidgetItem
*
,
int
)));
// connect(this, SIGNAL(parameterChanged(int,QString,QVariant)),
// mav, SLOT(setParameter(int,QString,QVariant)));
connect
(
tree
,
SIGNAL
(
itemChanged
(
QTreeWidgetItem
*
,
int
)),
this
,
SLOT
(
parameterItemChanged
(
QTreeWidgetItem
*
,
int
)));
// New parameters from UAS
connect
(
uas
,
SIGNAL
(
parameterChanged
(
int
,
int
,
int
,
int
,
QString
,
QVariant
)),
this
,
SLOT
(
receivedParameterUpdate
(
int
,
int
,
int
,
int
,
QString
,
QVariant
)));
//
// New parameters from UAS
//
connect(uas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)), this, SLOT(receivedParameterUpdate(int,int,int,int,QString,QVariant)));
// connect(&retransmissionTimer, SIGNAL(timeout()), this, SLOT(retransmissionGuardTick()));
// connect(this, SIGNAL(requestParameter(int,QString)), uas, SLOT(requestParameter(int,QString)));
// connect(this, SIGNAL(requestParameter(int,int)), uas, SLOT(requestParameter(int,int)));
connect
(
paramDataModel
,
SIGNAL
(
parameterUpdated
(
int
,
QString
,
QVariant
)),
this
,
SLOT
(
handleParameterUpdate
(
int
,
QString
,
QVariant
)));
// Listen for param list reload finished
connect
(
paramCommsMgr
,
SIGNAL
(
parameterListUpToDate
()),
this
,
SLOT
(
handleParameterListUpToDate
()));
// Get parameters
if
(
uas
)
{
requestAllParamsUpdate
();
...
...
@@ -331,9 +341,8 @@ void QGCParamWidget::addComponentItem( int compId, QString compName)
//}
void
QGCParamWidget
::
handleParameterUpdate
(
int
componentId
,
int
paramId
,
const
QString
&
paramName
,
QVariant
value
)
void
QGCParamWidget
::
handleParameterUpdate
(
int
componentId
,
const
QString
&
paramName
,
QVariant
value
)
{
Q_UNUSED
(
paramId
);
updateParameterDisplay
(
componentId
,
paramName
,
value
);
}
...
...
src/ui/QGCParamWidget.h
View file @
73ce117b
...
...
@@ -67,7 +67,7 @@ public slots:
/** @brief Add a parameter to the list with retransmission / safety checks */
// void receivedParameterUpdate(int uas, int component, int paramCount, int paramId, QString parameterName, QVariant value);
virtual
void
handleParameterUpdate
(
int
component
,
int
paramId
,
const
QString
&
parameterName
,
QVariant
value
);
virtual
void
handleParameterUpdate
(
int
component
,
const
QString
&
parameterName
,
QVariant
value
);
virtual
void
handleParameterListUpToDate
();
virtual
void
handleParamStatusMsgUpdate
(
QString
msg
,
int
level
);
...
...
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