OpenCMT/uLib
1
0
Fork 0
mirror of https://github.com/OpenCMT/uLib.git synced 2025-12-06 07:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[uLib geometry]

Browse Source 
- adds some getters/setters to Programmable accessor
- DataSet and Attributes ... start working on .. to be continued
This commit is contained in:
Andrea Rigoni
2014-12-24 09:58:56 +00:00
parent 39ee7e4a94
commit 0b3efddead
8 changed files with 178 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Math/DataSet.h
View File

@@ -43,33 +43,12 @@
namespace uLib {
//typedef std::iterator SequenceIterator;
//template < typename T >
//struct Enumeration {
//};
//template < typename T >
//struct Iterator {
//};
//class AbstractDenseSequence {
//public:
// virtual bool Empty() const = 0;
//};
class AbstractArray {
public:
virtual const void * GetDataPointer(Id_t id) const = 0;
virtual void * GetDataPointer(Id_t id) = 0;
virtual void SetSize(const size_t size) = 0;
virtual const size_t GetSize() const = 0;
// virtual const void * GetDataPointer(Id_t id) const = 0;
virtual void * GetDataPointer(Id_t id) = 0;
virtual ~AbstractArray() {}
};
@@ -78,13 +57,14 @@ public:
template < typename T >
class DataAttributes {
public:
DataAttributes() : m_Active(NULL) {}
template < typename F >
void AddAttribute(const char *name, F f) {
ProgrammableAccessor<T> pa(name);
pa.SetAccessFunctions(f);
m_Accessors.push_back(pa);
if(m_Accessors.size() == 1)
SetActive(name);
m_Active = &m_Accessors.back();
}
template < typename F1, typename F2 >
@@ -92,8 +72,7 @@ public:
ProgrammableAccessor<T> pa(name);
pa.SetAccessFunctions(f1,f2);
m_Accessors.push_back(pa);
if(m_Accessors.size() == 1)
SetActive(name);
m_Active = &m_Accessors.back();
}
ProgrammableAccessor<T> * GetAttribute(const char *name) /*const*/ {
@@ -159,6 +138,9 @@ private:
};
// TO BE MOVED OR REMOVED ...
template <
typename T,
class ScalarAccess

47
src/Math/ImageData.cpp
View File

@@ -179,3 +179,50 @@ void ImageData::ExportToVtkXml(const char *file, bool density_type)
fclose(vtk_file);
printf("%s vtk file saved\n",file);
}
////////////////////////////////////////////////////////////////////////////////
// DATASET IMAGE
//void ImageData::SetSize(const Vector3f v)
//{
// ImageSpace::SetSize( v.array() / this->GetDims().array().cast<float>() );
//}
//Vector3f ImageData::GetSize() const
//{
// return ImageSpace::GetSize().array() * this->GetDims().array().cast<float>();
//}
//bool ImageData::IsInsideBounds(const Vector4f pt) const
//{
// Vector4f ptl = ImageSpace::GetLocalPoint(pt);
// int result = 0;
// for ( int i=0; i<3 ;++i) {
// result += ptl(i) > (float)this->GetDims()(i);
// result += ptl(i) < 0;
// }
// return result == 0;
//}

79
src/Math/ImageData.h
View File

