Skip to content
Snippets Groups Projects
Commit 03314030 authored by indidev's avatar indidev
Browse files

Removed const labeles in get-methodes due to use of mutex in own subclass

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@680 042f3d55-54a8-47e9-b7fb-15903f145c44
parent fa80e65b
No related branches found
No related tags found
No related merge requests found
......@@ -80,14 +80,14 @@ public:
virtual bool hasEntry(unsigned int x, unsigned int y, unsigned int z) = 0;
virtual unsigned char get(float x[], const WorkspaceRepresentation *workspace) const = 0;
virtual unsigned char get(float x[], const WorkspaceRepresentation *workspace) = 0;
//! Simulates a multi-dimensional array access
virtual unsigned char get(unsigned int x0, unsigned int x1, unsigned int x2,
unsigned int x3, unsigned int x4, unsigned int x5) const = 0;
unsigned int x3, unsigned int x4, unsigned int x5) = 0;
//! Simulates a multi-dimensional array access
virtual unsigned char get( unsigned int x[6] ) const = 0;
virtual unsigned char get( unsigned int x[6] ) = 0;
// clear all entrys
virtual void clear() = 0;
......
......@@ -181,7 +181,7 @@ const unsigned char *WorkspaceDataArray::getDataRot(unsigned int x, unsigned int
return data[x*sizeTr0+y*sizeTr1+z];
}
unsigned char WorkspaceDataArray::get(float x[6], const WorkspaceRepresentation *workspace) const {
unsigned char WorkspaceDataArray::get(float x[6], const WorkspaceRepresentation *workspace) {
unsigned int v[6];
if (workspace->getVoxelFromPose(x, v)) {
return get(v);
......@@ -223,7 +223,7 @@ int WorkspaceDataArray::sumAngleReachabilities(int x0, int x1, int x2)
return res;
}
unsigned char WorkspaceDataArray::get(unsigned int x0, unsigned int x1, unsigned int x2, unsigned int x3, unsigned int x4, unsigned int x5) const
unsigned char WorkspaceDataArray::get(unsigned int x0, unsigned int x1, unsigned int x2, unsigned int x3, unsigned int x4, unsigned int x5)
{
unsigned int posTr = 0, posRot = 0;
getPos(x0,x1,x2,x3,x4,x5,posTr,posRot);
......@@ -233,7 +233,7 @@ unsigned char WorkspaceDataArray::get(unsigned int x0, unsigned int x1, unsigned
return 0;
}
unsigned char WorkspaceDataArray::get(unsigned int x[]) const
unsigned char WorkspaceDataArray::get(unsigned int x[])
{
unsigned int posTr = 0, posRot = 0;
getPos(x,posTr,posRot);
......
......@@ -88,16 +88,16 @@ public:
*/
const unsigned char *getDataRot(unsigned int x, unsigned int y, unsigned int z);
unsigned char get(float x[], const WorkspaceRepresentation *workspace) const;
unsigned char get(float x[], const WorkspaceRepresentation *workspace);
int getMaxSummedAngleReachablity();
//! Simulates a multi-dimensional array access
inline unsigned char get(unsigned int x0, unsigned int x1, unsigned int x2,
unsigned int x3, unsigned int x4, unsigned int x5) const;
unsigned int x3, unsigned int x4, unsigned int x5);
//! Simulates a multi-dimensional array access
inline unsigned char get( unsigned int x[6] ) const;
inline unsigned char get( unsigned int x[6]);
bool hasEntry(unsigned int x, unsigned int y, unsigned int z);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment