Reading and writing of Mappings and DenseField works.

Author: magnusw

export/Exception.h

@@ -145,10 +145,15 @@ DECLARE_FIELD3D_GENERIC_EXCEPTION(WriteMACFieldDataException, Exception)
 DECLARE_FIELD3D_GENERIC_EXCEPTION(WriteMappingException, Exception)
 DECLARE_FIELD3D_GENERIC_EXCEPTION(WriteSimpleDataException, Exception)
 
+DECLARE_FIELD3D_GENERIC_EXCEPTION(OgIGroupException, Exception)
+DECLARE_FIELD3D_GENERIC_EXCEPTION(OgIDatasetException, Exception)
+DECLARE_FIELD3D_GENERIC_EXCEPTION(OgIAttributeException, Exception)
 DECLARE_FIELD3D_GENERIC_EXCEPTION(OgOGroupException, Exception)
 DECLARE_FIELD3D_GENERIC_EXCEPTION(OgODatasetException, Exception)
 DECLARE_FIELD3D_GENERIC_EXCEPTION(OgOAttributeException, Exception)
 
+DECLARE_FIELD3D_GENERIC_EXCEPTION(ReadDataException, Exception)
+
 //----------------------------------------------------------------------------//
 
 } // namespace Exc

export/Field3DFile.h

@@ -408,6 +408,19 @@ class FIELD3D_API Field3DInputFile : public Field3DFileBase
 
   virtual void closeInternal()
   {
+    cleanup();
+  }
+
+  void cleanup()
+  {
+    // The destruction of the various Ogawa components must happen in the
+    // right order
+    
+    // First, the partition groups
+    m_partitions.clear();
+    // Then the root group
+    m_root.reset();
+    // Finally, the archive
     m_archive.reset();
   }
 
@@ -513,12 +526,23 @@ class FIELD3D_API Field3DInputFile : public Field3DFileBase
   readLayer(const std::string &intPartitionName, 
             const std::string &layerName) const;
 
+  //! Sets up all the partitions and layers, but does not load any data
+  bool readPartitionAndLayerInfo();
+
+  //! Read metadata for this layer
+  bool readMetadata(OgIGroup &metadataGroup, FieldBase::Ptr field) const;
+
+  //! Read global metadata for this file
+  bool readMetadata(OgIGroup &metadataGroup);
+
   // Data members --------------------------------------------------------------
 
   //! Filename, only to be set by open().
   std::string m_filename;
   //! Pointer to the Ogawa archive
   boost::shared_ptr<Alembic::Ogawa::IArchive> m_archive;
+  //! Pointer to root group
+  boost::shared_ptr<OgIGroup> m_root;
 
 };
 
@@ -571,6 +595,11 @@ class FIELD3D_API Field3DOutputFile : public Field3DFileBase
   // From Field3DFileBase ------------------------------------------------------
 
   virtual void closeInternal()
