Merge pull request #259 from Flamefire/colType

Keep info on H5 datatypes in collection types

Author: ax3l

src/include/splash/CollectionType.hpp

@@ -70,8 +70,12 @@ namespace splash
          */
         virtual ~CollectionType()
         {
-        };
+        }
     protected:
+        explicit CollectionType(H5DataType inType = -1): type(inType)
+        {
+        }
+
         H5DataType type;
     };
 

src/include/splash/basetypes/ColTypeDim.hpp

@@ -40,10 +40,10 @@ namespace splash
 
         ColTypeDim()
         {
-            this->type = H5Tcreate(H5T_COMPOUND, Dimensions::getSize());
+            this->type = H5Tcreate(H5T_COMPOUND, getSize());
             H5Tinsert(this->type, "x", 0, H5T_NATIVE_HSIZE);
-            H5Tinsert(this->type, "y", sizeof (hsize_t), H5T_NATIVE_HSIZE);
-            H5Tinsert(this->type, "z", sizeof (hsize_t) * 2, H5T_NATIVE_HSIZE);
+            H5Tinsert(this->type, "y", sizeof(hsize_t), H5T_NATIVE_HSIZE);
+            H5Tinsert(this->type, "z", sizeof(hsize_t) * 2, H5T_NATIVE_HSIZE);
         }
 
         ~ColTypeDim()
@@ -53,7 +53,7 @@ namespace splash
 
         size_t getSize() const
         {
-            return Dimensions::getSize();
+            return getSize_();
         }
 
         std::string toString() const
@@ -69,7 +69,7 @@ namespace splash
             {
                 if(H5Tget_nmembers(datatype_id) == 3)
                 {
-                    if(H5Tget_size(datatype_id) == Dimensions::getSize())
+                    if(H5Tget_size(datatype_id) == getSize_())
                     {
                         char* m0 = H5Tget_member_name(datatype_id, 0);
                         char* m1 = H5Tget_member_name(datatype_id, 1);
@@ -88,7 +88,14 @@ namespace splash
             else
                 return NULL;
         }
-    };
+    
+    private:
+        static size_t getSize_()
+        {
+            return sizeof(hsize_t) * 3;
+        }
+
+   };
 }
 
 #endif /* COLTYPEDIM_H */

src/include/splash/basetypes/ColTypeDimArray.hpp

@@ -25,7 +25,7 @@
 #define COLTYPEDIMARRAY_H
 
 #include "splash/CollectionType.hpp"
-
+#include "splash/Dimensions.hpp"
 #include <string>
 
 namespace splash

src/include/splash/basetypes/ColTypeString.hpp

@@ -1,5 +1,6 @@
 /**
- * Copyright 2013-2015 Felix Schmitt, Axel Huebl, Carlchristian Eckert
+ * Copyright 2013-2016 Felix Schmitt, Axel Huebl, Carlchristian Eckert,
+ * Alexander Grund
  *
  * This file is part of libSplash.
  *
@@ -67,11 +68,13 @@ namespace splash
             size_t myElements = H5Tget_size(this->type);
 
             /* for variable length string the size is first known after reading
-             * the actual data or attribute, so we forward HDF5's behaviour */
-            if( H5Tis_variable_str(this->type) )
+             * the actual data or attribute, so we forward HDF5's behavior */
+            if(isVariableLength())
                return myElements; /* == sizeof(char*) see H5Tget_size description */
-            else
+            else if( isNullTerminated() )
                return sizeof(char) * (myElements - 1); /* just as strlen() */
+            else
+                return sizeof(char) * myElements;
         }
 
         static CollectionType* genType(hid_t datatype_id)
@@ -80,14 +83,7 @@ namespace splash
 
             if(h5_class == H5T_STRING)
             {
-                if( H5Tis_variable_str(datatype_id) )
-                {
-                    return new ColTypeString;
-                } else
-                {
-                    size_t size = H5Tget_size(datatype_id);
-                    return new ColTypeString(size);
-                }
+                return new ColTypeString(datatype_id, true);
             } else
             {
                 return NULL;
@@ -96,12 +92,27 @@ namespace splash
 
         std::string toString() const
         {
-            if( H5Tis_variable_str(this->type) )
+            if(isVariableLength())
                 return "VLString";
             else
                 return "String";
         }
 
+        bool isVariableLength() const
+        {
+            return H5Tis_variable_str(this->type);
+        }
+
+        bool isNullTerminated() const
+        {
+            return H5Tget_strpad(type) == H5T_STR_NULLTERM;
+        }
+
+    private:
+        explicit ColTypeString(H5DataType inType, bool /*dummy*/):
+        CollectionType(H5Tcopy(inType))
+        {
+        }
     };
 
 }