Changeset 1596 for trunk/bindings

Timestamp:

30/06/11 14:54:13 (11 months ago)

Author:

Janik Zikovsky

Message:

Added methods to C++ API called getDataCoerce() to convert from differently-sized ints or doubles to a vector of doubles or a vector of ints. Added tests for those methods. Fixes #277.

Location:

trunk/bindings/cpp

Files:

• NeXusFile.cpp (modified) (1 diff)
• NeXusFile.hpp (modified) (1 diff)

trunk/bindings/cpp/NeXusFile.cpp

@@ -644 +644 @@
   this->getData(&(data[0]));
 }
+
+
+void File::getDataCoerce(vector<int> &data)
+{
+  Info info = this->getInfo();
+  if (info.type == INT8)
+  {
+    vector<int8_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT8)
+  {
+    vector<uint8_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == INT16)
+  {
+    vector<int16_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT16)
+  {
+    vector<uint16_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == INT32)
+  {
+    vector<int32_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT32)
+  {
+    vector<uint32_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else
+  {
+    throw Exception("NexusFile::getDataCoerce(): Could not coerce to int.");
+  }
+}
+
+void File::getDataCoerce(vector<double> &data)
+{
+  Info info = this->getInfo();
+  if (info.type == INT8)
+  {
+    vector<int8_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT8)
+  {
+    vector<uint8_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == INT16)
+  {
+    vector<int16_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT16)
+  {
+    vector<uint16_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == INT32)
+  {
+    vector<int32_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == UINT32)
+  {
+    vector<uint32_t> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == FLOAT32)
+  {
+    vector<float> result;
+    this->getData(result);
+    data.assign(result.begin(), result.end());
+  }
+  else if (info.type == FLOAT64)
+  {
+    this->getData(data);
+  }
+  else
+  {
+    throw Exception("NexusFile::getDataCoerce(): Could not coerce to double.");
+  }
+}
+
+bool File::isDataInt()
+{
+  Info info = this->getInfo();
+  switch(info.type)
+  {
+  case INT8:
+  case UINT8:
+  case INT16:
+  case UINT16:
+  case INT32:
+  case UINT32:
+    return true;
+  default:
+    return false;
+  }
+}
+
+
 
 string File::getStrData() {

trunk/bindings/cpp/NeXusFile.hpp

@@ -494 +494 @@
     void getData(std::vector<NumT>& data);
 
+    /** Get data and coerce into an int vector.
+     *
+     * @throw Exception if the data is actually a float or
+     *    another type that cannot be coerced to an int.
+     * @param data :: vector to be filled.
+     */
+    void getDataCoerce(std::vector<int> &data);
+
+    /** Get data and coerce into a vector of doubles.
+     *
+     * @throw Exception if the data cannot be coerced to a double.
+     * @param data :: vector to be filled.
+     */
+    void getDataCoerce(std::vector<double> &data);
+
+    /** Return true if the data opened is of one of the
+     * int data types, 32 bits or less.
+     */
+    bool isDataInt();
+
     /**
      * \return String data from the file.