+  {
+    cleanup();
+  }
+
+  void cleanup()
   {
     // The destruction of the various Ogawa components must happen in the
     // right order
@@ -678,7 +707,7 @@ class FIELD3D_API Field3DOutputFile : public Field3DFileBase
   //! Writes the mapping to the given Og node.
   //! Mappings are assumed to be light-weight enough to be stored as 
   //! plain attributes under a group.
-  bool writeMapping(OgOGroup &partitionLocation, FieldMapping::Ptr mapping);
+  bool writeMapping(OgOGroup &partitionGroup, FieldMapping::Ptr mapping);
 
   //! Writes metadata for this layer
   bool writeMetadata(OgOGroup &metadataGroup, FieldBase::Ptr layer);
@@ -771,16 +800,6 @@ Field3DInputFile::readLayers(const std::string &partitionName,
 
 //----------------------------------------------------------------------------//
 
-template <class Data_T>
-typename Field<Data_T>::Ptr
-Field3DInputFile::readLayer(const std::string &intPartitionName,
-                            const std::string &layerName) const
-{
-  return typename Field<Data_T>::Ptr();
-}
-
-//----------------------------------------------------------------------------//
-
 FIELD3D_NAMESPACE_HEADER_CLOSE
 
 //----------------------------------------------------------------------------//

export/Field3DFileHDF5.h

@@ -1606,7 +1606,6 @@ readField(const std::string &className, hid_t layerGroup,
   typedef typename Field<Data_T>::Ptr FieldPtr;
 
   FieldIO::Ptr io = factory.createFieldIO(className);
-  assert(io != 0);
   if (!io) {
     Msg::print(Msg::SevWarning, "Unable to find class type: " + 
                className);

export/FieldIO.h

@@ -56,6 +56,7 @@
 #include <typeinfo>
 
 #include "Field.h"
+#include "OgawaFwd.h"
 #include "Log.h"
 
 //----------------------------------------------------------------------------//
@@ -118,11 +119,22 @@ class FieldIO : public RefBase
                               const std::string &layerPath,
                               DataTypeEnum typeEnum) = 0;
 
+  //! Read the field at the given Ogawa group
+  //! \returns Pointer to the created field, or a null pointer if the field
+  //! couldn't be read.
+  virtual FieldBase::Ptr read(OgIGroup &layerGroup, const std::string &filename,
+                              const std::string &layerPath,
+                              OgDataType typeEnum) = 0;
+
   //! Write the field to the given layer group
   //! \returns Whether the operation was successful
   virtual bool write(hid_t layerGroup, FieldBase::Ptr field) = 0;
 
-  //! Returns the class name. This is used when registering the class to the
+   //! Write the field to the given layer group
+  //! \returns Whether the operation was successful
+  virtual bool write(OgOGroup &layerGroup, FieldBase::Ptr field) = 0;
+
+ //! Returns the class name. This is used when registering the class to the
   //! FieldIOFactory object.
   virtual std::string className() const = 0;
 

export/FieldMappingIO.h

@@ -51,6 +51,7 @@
 #include <hdf5.h>
 
 #include "FieldMapping.h"
+#include "OgawaFwd.h"
 
 //----------------------------------------------------------------------------//
 
@@ -98,10 +99,19 @@ class FieldMappingIO : public RefBase
   //! couldn't be read.
   virtual FieldMapping::Ptr read(hid_t mappingGroup) = 0;
 
+  //! Read the field at the given hdf5 group
+  //! \returns Pointer to the created field, or a null pointer if the field
+  //! couldn't be read.
+  virtual FieldMapping::Ptr read(OgIGroup &mappingGroup) = 0;
+
   //! Write the field to the given mapping group
   //! \returns Whether the operation was successful
   virtual bool write(hid_t mappingGroup, FieldMapping::Ptr mapping) = 0;
 
+  //! Write the field to the given mapping group
+  //! \returns Whether the operation was successful
+  virtual bool write(OgOGroup &mappingGroup, FieldMapping::Ptr mapping) = 0;
+
   //! Returns the class name. This is used when registering the class in the
   //! ClassFactory.
   virtual std::string className() const = 0;
@@ -161,10 +171,19 @@ class NullFieldMappingIO : public FieldMappingIO
   //! \returns Null if no object was read
   virtual FieldMapping::Ptr read(hid_t mappingGroup);
 
+  //! Reads the field mapping and tries to create a NullFieldMapping
+  //! object from it.
+  //! \returns Null if no object was read
+  virtual FieldMapping::Ptr read(OgIGroup &mappingGroup);
+
   //! Writes the given field mapping to disk.
   //! \return true if successful, otherwise false
   virtual bool write(hid_t mappingGroup, FieldMapping::Ptr mapping);
 
+  //! Writes the given field mapping to disk.
+  //! \return true if successful, otherwise false
+  virtual bool write(OgOGroup &mappingGroup, FieldMapping::Ptr mapping);
+
   //! Returns the class name
   virtual std::string className() const;
 
@@ -224,10 +243,19 @@ class MatrixFieldMappingIO : public FieldMappingIO
   //! \returns Matrix if no object was read
   virtual FieldMapping::Ptr read(hid_t mappingGroup);
 
+  //! Reads the field mapping and tries to create a MatrixFieldMapping
+  //! object from it.
+  //! \returns Matrix if no object was read
+  virtual FieldMapping::Ptr read(OgIGroup &mappingGroup);
+
   //! Writes the given field mapping to disk.
   //! \return true if successful, otherwise false
   virtual bool write(hid_t mappingGroup, FieldMapping::Ptr mapping);
 
+  //! Writes the given field mapping to disk.
+  //! \return true if successful, otherwise false
+  virtual bool write(OgOGroup &mappingGroup, FieldMapping::Ptr mapping);
+
   //! Returns the class name
   virtual std::string className() const;
 
@@ -287,10 +315,19 @@ class FrustumFieldMappingIO : public FieldMappingIO
   //! \returns Null pointer if no object was read
   virtual FieldMapping::Ptr read(hid_t mappingGroup);
 
+  //! Reads the field mapping and tries to create a FrustumFieldMapping
+  //! object from it.
+  //! \returns Null pointer if no object was read
+  virtual FieldMapping::Ptr read(OgIGroup &mappingGroup);
+
   //! Writes the given field mapping to disk.
   //! \return true if successful, otherwise false
   virtual bool write(hid_t mappingGroup, FieldMapping::Ptr mapping);
 
+  //! Writes the given field mapping to disk.
+  //! \return true if successful, otherwise false
+  virtual bool write(OgOGroup &mappingGroup, FieldMapping::Ptr mapping);
+
   //! Returns the class name
   virtual std::string className() const;
 

export/OgawaFwd.h

@@ -45,10 +45,14 @@
 #ifndef _INCLUDED_Field3D_OgawaFwd_H_
 #define _INCLUDED_Field3D_OgawaFwd_H_
 
+#include "ns.h"
+
 //----------------------------------------------------------------------------//
 // Forward declarations
 //----------------------------------------------------------------------------//
 
+FIELD3D_NAMESPACE_OPEN
+
 class OgIGroup;
 class OgOGroup;
 
@@ -62,6 +66,10 @@ class OgIDataset;
 template <typename T>
 class OgODataset;
 
+FIELD3D_NAMESPACE_HEADER_CLOSE
+
+//----------------------------------------------------------------------------//
+
 namespace Alembic {
   namespace Ogawa {
     namespace v7 {

export/Traits.h

@@ -59,6 +59,48 @@ for converting templatization into strings and enums.
 
 FIELD3D_NAMESPACE_OPEN
 
+//----------------------------------------------------------------------------//
+// Types
+//----------------------------------------------------------------------------//
+
+#if !defined(_MSC_VER)
+using ::uint8_t;
+using ::int8_t;
+using ::uint16_t;
+using ::int16_t;
+using ::uint32_t;
+using ::int32_t;
+using ::uint64_t;
+using ::int64_t;
+#else
+typedef unsigned char           uint8_t;
+typedef signed char             int8_t;
+typedef unsigned short          uint16_t;
+typedef signed short            int16_t;
+typedef unsigned int            uint32_t;
+typedef int                     int32_t;
+typedef unsigned long long      uint64_t;
+typedef long long               int64_t;
+#endif
+
+typedef half                    float16_t;
+typedef float                   float32_t;
+typedef double                  float64_t;
+
+#ifdef FIELD3D_VERSION_NS
+typedef Field3D::V3h            vec16_t;
+typedef Field3D::V3f            vec32_t;
+typedef Field3D::V3d            vec64_t;
+typedef Field3D::V3i            veci32_t;
+typedef Field3D::M44d           mtx64_t;
+#else
+typedef Imath::Vec3<float16_t>  vec16_t;
+typedef Imath::Vec3<float32_t>  vec32_t;
+typedef Imath::Vec3<float64_t>  vec64_t;
+typedef Imath::Vec3<int32_t>    veci32_t;
+typedef Imath::M44d             mtx64_t;
+#endif
+
 //----------------------------------------------------------------------------//
 // Enums
 //----------------------------------------------------------------------------//
@@ -75,6 +117,49 @@ enum DataTypeEnum {
   DataTypeUnknown
 };
 
+//----------------------------------------------------------------------------//
+
+//! Enumerates the various uses for Ogawa-level groups. 
+//! \warning Do not under any circumstances alter the order of these! If you
+//! need to add more types, append them at the end, before F3DNumDataTypes.
+enum OgDataType {
+
+  // Signed and unsigned integers from char to long
+  F3DInt8 = 0,
+  F3DUint8,
+
+  F3DInt16,
+  F3DUint16,
+
+  F3DInt32,
+  F3DUint32,
+
+  F3DInt64,
+  F3DUint64,
+
+  // Floats
+  F3DFloat16,
+  F3DFloat32,
+  F3DFloat64,
+
+  // Vec3
+  F3DVec16,
+  F3DVec32,
+  F3DVec64,
+  F3DVecI32,
+
+  // Matrix
+  F3DMtx64,
+
+  // String
+  F3DString, 
+
+  F3DNumDataTypes, 
+
+  // Invalid type enum
+  F3DInvalidDataType = 127
+};
+
 //----------------------------------------------------------------------------//
 // FieldTraits
 //----------------------------------------------------------------------------//