Changeset 19:280541440d22 in xplra for src/client/c

Timestamp:

02/03/13 13:46:17 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Getting multiple values works

Location:

src/client/c/hu/varadiistvan/xplra

Files:

• Exception.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• MultiBuffer.cc (added)
• MultiBuffer.h (added)
• MultiGetter.cc (added)
• MultiGetter.h (added)
• XPlane.cc (modified) (2 diffs)
• XPlane.h (modified) (1 diff)

src/client/c/hu/varadiistvan/xplra/Exception.h

@@ -177 +177 @@
      * Construct the exception
      */
-    NotConnectedException();
+    NotConnectedException() throw();
+};
+
+//------------------------------------------------------------------------------
+
+/**
+ * Exception thrown when we want to get or set a dataref in a
+ * MultiBuffer into or from a value of the wrong type.
+ */
+class TypeMismatchException : public Exception
+{
+public:
+    /**
+     * Construct the exception
+     */
+    TypeMismatchException() throw();
+};
+
+//------------------------------------------------------------------------------
+
+/**
+ * Exception thrown when we want to get or set a dataref with an
+ * invalid ID.
+ */
+class InvalidIDException : public Exception
+{
+public:
+    /**
+     * Construct the exception
+     */
+    InvalidIDException() throw();
 };
 
@@ -221 +251 @@
 //------------------------------------------------------------------------------
 
-inline NotConnectedException::NotConnectedException() :
+inline NotConnectedException::NotConnectedException() throw() :
     Exception("xplra::NotConnectedException: not connected to the simulator")
+{
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+inline TypeMismatchException::TypeMismatchException() throw() :
+    Exception("xplra::TypeMismatchException")
+{
+}
+
+//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+inline InvalidIDException::InvalidIDException() throw() :
+    Exception("xplra::InvalidIDException")
 {
 }

src/client/c/hu/varadiistvan/xplra/Makefile.am

@@ -4 +4 @@
 
 libxplra_la_SOURCES=\
+        Exception.cc    \
         XPlane.cc       \
-        Exception.cc    \
+        MultiBuffer.cc  \
+        MultiGetter.cc  \
         xplra.cc
 
@@ -16 +18 @@
 include_xplradir=$(includedir)/hu/varadiistvan/xplra
 include_xplra_HEADERS=\
+        Exception.h     \
         XPlane.h        \
-        Exception.h     \
+        MultiBuffer.h   \
+        MultiGetter.h   \
         xplra.h

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -53 +53 @@
 //------------------------------------------------------------------------------
 
-inline void XPlane::checkStream() throw(NotConnectedException, IOException)
+void XPlane::checkStream() throw(NotConnectedException, IOException)
 {
     if (stream==0) {
@@ -91 +91 @@
 //------------------------------------------------------------------------------
 
-inline void XPlane::checkResult() throw(ProtocolException)
+void XPlane::checkResult() throw(ProtocolException)
 {
     uint8_t result = stream->readU8();

src/client/c/hu/varadiistvan/xplra/XPlane.h

@@ -270 +270 @@
     void setArray(const char* name, uint8_t type, size_t length,
                   size_t offset) throw(Exception);
+
+    friend class MultiBuffer;
+    friend class MultiGetter;
+    friend class MultiSetter;
 };