Changeset 1719

Timestamp:

27/10/11 23:04:16 (7 months ago)

Author:

Janik Zikovsky

Message:

Refs #294 : Merging more changes from Mantid NexusCPP. Changed the behavior of putAttr() to NOT throw if given an empty string.

Location:

trunk/bindings/cpp

Files:

• NeXusFile.cpp (modified) (5 diffs)
• NeXusFile.hpp (modified) (2 diffs)

trunk/bindings/cpp/NeXusFile.cpp

@@ -570 +570 @@
 
 void File::putAttr(const std::string& name, const std::string value) {
-  if (value.empty()) {
-    throw Exception("Supplied empty value to putAttr");
-  }
   string my_value(value);
+  if (my_value.empty())
+    my_value = " "; // Make a default "space" to avoid errors.
   AttrInfo info;
   info.name = name;
-  info.length = my_value.size();
+  info.length = static_cast<int>(my_value.size());
   info.type = CHAR;
   this->putAttr(info, &(my_value[0]));
@@ -960 +959 @@
 }
 
-map<string, string> File::getEntries() {
+map<string, string> File::getEntries()
+{
+  map<string, string> result;
+  this->getEntries(result);
+  return result;
+}
+
+void File::getEntries(std::map<std::string, std::string> & map)
+{
   this->initGroupDir();
-
-  map<string, string> result;
-
   pair<string,string> temp;
   while (true) {
@@ -972 +976 @@
     }
     else {
-      result.insert(temp);
+      map.insert(temp);
     }
   }
-
-  return result;
-}
+}
+
 
 void File::getSlab(void* data, const vector<int>& start,
@@ -1127 +1130 @@
   return infos;
 }
+
+bool File::hasAttr(const std::string & name)
+{
+  this->initAttrDir();
+  AttrInfo temp;
+  while(true) {
+    temp = this->getNextAttr();
+    if (temp.name == NULL_STR) {
+      break;
+    }
+    if (temp.name == name)
+      return true;
+  }
+  return false;
+}
+
 
 NXlink File::getGroupID() {
@@ -1720 +1739 @@
 NXDLL_EXPORT void File::putSlab(std::vector<uint64_t>& data, int start, int size);
 
+template
+NXDLL_EXPORT void File::putSlab(std::vector<float>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<double>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<int8_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<uint8_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<int16_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<uint16_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<int32_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<uint32_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<int64_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+template
+NXDLL_EXPORT void File::putSlab(std::vector<uint64_t>& data, std::vector<int64_t> & start, std::vector<int64_t> & size);
+
 template 
 NXDLL_EXPORT void File::getAttr(const std::string& name, double& value);

trunk/bindings/cpp/NeXusFile.hpp

@@ -673 +673 @@
     std::map<std::string, std::string> getEntries();
 
+    /** Return the entries available in the current place in the file,
+     * but avoids the map copy of getEntries().
+     *
+     * \param map The map that will be filled with the entries
+     */
+    void getEntries(std::map<std::string, std::string> & map);
+
     /**
      * \copydoc NeXus::File::getSlab(void*, const std::vector<int64_t>&,
@@ -696 +703 @@
      */
     std::vector<AttrInfo> getAttrInfos();
+
+    /**
+     *  \return true if the current point in the file has the named attribute
+     *  \param name the name of the attribute to look for.
+     */
+    bool hasAttr(const std::string & name);
 
     /**