From 4f37d95acad180882501f45ad8abe6d2bb2f6551 Mon Sep 17 00:00:00 2001
From: ephy <ephy>
Date: Fri, 9 Apr 2010 07:58:09 +0000
Subject: [PATCH] GCS/uavobjects: Fix uavobjectfieldenum array support.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@445 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 .../plugins/uavobjects/uavobjectfieldenum.cpp    | 16 ++++++++--------
 .../src/plugins/uavobjects/uavobjectfieldenum.h  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ground/src/plugins/uavobjects/uavobjectfieldenum.cpp b/ground/src/plugins/uavobjects/uavobjectfieldenum.cpp
index f4b0860d2..9a114e0b6 100644
--- a/ground/src/plugins/uavobjects/uavobjectfieldenum.cpp
+++ b/ground/src/plugins/uavobjects/uavobjectfieldenum.cpp
@@ -41,32 +41,32 @@ QStringList UAVObjectFieldEnum::getOptions()
     return options;
 }
 
-QString UAVObjectFieldEnum::getSelected()
+QString UAVObjectFieldEnum::getSelected(quint32 arrayIndex)
 {
-    return options[getValue()];
+    return options[getValue(arrayIndex)];
 }
 
-void UAVObjectFieldEnum::setSelected(QString& val)
+void UAVObjectFieldEnum::setSelected(QString& val, quint32 arrayIndex)
 {
     // Find index of selected value
     int index = options.indexOf(val);
     if (index >= 0)
     {
-        setValue(index);
+        setValue(index, arrayIndex);
     }
 }
 
-quint8 UAVObjectFieldEnum::getSelectedIndex()
+quint8 UAVObjectFieldEnum::getSelectedIndex(quint32 arrayIndex)
 {
-    return getValue();
+    return getValue(arrayIndex);
 }
 
-void UAVObjectFieldEnum::setSelectedIndex(quint8 index)
+void UAVObjectFieldEnum::setSelectedIndex(quint8 index, quint32 arrayIndex)
 {
     // Check that the index is valid
     if (index < options.length())
     {
-        setValue(index);
+        setValue(index, arrayIndex);
     }
 }
 
diff --git a/ground/src/plugins/uavobjects/uavobjectfieldenum.h b/ground/src/plugins/uavobjects/uavobjectfieldenum.h
index 43ce71771..28e41d8f0 100644
--- a/ground/src/plugins/uavobjects/uavobjectfieldenum.h
+++ b/ground/src/plugins/uavobjects/uavobjectfieldenum.h
@@ -42,10 +42,10 @@ class UAVOBJECTS_EXPORT UAVObjectFieldEnum: public UAVObjectField
 public:
     UAVObjectFieldEnum(const QString& name, const QString& units, quint32 numElements, QStringList& options);
     QStringList getOptions();
-    QString getSelected();
-    void setSelected(QString& val);
-    quint8 getSelectedIndex();
-    void setSelectedIndex(quint8 index);
+    QString getSelected(quint32 arrayIndex);
+    void setSelected(QString& val, quint32 arrayIndex);
+    quint8 getSelectedIndex(quint32 arrayIndex);
+    void setSelectedIndex(quint8 index, quint32 arrayIndex);
     void initializeValues();
     qint32 pack(quint8* dataOut);
     qint32 unpack(const quint8* dataIn);