Skip to content
Snippets Groups Projects
Commit a1e90a4d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

extend search{Scalar,Vector,Tensor} API with element matching args

parent c522b906
No related branches found
No related tags found
No related merge requests found
...@@ -188,43 +188,55 @@ bool PViewData::combineSpace(nameData &nd) ...@@ -188,43 +188,55 @@ bool PViewData::combineSpace(nameData &nd)
} }
bool PViewData::searchScalar(double x, double y, double z, double *values, bool PViewData::searchScalar(double x, double y, double z, double *values,
int step, double *size) int step, double *size, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchScalar(x, y, z, values, step, size); return _octree->searchScalar(x, y, z, values, step, size,
qn, qx, qy, qz);
} }
bool PViewData::searchScalarWithTol(double x, double y, double z, double *values, bool PViewData::searchScalarWithTol(double x, double y, double z, double *values,
int step, double *size, double tol) int step, double *size, double tol, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchScalarWithTol(x, y, z, values, step, size, tol); return _octree->searchScalarWithTol(x, y, z, values, step, size, tol,
qn, qx, qy, qz);
} }
bool PViewData::searchVector(double x, double y, double z, double *values, bool PViewData::searchVector(double x, double y, double z, double *values,
int step, double *size) int step, double *size, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchVector(x, y, z, values, step, size); return _octree->searchVector(x, y, z, values, step, size,
qn, qx, qy, qz);
} }
bool PViewData::searchVectorWithTol(double x, double y, double z, double *values, bool PViewData::searchVectorWithTol(double x, double y, double z, double *values,
int step, double *size, double tol) int step, double *size, double tol, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchVectorWithTol(x, y, z, values, step, size, tol); return _octree->searchVectorWithTol(x, y, z, values, step, size, tol,
qn, qx, qy, qz);
} }
bool PViewData::searchTensor(double x, double y, double z, double *values, bool PViewData::searchTensor(double x, double y, double z, double *values,
int step, double *size) int step, double *size, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchTensor(x, y, z, values, step, size); return _octree->searchTensor(x, y, z, values, step, size,
qn, qx, qy, qz);
} }
bool PViewData::searchTensorWithTol(double x, double y, double z, double *values, bool PViewData::searchTensorWithTol(double x, double y, double z, double *values,
int step, double *size, double tol) int step, double *size, double tol, int qn,
double *qx, double *qy, double *qz)
{ {
if(!_octree) _octree = new OctreePost(this); if(!_octree) _octree = new OctreePost(this);
return _octree->searchTensorWithTol(x, y, z, values, step, size, tol); return _octree->searchTensorWithTol(x, y, z, values, step, size, tol,
qn, qx, qy, qz);
} }
...@@ -252,17 +252,23 @@ class PViewData { ...@@ -252,17 +252,23 @@ class PViewData {
// time steps are present, they are all interpolated unless time step is set // time steps are present, they are all interpolated unless time step is set
// to a different value than -1. // to a different value than -1.
bool searchScalar(double x, double y, double z, double *values, bool searchScalar(double x, double y, double z, double *values,
int step=-1, double *size=0); int step=-1, double *size=0, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
bool searchScalarWithTol(double x, double y, double z, double *values, bool searchScalarWithTol(double x, double y, double z, double *values,
int step=-1, double *size=0, double tol=1.e-2); int step=-1, double *size=0, double tol=1.e-2, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
bool searchVector(double x, double y, double z, double *values, bool searchVector(double x, double y, double z, double *values,
int step=-1, double *size=0); int step=-1, double *size=0, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
bool searchVectorWithTol(double x, double y, double z, double *values, bool searchVectorWithTol(double x, double y, double z, double *values,
int step=-1, double *size=0, double tol=1.e-2); int step=-1, double *size=0, double tol=1.e-2, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
bool searchTensor(double x, double y, double z, double *values, bool searchTensor(double x, double y, double z, double *values,
int step=-1, double *size=0); int step=-1, double *size=0, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
bool searchTensorWithTol(double x, double y, double z, double *values, bool searchTensorWithTol(double x, double y, double z, double *values,
int step=-1, double *size=0, double tol=1.e-2); int step=-1, double *size=0, double tol=1.e-2, int qn=0,
double *qx=0, double *qy=0, double *qz=0);
// I/O routines // I/O routines
virtual bool writeSTL(const std::string &fileName); virtual bool writeSTL(const std::string &fileName);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment