Browse Source

working on itertator in paramlist

QGC4.4
Bryan Godbolt 15 years ago
parent
commit
e8b9da145b
  1. 3
      qgroundcontrol.pro
  2. 2
      src/comm/ParameterList.cc
  3. 13
      src/comm/ParameterList.h

3
qgroundcontrol.pro

@ -226,6 +226,8 @@ RESOURCES = mavground.qrc @@ -226,6 +226,8 @@ RESOURCES = mavground.qrc
# Include RT-LAB Library
win32 {
exists(src/lib/opalrt/OpalApi.h){
message("Building support for Opal-RT")
LIBS += -LC:\OPAL-RT\RT-LAB7.2.4\Common\bin \
-lOpalApi
INCLUDEPATH += src/lib/opalrt
@ -240,3 +242,4 @@ win32 { @@ -240,3 +242,4 @@ win32 {
src/comm/ParameterList.h
DEFINES += OPAL_RT
}
}

2
src/comm/ParameterList.cc

@ -75,7 +75,7 @@ ParameterList::const_iterator::const_iterator() @@ -75,7 +75,7 @@ ParameterList::const_iterator::const_iterator()
}
ParameterList::begin()
const_iterator ParameterList::begin()
{
}

13
src/comm/ParameterList.h

@ -41,23 +41,24 @@ namespace OpalRT @@ -41,23 +41,24 @@ namespace OpalRT
{
class ParameterList
{
public:
class const_iterator
{
public:
const_iterator();
const_iterator(const_iterator& other);
private:
QMap<int, QMap<QGCParamID, Parameter> >::const_iterator componentIter;
QMap<QGCParamID, Parameter>::const_iterator paramIter;
int componentID;
QGCParamID paramID;
};
public:
ParameterList();
~ParameterList();
int setValue(int compid, QGCParamID paramid, float value);
float getValue(int compid, QGCParamID paramid);
const_iterator begin() const;
const_iterator end() const;
// const_iterator begin() const;
// const_iterator end() const;
protected:
QMap<int, QMap<QGCParamID, Parameter> > *params;

Loading…
Cancel
Save