commit 15508d726bbd6dddddf4b313f4bd9c5a86621d14
parent 3d4420bff152d2e581101d17ecc151dd035ca899
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date: Thu, 30 Jun 2016 15:54:07 +0200
added sliceID and sliceDir data
Diffstat:
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/include/Types.h b/include/Types.h
@@ -17,6 +17,7 @@ class Slice2D
Real* m_data;
int m_max3Ddim;
+ int m_sliceID, m_sliceDir;
public:
Slice2D() : m_width(0), m_height(0), m_N(0), m_data(nullptr) {}
@@ -73,6 +74,10 @@ public:
}
inline void set_max3Ddim(const int d) { m_max3Ddim = d; }
inline int get_max3Ddim() const { return m_max3Ddim; }
+ inline void set_sliceID(const int d) { m_sliceID = d; }
+ inline int get_sliceID() const { return m_sliceID; }
+ inline void set_sliceDir(const int d) { m_sliceDir = d; }
+ inline int get_sliceDir() const { return m_sliceDir; }
};
typedef Slice2D<0,0,0,0> Slice;
diff --git a/src/Polaroid.cpp b/src/Polaroid.cpp
@@ -58,9 +58,11 @@ void Polaroid::load_hdf5(const char* filename, const double fraction, const int
status = H5Fclose(file_id);
/* extract plane */
+ m_data.set_sliceDir(dir);
if (0 == dir) // y-z plane
{
const int fixed = static_cast<int>(maxDim[0]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[1], maxDim[2]);
for (int h=0; h < m_data.height(); ++h)
for (int w=0; w < m_data.width(); ++w)
@@ -69,6 +71,7 @@ void Polaroid::load_hdf5(const char* filename, const double fraction, const int
else if (1 == dir) // x-z plane
{
const int fixed = static_cast<int>(maxDim[1]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[0], maxDim[2]);
for (int h=0; h < m_data.height(); ++h)
for (int w=0; w < m_data.width(); ++w)
@@ -77,6 +80,7 @@ void Polaroid::load_hdf5(const char* filename, const double fraction, const int
else if (2 == dir) // x-y plane
{
const int fixed = static_cast<int>(maxDim[2]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[0], maxDim[1]);
for (int h=0; h < m_data.height(); ++h)
for (int w=0; w < m_data.width(); ++w)
@@ -112,9 +116,11 @@ void Polaroid::load_wavelet(const char* filename, const double fraction, const i
Real blockdata[_BLOCKSIZE_][_BLOCKSIZE_][_BLOCKSIZE_];
/* extract plane */
+ m_data.set_sliceDir(dir);
if (0 == dir) // y-z plane
{
const int fixed = static_cast<int>(maxDim[0]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[1], maxDim[2]);
const int fixedBID = fixed/_BLOCKSIZE_;
@@ -135,6 +141,7 @@ void Polaroid::load_wavelet(const char* filename, const double fraction, const i
else if (1 == dir) // x-z plane
{
const int fixed = static_cast<int>(maxDim[1]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[0], maxDim[2]);
const int fixedBID = fixed/_BLOCKSIZE_;
@@ -155,6 +162,7 @@ void Polaroid::load_wavelet(const char* filename, const double fraction, const i
else if (2 == dir) // x-y plane
{
const int fixed = static_cast<int>(maxDim[2]*fraction);
+ m_data.set_sliceID(fixed);
m_data.resize(maxDim[0], maxDim[1]);
const int fixedBID = fixed/_BLOCKSIZE_;