@@ -41,8 +41,7 @@ public:
ImageData() : ImageMap(Vector3i::Zero()) {}
ImageData(const Vector3i &size) : ImageMap(size) {}
void SetSize(const Vector3f v);
void SetSize(const Vector3f v);
Vector3f GetSize() const;
bool IsInsideBounds(const Vector4f pt) const;
@@ -51,8 +50,8 @@ public:
virtual float GetValue(const Vector3i id) const = 0;
virtual float GetValue(const int id) const = 0;
virtual void SetValue(const Vector3i id, float value) = 0;
virtual void SetValue(const int id, float value) = 0;
virtual void SetValue(const Vector3i id, float value) = 0;
virtual void SetValue(const int id, float value) = 0;
virtual void SetDims(const Vector3i &size) = 0;
@@ -62,39 +61,73 @@ public:
};
template < class SeqCnt >
class DataSetImage : public DataSet, public ImageSpace, public ImageMap {
class DataVectorImage : public ImageData {
typedef float ScalarT;
public:
DataSetImage() : ImageMap(Vector3i::Zero()), m_Sequence() {}
DataSetImage(const Vector3i &size) : ImageMap(size), m_Sequence(new SeqCnt(size.prod())) {}
inline void * GetDataPointer(const Id_t id) const {
return m_Data->GetDataPointer(id);
void SetSize(const Vector3f v) {
// ImageSpace::SetSize( v.array() / this->GetDims().array().cast<float>() );
}
float GetValue(const Vector3i id) const { return m_Scalars.Get<float>(GetDataPointer(Map(id))); }
float GetValue(const int id) const { return m_Scalars.Get<float>(GetDataPointer(id)); }
void SetValue(const Vector3i id, float value) { m_Scalars.Set<float>(GetDataPointer(Map(id)),value); }
void SetValue(const int id, float value) { m_Scalars.Set<float>(GetDataPointer(id),value); }
void SetDims(const Vector3i &size) {
ImageMap::SetDims(size);
m_Data->SetSize(size.prod());
Vector3f GetSize() const {
// return ImageSpace::GetSize().array() * this->GetDims().array().cast<float>();
}
// uLibRefMacro(Data,AbstractArray*)
uLibRefMacro(Data,SmartPointer<AbstractArray>)
uLibRefMacro(Scalars,ProgrammableAccessor<ScalarT>)
bool IsInsideBounds(const Vector4f pt) const {
Vector4f ptl = ImageSpace::GetLocalPoint(pt);
int result = 0;
for (int i=0; i<3; ++i) {
result += ptl(i) > (float)this->GetDims()(i);
result += ptl(i) < 0;
}
return result == 0;
}
void SetDims(const Vector3i &size) { m_Sequence->resize(size.prod()); }
inline void * GetDataPointer(Id_t id) { return &m_Sequence->at(id); }
private:
// AbstractArray* m_Data;
SmartPointer<AbstractArray> m_Data;
ProgrammableAccessor<ScalarT> m_Scalars;
SmartPointer<SeqCnt> m_Sequence;
};
//class DataVectorImage : public ImageData {
// typedef float ScalarT;
//public:
// inline void * GetDataPointer(const Id_t id) const {
// return m_Data->GetDataPointer(id);
// }
// float GetValue(const Vector3i id) const { return m_Scalars.Get<float>(GetDataPointer(Map(id))); }
// float GetValue(const int id) const { return m_Scalars.Get<float>(GetDataPointer(id)); }
// void SetValue(const Vector3i id, float value) { m_Scalars.Set<float>(GetDataPointer(Map(id)),value); }
// void SetValue(const int id, float value) { m_Scalars.Set<float>(GetDataPointer(id),value); }
// void SetDims(const Vector3i &size) {
// ImageMap::SetDims(size);
// m_Data->SetSize(size.prod());
// }
// uLibRefMacro(Data,SmartPointer<AbstractArray>)
// uLibRefMacro(Scalars,ProgrammableAccessor<ScalarT>)
//private:
// SmartPointer<AbstractArray> m_Data;
// ProgrammableAccessor<ScalarT> m_Scalars;
//};

3
src/Math/ImageMap.h
View File

@@ -80,9 +80,6 @@ public:
Vector3i UnMap(int index) const;
private:
Order m_DataOrder;
Vector3i m_Dims;

57
src/Math/testing/ImageDataTest.cpp
View File

@@ -80,31 +80,48 @@ struct MyVoxelJitterAccess {
int main() {
DataVectorCompound< MyVoxel, MyVoxelMeanAccess > data;
data.Data().push_back( MyVoxel(5,1) );
data.Data().push_back( MyVoxel(10,2) );
data.Data().push_back( MyVoxel(15,3) );
data.Data().push_back( MyVoxel(2368,1) );
// {
// DataVectorCompound< MyVoxel, MyVoxelMeanAccess > data;
// data.Data().push_back( MyVoxel(5,1) );
// data.Data().push_back( MyVoxel(10,2) );
// data.Data().push_back( MyVoxel(15,3) );
// data.Data().push_back( MyVoxel(2368,1) );
data[3].value = 123;
// data[3].value = 123;
DataVectorCompound< MyVoxel, MyVoxelValueAccess > data2 = data;
// DataVectorCompound< MyVoxel, MyVoxelValueAccess > data2 = data;
std::cout << "image data test \n";
foreach (MyVoxel &el, data2.Data()) {
std::cout << "-> " << el.value << " - " << el.count << "\n";
// std::cout << "image data test \n";
// foreach (MyVoxel &el, data2.Data()) {
// std::cout << "-> " << el.value << " - " << el.count << "\n";
// }
// DataVectorCompound< MyVoxel, MyVoxelJitterAccess > data3 = data2;
// data3.A0().min = -1;
// data3.A0().max = 1;
// data3.AddScalarAccess("scalars",&MyVoxel::value);
// data3.AddScalarAccess("counts",&MyVoxel::count);
// std::cout << "image data test \n";
// for(int i=0; i<data3.GetSize(); ++i) {
// std::cout << " -> " << data3.GetScalar(i) << " - " << data3.GetScalar("counts",i) << "\n";
// }
// }
DataSetImage< Vector<MyVoxel> > img( Vector3i(3,3,3) );
img.AddScalarAccess("value",&MyVoxel::value);
img.AddScalarAccess("count",&MyVoxel::count);
for(int x = 0; x < img.GetDims().prod(); ++x) {
img.SetActiveScalars("value");
img.SetScalar(x,x);
img.SetScalar("count",x,2*x);
std::cout << " [" << img.GetScalar("value",x) << "," << img.GetScalar("count", x) << "]";
}
DataVectorCompound< MyVoxel, MyVoxelJitterAccess > data3 = data2;
data3.A0().min = -1;
data3.A0().max = 1;
data3.AddScalarAccess("scalars",&MyVoxel::value);
data3.AddScalarAccess("counts",&MyVoxel::count);
std::cout << "image data test \n";
for(int i=0; i<data3.GetSize(); ++i) {
std::cout << " -> " << data3.GetScalar(i) << " - " << data3.GetScalar("counts",i) << "\n";
}
std::cout << "\n";
}