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
d862ec87
Commit
d862ec87
authored
Aug 09, 2013
by
tstellanova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rm totalOnboardParameters
parent
3dd5866f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
23 deletions
+8
-23
QGCUASParamManager.cc
src/uas/QGCUASParamManager.cc
+3
-20
UASParameterDataModel.cc
src/uas/UASParameterDataModel.cc
+2
-1
UASParameterDataModel.h
src/uas/UASParameterDataModel.h
+0
-2
QGCParamSlider.cc
src/ui/designer/QGCParamSlider.cc
+3
-0
No files found.
src/uas/QGCUASParamManager.cc
View file @
d862ec87
...
...
@@ -8,7 +8,9 @@
QGCUASParamManager
::
QGCUASParamManager
(
UASInterface
*
uas
,
QWidget
*
parent
)
:
QWidget
(
parent
),
mav
(
uas
)
mav
(
uas
),
paramDataModel
(
NULL
),
paramCommsMgr
(
NULL
)
{
paramDataModel
=
uas
->
getParamDataModel
();
paramCommsMgr
=
uas
->
getParamCommsMgr
();
...
...
@@ -18,25 +20,6 @@ QGCUASParamManager::QGCUASParamManager(UASInterface* uas, QWidget *parent) :
loadParamMetaInfoCSV
();
// // Connect retransmission guard
// connect(this, SIGNAL(parameterUpdateRequested(int,QString)),
// this, SLOT(requestParameterUpdate(int,QString)));
// //TODO connect in paramCommsMgr instead
// connect(this, SIGNAL(parameterUpdateRequestedById(int,int)),
// mav, SLOT(requestParameter(int,int)));
// New parameters from UAS
void
parameterUpdated
(
int
compId
,
QString
paramName
,
QVariant
value
);
// connect(uas, SIGNAL(parameterChanged(int,int,int,int,QString,QVariant)),
// this, SLOT(receivedParameterUpdate(int,int,int,int,QString,QVariant)));
}
...
...
src/uas/UASParameterDataModel.cc
View file @
d862ec87
...
...
@@ -11,7 +11,8 @@
UASParameterDataModel
::
UASParameterDataModel
(
QObject
*
parent
)
:
QObject
(
parent
)
{
onboardParameters
.
clear
();
pendingParameters
.
clear
();
}
...
...
src/uas/UASParameterDataModel.h
View file @
d862ec87
...
...
@@ -14,7 +14,6 @@ public:
explicit
UASParameterDataModel
(
QObject
*
parent
=
0
);
int
getTotalOnboardParams
()
{
return
totalOnboardParameters
;
}
//Parameter meta info
bool
isParamMinKnown
(
const
QString
&
param
)
{
return
paramMin
.
contains
(
param
);
}
virtual
bool
isValueLessThanParamMin
(
const
QString
&
param
,
double
dblVal
);
...
...
@@ -97,7 +96,6 @@ protected:
int
uasId
;
///< The UAS / MAV to which this data model pertains
QMap
<
int
,
QMap
<
QString
,
QVariant
>*
>
pendingParameters
;
///< Changed values that have not yet been transmitted to the UAS, by component ID
QMap
<
int
,
QMap
<
QString
,
QVariant
>*
>
onboardParameters
;
///< All parameters confirmed to be stored onboard the UAS, by component ID
int
totalOnboardParameters
;
///< The known count of onboard parameters, may not match onboardParameters until all params are received
// Tooltip data structures
QMap
<
QString
,
QString
>
paramDescriptions
;
///< Tooltip values
...
...
src/ui/designer/QGCParamSlider.cc
View file @
d862ec87
...
...
@@ -175,6 +175,9 @@ void QGCParamSlider::selectParameter(int paramIndex)
{
// Set name
parameterName
=
ui
->
editSelectParamComboBox
->
itemText
(
paramIndex
);
if
(
parameterName
.
isEmpty
())
{
return
;
}
// Update min and max values if available
if
(
uas
)
{
...
...
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