Commit 25d35e62 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

createVolumeDataPageAccessor

parent d76bc1dc
......@@ -15,7 +15,6 @@ set(SOURCE_FILES
set (PRIVATE_HEADER_FILES
IO/File.h
IO/S3_Downloader.h
VDS/VolumeData.h
VDS/VolumeDataPartition.h
VDS/VolumeDataLayer.h
VDS/VolumeDataLayout.h
......@@ -35,6 +34,7 @@ set (PRIVATE_HEADER_FILES
set (EXPORTED_HEADER_FILES
OpenVDS/OpenVDS.h
OpenVDS/KnownMetadata.h
OpenVDS/VolumeData.h
OpenVDS/openvds_export.h)
add_library(openvds SHARED
......
......@@ -23,6 +23,10 @@
#include <VDS/ParseVDSJson.h>
#include <memory>
#include "VDS/VolumeDataLayout.h"
#include "VDS/VolumeDataAccess.h"
namespace OpenVDS
{
VDSHandle *open(const OpenOptions &options, Error &error)
......@@ -50,4 +54,8 @@ void destroy(VDSHandle *handle)
delete handle;
}
VolumeDataPageAccessor *createVolumeDataPageAccessor(VolumeDataLayout *layout, DimensionsND dimension, int lod, int channel, int maxPages)
{
return nullptr;
}
}
......@@ -19,7 +19,9 @@
#define OPENVDS_H
#include "openvds_export.h"
#include "VolumeData.h"
#include <cstdint>
#include <string>
#include <vector>
......@@ -43,10 +45,14 @@ struct Error
};
struct VDSHandle;
class VolumeDataLayout;
class VolumeDataPageAccessor;
OPENVDS_EXPORT VDSHandle* open(const OpenOptions& options, Error &error);
OPENVDS_EXPORT VDSHandle* create(const OpenOptions& options, VolumeDataLayoutDescriptor const &layoutDescriptor, std::vector<VolumeDataAxisDescriptor> const &axisDescriptors, std::vector<VolumeDataChannelDescriptor> const &channelDescriptors, Error &error);
OPENVDS_EXPORT void destroy(VDSHandle *handle);
OPENVDS_EXPORT VolumeDataPageAccessor *createVolumeDataPageAccessor(VolumeDataLayout *layout, DimensionsND dimension, int lod, int channel, int maxPages);
}
#endif //OPENVDS_H
......@@ -18,7 +18,7 @@
#ifndef DIMENSIONGROUP_H
#define DIMENSIONGROUP_H
#include "VolumeData.h"
#include <OpenVDS/VolumeData.h>
#include <cstdint>
#include <cstring>
......
......@@ -18,7 +18,7 @@
#ifndef VOLUMEDATAACCESS_H
#define VOLUMEDATAACCESS_H
#include "VolumeData.h"
#include <OpenVDS/VolumeData.h>
#include "DimensionGroup.h"
#include "VolumeDataChannelDescriptor.h"
#include <Math/Vector.h>
......@@ -27,7 +27,7 @@ namespace OpenVDS {
class VolumeDataPageAccessor;
class VolumeDataLayout;
class VDSHandle;
struct VDSHandle;
template <typename INDEX, typename T> class VolumeDataReadAccessor;
template <typename INDEX, typename T> class VolumeDataReadWriteAccessor;
......
......@@ -21,7 +21,7 @@
#include <string>
#include <Math/Range.h>
#include "VolumeData.h"
#include <OpenVDS/VolumeData.h>
namespace OpenVDS
{
......
......@@ -41,7 +41,7 @@ private:
int32_t m_negativeRenderMargin;
int32_t m_positiveRenderMargin;
int32_t m_actualValueRangeChannel;
Range<float> m_actualValueRange;
FloatRange m_actualValueRange;
VolumeDataLayer *m_primaryBaseLayers[DimensionGroup_3D_Max];
VolumeDataLayer *m_primaryTopLayers[DimensionGroup_3D_Max];
......
......@@ -16,8 +16,8 @@
****************************************************************************/
#include <OpenVDS/openvds_export.h>
#include <OpenVDS/VolumeData.h>
#include "DimensionGroup.h"
#include "VolumeData.h"
#include "VolumeDataChannelMapping.h"
#include <assert.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment