diff --git a/Core/Code/Resources/Interactions/Legacy/StateMachine.xml b/Core/Code/Resources/Interactions/Legacy/StateMachine.xml
index 32df1fc23e..ccb6ef88fa 100644
--- a/Core/Code/Resources/Interactions/Legacy/StateMachine.xml
+++ b/Core/Code/Resources/Interactions/Legacy/StateMachine.xml
@@ -1,4148 +1,4089 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Modules/Segmentation/DataManagement/mitkContourElement.cpp b/Modules/Segmentation/DataManagement/mitkContourElement.cpp
index e98d3cbaea..172a32cb8d 100644
--- a/Modules/Segmentation/DataManagement/mitkContourElement.cpp
+++ b/Modules/Segmentation/DataManagement/mitkContourElement.cpp
@@ -1,721 +1,697 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include
#include
#include
mitk::ContourElement::ContourElement()
{
this->m_Vertices = new VertexListType();
this->m_IsClosed = false;
}
mitk::ContourElement::ContourElement(const mitk::ContourElement &other) :
m_Vertices(other.m_Vertices), m_IsClosed(other.m_IsClosed)
{
}
mitk::ContourElement::~ContourElement()
{
delete this->m_Vertices;
}
void mitk::ContourElement::AddVertex(mitk::Point3D &vertex, bool isControlPoint)
{
this->m_Vertices->push_back(new VertexType(vertex, isControlPoint));
}
void mitk::ContourElement::AddVertex(VertexType &vertex)
{
this->m_Vertices->push_back(&vertex);
}
void mitk::ContourElement::AddVertexAtFront(mitk::Point3D &vertex, bool isControlPoint)
{
this->m_Vertices->push_front(new VertexType(vertex, isControlPoint));
}
void mitk::ContourElement::AddVertexAtFront(VertexType &vertex)
{
this->m_Vertices->push_front(&vertex);
}
void mitk::ContourElement::InsertVertexAtIndex(mitk::Point3D &vertex, bool isControlPoint, int index)
{
if(index > 0 && this->GetSize() > index)
{
VertexIterator _where = this->m_Vertices->begin();
_where += index;
this->m_Vertices->insert(_where, new VertexType(vertex, isControlPoint));
}
}
mitk::ContourElement::VertexType* mitk::ContourElement::GetVertexAt(int index)
{
return this->m_Vertices->at(index);
}
bool mitk::ContourElement::IsEmpty()
{
return this->m_Vertices->empty();
}
mitk::ContourElement::VertexType* mitk::ContourElement::GetVertexAt(const mitk::Point3D &point, float eps)
{
/* current version iterates over the whole deque - should some kind of an octree with spatial query*/
if(eps > 0)
{
//currently no method with better performance is available
return BruteForceGetVertexAt(point, eps);
}//if eps < 0
return NULL;
}
mitk::ContourElement::VertexType* mitk::ContourElement::BruteForceGetVertexAt(const mitk::Point3D &point, float eps)
{
if(eps > 0)
{
std::deque< std::pair > nearestlist;
ConstVertexIterator it = this->m_Vertices->begin();
ConstVertexIterator end = this->m_Vertices->end();
while(it != end)
{
mitk::Point3D currentPoint = (*it)->Coordinates;
double distance = currentPoint.EuclideanDistanceTo(point);
if(distance < eps)
{
//if list is emtpy, add point to list
if(nearestlist.size() < 1)
{
nearestlist.push_front(std::pair( (*it)->Coordinates.EuclideanDistanceTo(point), (*it) ));
}
//found an approximate point - check if current is closer then first in nearestlist
else if( distance < nearestlist.front().first )
{
//found even closer vertex
nearestlist.push_front(std::pair( (*it)->Coordinates.EuclideanDistanceTo(point), (*it) ));
}
}//if distance > eps
it++;
}//while
if(nearestlist.size() > 0)
{
/*++++++++++++++++++++ return the nearest active point if one was found++++++++++++++++++*/
std::deque< std::pair >::iterator it = nearestlist.begin();
std::deque< std::pair >::iterator end = nearestlist.end();
while(it != end)
{
if( (*it).second->IsControlPoint )
{
return (*it).second;
}
it++;
}
/*---------------------------------------------------------------------------------------*/
//return closest point
return nearestlist.front().second;
}
}
return NULL;
}
mitk::ContourElement::VertexType* mitk::ContourElement::OptimizedGetVertexAt(const mitk::Point3D &point, float eps)
{
if( (eps > 0) && (this->m_Vertices->size()>0) )
{
int k = 1;
int dim = 3;
int nPoints = this->m_Vertices->size();
ANNpointArray pointsArray;
ANNpoint queryPoint;
ANNidxArray indexArray;
ANNdistArray distanceArray;
ANNkd_tree* kdTree;
queryPoint = annAllocPt(dim);
pointsArray = annAllocPts(nPoints, dim);
indexArray = new ANNidx[k];
distanceArray = new ANNdist[k];
int i = 0;
//fill points array with our control points
for(VertexIterator it = this->m_Vertices->begin(); it != this->m_Vertices->end(); it++, i++)
{
mitk::Point3D cur = (*it)->Coordinates;
pointsArray[i][0]= cur[0];
pointsArray[i][1]= cur[1];
pointsArray[i][2]= cur[2];
}
//create the kd tree
kdTree = new ANNkd_tree(pointsArray,nPoints, dim);
//fill mitk::Point3D into ANN query point
queryPoint[0] = point[0];
queryPoint[1] = point[1];
queryPoint[2] = point[2];
//k nearest neighbour search
kdTree->annkSearch(queryPoint, k, indexArray, distanceArray, eps);
VertexType* ret = NULL;
try
{
ret = this->m_Vertices->at(indexArray[0]);
}
catch(std::out_of_range ex)
{
//ret stays NULL
return ret;
}
//clean up ANN
delete [] indexArray;
delete [] distanceArray;
delete kdTree;
annClose();
return ret;
}
return NULL;
}
mitk::ContourElement::VertexListType* mitk::ContourElement::GetVertexList()
{
return this->m_Vertices;
}
bool mitk::ContourElement::IsClosed()
{
return this->m_IsClosed;
}
bool mitk::ContourElement::IsNearContour(const mitk::Point3D &point, float eps)
{
ConstVertexIterator it1 = this->m_Vertices->begin();
ConstVertexIterator it2 = this->m_Vertices->begin();
it2 ++; // it2 runs one position ahead
ConstVertexIterator end = this->m_Vertices->end();
int counter = 0;
for (; it1 != end; it1++, it2++, counter++)
{
if (it2 == end)
it2 = this->m_Vertices->begin();
mitk::Point3D v1 = (*it1)->Coordinates;
mitk::Point3D v2 = (*it2)->Coordinates;
const float l2 = v1.SquaredEuclideanDistanceTo(v2);
mitk::Vector3D p_v1 = point - v1;
mitk::Vector3D v2_v1 = v2 - v1;
double tc = (p_v1 * v2_v1) / l2;
// take into account we have line segments and not (infinite) lines
if (tc < 0.0) tc = 0.0;
if (tc > 1.0) tc = 1.0;
mitk::Point3D crossPoint = v1 + v2_v1 * tc;
double distance = point.SquaredEuclideanDistanceTo(crossPoint);
if (distance < eps)
{
return true;
}
}
return false;
}
void mitk::ContourElement::Close()
{
this->m_IsClosed = true;
}
void mitk::ContourElement::Open()
{
this->m_IsClosed = false;
}
void mitk::ContourElement::SetIsClosed( bool isClosed)
{
isClosed ? this->Close() : this->Open();
}
mitk::ContourElement::VertexListType*
mitk::ContourElement::GetControlVertices()
{
VertexListType* newVertices = new VertexListType();
VertexIterator it = this->m_Vertices->begin();
VertexIterator end = this->m_Vertices->end();
while(it != end)
{
if((*it)->IsControlPoint)
{
newVertices->push_back((*it));
}
it++;
}
return newVertices;
}
-void mitk::ContourElement::Concatenate(mitk::ContourElement* other)
+void mitk::ContourElement::Concatenate(mitk::ContourElement* other, bool check)
{
if( other->GetSize() > 0)
{
- ConstVertexIterator it = other->m_Vertices->begin();
- ConstVertexIterator end = other->m_Vertices->end();
- //add all vertices of other after last vertex
- while(it != end)
+ ConstVertexIterator otherIt = other->m_Vertices->begin();
+ ConstVertexIterator otherEnd = other->m_Vertices->end();
+ while(otherIt != otherEnd)
{
- this->m_Vertices->push_back(*it);
- it++;
- }
- }
-}
-
-std::pair
-mitk::ContourElement::FindFirstIntersection(mitk::ContourElement* other)
-{
- VertexIterator thisIt = this->m_Vertices->begin();
- VertexIterator thisEnd = this->m_Vertices->end();
-
- VertexIterator otherEnd = other->m_Vertices->end();
-
- std::pair match(thisEnd,otherEnd);
-
- while (thisIt != thisEnd)
- {
- VertexIterator otherIt = other->m_Vertices->begin();
-
- while (otherIt != otherEnd)
- {
- if ( (*thisIt)->Coordinates == (*otherIt)->Coordinates )
- {
- match.first = thisIt;
- match.second = otherIt;
- return match;
- }
-
- otherIt++;
- }
-
- thisIt++;
+ if (check)
+ {
+ ConstVertexIterator thisIt = this->m_Vertices->begin();
+ ConstVertexIterator thisEnd = this->m_Vertices->end();
+
+ bool found = false;
+ while(thisIt != thisEnd)
+ {
+ if ( (*thisIt)->Coordinates == (*otherIt)->Coordinates )
+ {
+ found = true;
+ break;
+ }
+
+ thisIt++;
+ }
+ if (!found)
+ this->m_Vertices->push_back(*otherIt);
+ }
+ else
+ {
+ this->m_Vertices->push_back(*otherIt);
+ }
+ otherIt++;
}
-
- return match;
-}
-
-void mitk::ContourElement::RemoveIntersections(mitk::ContourElement* other)
-{
- if( other->GetSize() > 0)
- {
-
- // VertexIterator _where = this->FindFirstIntersection(other);
- std::pair match = this->FindFirstIntersection(other);
-
- this->m_Vertices->erase(match.first, this->m_Vertices->end());
- other->m_Vertices->erase(other->m_Vertices->begin(), match.second );
}
}
bool mitk::ContourElement::RemoveVertex(mitk::ContourElement::VertexType* vertex)
{
VertexIterator it = this->m_Vertices->begin();
VertexIterator end = this->m_Vertices->end();
//search for vertex and remove it if exists
while(it != end)
{
if((*it) == vertex)
{
this->m_Vertices->erase(it);
return true;
}
it++;
}
return false;
}
bool mitk::ContourElement::RemoveVertexAt(int index)
{
if( index >= 0 && index < this->m_Vertices->size() )
{
this->m_Vertices->erase(this->m_Vertices->begin()+index);
return true;
}
else
{
return false;
}
}
bool mitk::ContourElement::RemoveVertexAt(mitk::Point3D &point, float eps)
{
/* current version iterates over the whole deque - should be some kind of an octree with spatial query*/
if(eps > 0){
VertexIterator it = this->m_Vertices->begin();
VertexIterator end = this->m_Vertices->end();
while(it != end)
{
mitk::Point3D currentPoint = (*it)->Coordinates;
if(currentPoint.EuclideanDistanceTo(point) < eps)
{
//approximate point found
//now erase it
this->m_Vertices->erase(it);
return true;
}
it++;
}
}
return false;
}
void mitk::ContourElement::Clear()
{
this->m_Vertices->clear();
}
//----------------------------------------------------------------------
void mitk::ContourElement::Interpolate()
{
VertexListType* newVertices = new VertexListType();
int nverts = this->m_Vertices->size();
for (int i=0; (i+1)DoBezierInterpolation(i, i+1, newVertices);
}
if ( this->IsClosed() )
{
this->DoBezierInterpolation(nverts-1, 0, newVertices);
}
delete this->m_Vertices;
this->m_Vertices = newVertices;
}
//----------------------------------------------------------------------
void mitk::ContourElement::RedistributeControlVertices(const VertexType* selected, int period)
{
int counter = 0;
VertexIterator _where = this->m_Vertices->begin();
if (selected != NULL)
{
while (_where != this->m_Vertices->end())
{
if ((*_where) == selected)
{
break;
}
_where++;
}
}
VertexIterator _iter = _where;
while (_iter != this->m_Vertices->end())
{
div_t divresult;
divresult = div (counter,period);
(*_iter)->IsControlPoint = (divresult.rem == 0);
counter++;
_iter++;
}
_iter = _where;
counter = 0;
while (_iter != this->m_Vertices->begin())
{
div_t divresult;
divresult = div (counter,period);
(*_iter)->IsControlPoint = (divresult.rem == 0);
counter++;
_iter--;
}
}
//----------------------------------------------------------------------
void mitk::ContourElement::DoBezierInterpolation( int idx1, int idx2, VertexListType* vertices )
{
mitk::Point3D mp1;
mp1 = this->m_Vertices->at(idx1)->Coordinates;
mitk::Point3D mp2;
mp2 = this->m_Vertices->at(idx2)->Coordinates;
// this->RemoveIntermediateVerticesAt(idx1);
// this->AddIntermediateVertex(mp1, idx1);
vertices->push_back(new VertexType(mp1, this->m_Vertices->at(idx1)->IsControlPoint));
int maxRecursion = 0;
int tmp = 3;
const int MaximumCurveLineSegments = 100;
const double MaximumCurveError = 0.005;
while ( 2*tmp < MaximumCurveLineSegments )
{
tmp *= 2;
maxRecursion++;
}
// There are four control points with 3 components each, plus one
// value for the recursion depth of this point
double *controlPointsStack = new double[(3*4+1)*(maxRecursion+1)];
int stackCount = 0;
double slope1[3];
double slope2[3];
this->GetNthNodeSlope( idx1, slope1 );
this->GetNthNodeSlope( idx2, slope2 );
controlPointsStack[0] = 0;
double *p1 = controlPointsStack+1;
double *p2 = controlPointsStack+4;
double *p3 = controlPointsStack+7;
double *p4 = controlPointsStack+10;
const VertexType* vertex1 = this->m_Vertices->at(idx1);
p1[0] = vertex1->Coordinates[0];
p1[1] = vertex1->Coordinates[1];
p1[2] = vertex1->Coordinates[2];
const VertexType* vertex2 = this->m_Vertices->at(idx2);
p4[0] = vertex2->Coordinates[0];
p4[1] = vertex2->Coordinates[1];
p4[2] = vertex2->Coordinates[2];
double distance = sqrt( vtkMath::Distance2BetweenPoints( p1, p4 ) );
p2[0] = p1[0] + .333*distance*slope1[0];
p2[1] = p1[1] + .333*distance*slope1[1];
p2[2] = p1[2] + .333*distance*slope1[2];
p3[0] = p4[0] - .333*distance*slope2[0];
p3[1] = p4[1] - .333*distance*slope2[1];
p3[2] = p4[2] - .333*distance*slope2[2];
stackCount++;
while ( stackCount )
{
//process last point on stack
int recursionLevel = static_cast(controlPointsStack[13*(stackCount-1)]);
p1 = controlPointsStack + 13*(stackCount-1)+1;
p2 = controlPointsStack + 13*(stackCount-1)+4;
p3 = controlPointsStack + 13*(stackCount-1)+7;
p4 = controlPointsStack + 13*(stackCount-1)+10;
double totalDist = 0;
totalDist += sqrt(vtkMath::Distance2BetweenPoints(p1,p2));
totalDist += sqrt(vtkMath::Distance2BetweenPoints(p2,p3));
totalDist += sqrt(vtkMath::Distance2BetweenPoints(p3,p4));
distance = sqrt(vtkMath::Distance2BetweenPoints(p1,p4));
if ( recursionLevel >= maxRecursion || distance == 0 ||
(totalDist - distance)/distance < MaximumCurveError )
{
mitk::Point3D mp2;
mp2[0] = p2[0]; mp2[1] = p2[1]; mp2[2] = p2[2];
//this->InsertVertexAtIndex(mp2, false, idx1);
vertices->push_back(new VertexType(mp2, false));
mitk::Point3D mp3;
mp3[0] = p3[0]; mp3[1] = p3[1]; mp3[2] = p3[2];
//this->InsertVertexAtIndex(mp3, false, idx1);
vertices->push_back(new VertexType(mp3, false));
if ( stackCount > 1 )
{
mitk::Point3D mp4;
mp4[0] = p4[0]; mp4[1] = p4[1]; mp4[2] = p4[2];
//this->InsertVertexAtIndex(mp4, false, idx1);
vertices->push_back(new VertexType(mp4, false));
}
stackCount--;
}
else
{
double p12[3], p23[3], p34[3], p123[3], p234[3], p1234[3];
this->ComputeMidpoint( p1, p2, p12 );
this->ComputeMidpoint( p2, p3, p23 );
this->ComputeMidpoint( p3, p4, p34 );
this->ComputeMidpoint( p12, p23, p123 );
this->ComputeMidpoint( p23, p34, p234 );
this->ComputeMidpoint( p123, p234, p1234 );
// add these two points to the stack
controlPointsStack[13*(stackCount-1)] = recursionLevel+1;
controlPointsStack[13*(stackCount)] = recursionLevel+1;
double *newp1 = controlPointsStack + 13*(stackCount)+1;
double *newp2 = controlPointsStack + 13*(stackCount)+4;
double *newp3 = controlPointsStack + 13*(stackCount)+7;
double *newp4 = controlPointsStack + 13*(stackCount)+10;
newp1[0] = p1[0];
newp1[1] = p1[1];
newp1[2] = p1[2];
newp2[0] = p12[0];
newp2[1] = p12[1];
newp2[2] = p12[2];
newp3[0] = p123[0];
newp3[1] = p123[1];
newp3[2] = p123[2];
newp4[0] = p1234[0];
newp4[1] = p1234[1];
newp4[2] = p1234[2];
p1[0] = p1234[0];
p1[1] = p1234[1];
p1[2] = p1234[2];
p2[0] = p234[0];
p2[1] = p234[1];
p2[2] = p234[2];
p3[0] = p34[0];
p3[1] = p34[1];
p3[2] = p34[2];
stackCount++;
}
}
delete [] controlPointsStack;
}
//----------------------------------------------------------------------
bool mitk::ContourElement::GetNthNodeSlope( int index, double slope[3])
{
if ( index < 0 ||
static_cast(index) >= this->m_Vertices->size() )
{
return false;
}
int idx1, idx2;
if ( index == 0 && !this->IsClosed() )
{
idx1 = 0;
idx2 = 1;
}
else if ( index == this->m_Vertices->size()-1 && !this->IsClosed() )
{
idx1 = this->m_Vertices->size()-2;
idx2 = idx1+1;
}
else
{
idx1 = index - 1;
idx2 = index + 1;
if ( idx1 < 0 )
{
idx1 += this->m_Vertices->size();
}
if ( idx2 >= this->m_Vertices->size() )
{
idx2 -= this->m_Vertices->size();
}
}
slope[0] =
this->m_Vertices->at(idx2)->Coordinates[0] -
this->m_Vertices->at(idx1)->Coordinates[0];
slope[1] =
this->m_Vertices->at(idx2)->Coordinates[1] -
this->m_Vertices->at(idx1)->Coordinates[1];
slope[2] =
this->m_Vertices->at(idx2)->Coordinates[2] -
this->m_Vertices->at(idx1)->Coordinates[2];
vtkMath::Normalize( slope );
return true;
}
diff --git a/Modules/Segmentation/DataManagement/mitkContourElement.h b/Modules/Segmentation/DataManagement/mitkContourElement.h
index 21df9bdb0b..61efb13738 100644
--- a/Modules/Segmentation/DataManagement/mitkContourElement.h
+++ b/Modules/Segmentation/DataManagement/mitkContourElement.h
@@ -1,281 +1,278 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef _mitkContourElement_H_
#define _mitkContourElement_H_
#include "mitkCommon.h"
#include "SegmentationExports.h"
#include
#include
#include
namespace mitk
{
/** \brief Represents a contour in 3D space.
A ContourElement is consisting of linked vertices implicitely defining the contour.
They are stored in a double ended queue making it possible to add vertices at front and
end of the contour and to iterate in both directions.
To mark a vertex as a special one it can be set as a control point.
\Note It is highly not recommend to use this class directly as no secure mechanism is used here.
Use mitk::ContourModel instead providing some additional features.
*/
class Segmentation_EXPORT ContourElement : public itk::LightObject
{
public:
mitkClassMacro(ContourElement, itk::LightObject);
itkNewMacro(Self);
mitkCloneMacro(Self);
// Data container representing vertices
/** \brief Represents a single vertex of contour.
*/
struct ContourModelVertex
{
ContourModelVertex(mitk::Point3D &point, bool active=false)
: Coordinates(point), IsControlPoint(active)
{
};
/** \brief Treat point special. */
bool IsControlPoint;
/** \brief Coordinates in 3D space. */
mitk::Point3D Coordinates;
};
// END Data container representing vertices
typedef ContourModelVertex VertexType;
typedef std::deque VertexListType;
typedef VertexListType::iterator VertexIterator;
typedef VertexListType::const_iterator ConstVertexIterator;
// start of inline methods
/** \brief Return a const iterator a the front.
*/
virtual ConstVertexIterator ConstIteratorBegin()
{
return this->m_Vertices->begin();
}
/** \brief Return a const iterator a the end.
*/
virtual ConstVertexIterator ConstIteratorEnd()
{
return this->m_Vertices->end();
}
/** \brief Return an iterator a the front.
*/
virtual VertexIterator IteratorBegin()
{
return this->m_Vertices->begin();
}
/** \brief Return an iterator a the end.
*/
virtual VertexIterator IteratorEnd()
{
return this->m_Vertices->end();
}
/** \brief Returns the number of contained vertices.
*/
virtual int GetSize()
{
return this->m_Vertices->size();
}
// end of inline methods
/** \brief Add a vertex at the end of the contour
\param point - coordinates in 3D space.
\param isControlPoint - is the vertex a special control point.
*/
virtual void AddVertex(mitk::Point3D &point, bool isControlPoint);
/** \brief Add a vertex at the end of the contour
\param vertex - a contour element vertex.
*/
virtual void AddVertex(VertexType &vertex);
/** \brief Add a vertex at the front of the contour
\param point - coordinates in 3D space.
\param isControlPoint - is the vertex a control point.
*/
virtual void AddVertexAtFront(mitk::Point3D &point, bool isControlPoint);
/** \brief Add a vertex at the front of the contour
\param vertex - a contour element vertex.
*/
virtual void AddVertexAtFront(VertexType &vertex);
/** \brief Add a vertex at a given index of the contour
\param point - coordinates in 3D space.
\param isControlPoint - is the vertex a special control point.
\param index - the index to be inserted at.
*/
virtual void InsertVertexAtIndex(mitk::Point3D &point, bool isControlPoint, int index);
/** \brief Returns the vertex a given index
\param index
*/
virtual VertexType* GetVertexAt(int index);
/** \brief Returns the approximate nearest vertex a given posoition in 3D space
\param point - query position in 3D space.
\param eps - the error bound for search algorithm.
*/
virtual VertexType* GetVertexAt(const mitk::Point3D &point, float eps);
/** \brief Returns the container of the vertices.
*/
VertexListType* GetVertexList();
/** \brief Returns whether the contour element is empty.
*/
bool IsEmpty();
/** \brief Returns if the conour is closed or not.
*/
virtual bool IsClosed();
/** \brief Returns whether a given point is near a contour, according to eps.
\param point - query position in 3D space.
\param eps - the error bound for search algorithm.
*/
virtual bool IsNearContour(const mitk::Point3D &point, float eps);
/** \brief Close the contour.
Connect first with last element.
*/
virtual void Close();
/** \brief Open the contour.
Disconnect first and last element.
*/
virtual void Open();
/** \brief Set the contours IsClosed property.
\param isClosed - true = closed; false = open;
*/
virtual void SetIsClosed(bool isClosed);
/** \brief Concatenate the contuor with a another contour.
- All vertices of the other contour will be add after last vertex.
+ All vertices of the other contour will be added after last vertex.
+ \param other - the other contour
+ \param check - set it true to avoid intersections
*/
- void Concatenate(mitk::ContourElement* other);
-
- /** \brief Removes intersected vertices between two contour elements
- \param other - a given contour element.
- */
- void RemoveIntersections(mitk::ContourElement* other);
+ void Concatenate(mitk::ContourElement* other, bool check);
/** \brief Remove the given vertex from the container if exists.
\param vertex - the vertex to be removed.
*/
virtual bool RemoveVertex(VertexType* vertex);
/** \brief Remove a vertex at given index within the container if exists.
- \param index - the index to be removed at.
+ \param index - the index where the vertex should be removed.
*/
virtual bool RemoveVertexAt(int index);
/** \brief Remove the approximate nearest vertex at given position in 3D space if one exists.
\param point - query point in 3D space.
\param eps - error bound for search algorithm.
*/
virtual bool RemoveVertexAt(mitk::Point3D &point, float eps);
/** \brief Clear the storage container.
*/
virtual void Clear();
/** \brief Returns the approximate nearest vertex a given posoition in 3D space
\param point - query position in 3D space.
\param eps - the error bound for search algorithm.
*/
VertexType* BruteForceGetVertexAt(const mitk::Point3D &point, float eps);
/** \brief Returns the approximate nearest vertex a given posoition in 3D space
\param point - query position in 3D space.
\param eps - the error bound for search algorithm.
*/
VertexType* OptimizedGetVertexAt(const mitk::Point3D &point, float eps);
/** \brief Generate and interpolated version of the contour element based on the
active interpolation method
*/
void Interpolate();
VertexListType* GetControlVertices();
/** \brief Uniformly redistribute control points with a given period (in number of vertices)
+ \param vertex - the vertex around which the redistribution is done.
\param period - number of vertices between control points.
*/
- void RedistributeControlVertices(const VertexType* selected, int period);
+ void RedistributeControlVertices(const VertexType* vertex, int period);
protected:
ContourElement();
ContourElement(const mitk::ContourElement &other);
virtual ~ContourElement();
/** \brief Finds the 4-th order bezier curve between given indexes.
Adapted from vtkBezierContourLineInterpolator
\param idx1 - first index
\param idx2 - second index
*/
void DoBezierInterpolation( int idx1, int idx2, VertexListType* vertices );
/** \brief Returns a pair with two iterators pointing to the vertices where
the contour element intersects (i.e. has the same coordinates) with another given contour element
\param other - a given contour element.
*/
- std::pair
- FindFirstIntersection(mitk::ContourElement* other);
+ mitk::ContourElement::VertexIterator FindFirstIntersection(mitk::ContourElement* other);
/** \brief Calculates the slope at a given index
\param index - the index to get the slope at.
\param slope - splope at given index.
*/
bool GetNthNodeSlope( int index, double slope[3]);
void ComputeMidpoint( double p1[3], double p2[3], double mid[3] )
{
mid[0] = (p1[0] + p2[0])/2;
mid[1] = (p1[1] + p2[1])/2;
mid[2] = (p1[2] + p2[2])/2;
}
VertexListType* m_Vertices; //double ended queue with vertices
bool m_IsClosed;
};
} // namespace mitk
#endif // _mitkContourElement_H_
diff --git a/Modules/Segmentation/DataManagement/mitkContourModel.cpp b/Modules/Segmentation/DataManagement/mitkContourModel.cpp
index 6382c9b212..e1f9a36c4c 100644
--- a/Modules/Segmentation/DataManagement/mitkContourModel.cpp
+++ b/Modules/Segmentation/DataManagement/mitkContourModel.cpp
@@ -1,621 +1,588 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include
#include
mitk::ContourModel::ContourModel()
{
//set to initial state
this->InitializeEmpty();
}
mitk::ContourModel::ContourModel(const mitk::ContourModel &other) :
m_ContourSeries(other.m_ContourSeries), m_lineInterpolation(other.m_lineInterpolation)
{
m_SelectedVertex = NULL;
}
mitk::ContourModel::~ContourModel()
{
m_SelectedVertex = NULL;
this->m_ContourSeries.clear();//TODO check destruction
}
void mitk::ContourModel::AddVertex(mitk::Point3D &vertex, int timestep)
{
if(!this->IsEmptyTimeStep(timestep) )
{
this->AddVertex(vertex, false, timestep);
}
}
void mitk::ContourModel::AddVertex(mitk::Point3D &vertex, bool isControlPoint, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->AddVertex(vertex, isControlPoint);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
void mitk::ContourModel::AddVertex(VertexType &vertex, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->AddVertex(vertex);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
void mitk::ContourModel::AddVertexAtFront(mitk::Point3D &vertex, int timestep)
{
if(!this->IsEmptyTimeStep(timestep) )
{
this->AddVertexAtFront(vertex, false, timestep);
}
}
void mitk::ContourModel::AddVertexAtFront(mitk::Point3D &vertex, bool isControlPoint, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->AddVertexAtFront(vertex, isControlPoint);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
void mitk::ContourModel::AddVertexAtFront(VertexType &vertex, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->AddVertexAtFront(vertex);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
void mitk::ContourModel::InsertVertexAtIndex(mitk::Point3D &vertex, int index, bool isControlPoint, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
if(index > 0 && this->m_ContourSeries[timestep]->GetSize() > index)
{
this->m_ContourSeries[timestep]->InsertVertexAtIndex(vertex, isControlPoint, index);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
}
bool mitk::ContourModel::IsEmpty( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->IsEmpty();
}
return true;
}
int mitk::ContourModel::GetNumberOfVertices( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->GetSize();
}
return -1;
}
const mitk::ContourModel::VertexType* mitk::ContourModel::GetVertexAt(int index, int timestep) const
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->GetVertexAt(index);
}
return NULL;
}
void mitk::ContourModel::Close( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->Close();
this->InvokeEvent( ContourModelClosedEvent() );
this->Modified();
}
}
void mitk::ContourModel::Open( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->Open();
this->InvokeEvent( ContourModelClosedEvent() );
this->Modified();
}
}
void mitk::ContourModel::SetIsClosed(bool isClosed, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->SetIsClosed(isClosed);
this->InvokeEvent( ContourModelClosedEvent() );
this->Modified();
}
}
bool mitk::ContourModel::IsEmptyTimeStep( int t) const
{
return (t < 0) || (this->m_ContourSeries.size() <= t);
}
bool mitk::ContourModel::IsNearContour(mitk::Point3D &point, float eps, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->IsNearContour(point, eps);
}
return false;
}
-void mitk::ContourModel::Concatenate(mitk::ContourModel* other, int timestep)
+void mitk::ContourModel::Concatenate(mitk::ContourModel* other, int timestep, bool check)
{
if(!this->IsEmptyTimeStep(timestep))
{
if( !this->m_ContourSeries[timestep]->IsClosed() )
{
- this->m_ContourSeries[timestep]->Concatenate(other->m_ContourSeries[timestep]);
- this->InvokeEvent( ContourModelSizeChangeEvent() );
- this->Modified();
- }
- }
-}
-
-void mitk::ContourModel::RemoveIntersections(mitk::ContourModel* other, int timestep)
-{
- if(!this->IsEmptyTimeStep(timestep))
- {
- if( !this->m_ContourSeries[timestep]->IsClosed() )
- {
- this->m_ContourSeries[timestep]->RemoveIntersections(other->m_ContourSeries[timestep]);
+ this->m_ContourSeries[timestep]->Concatenate(other->m_ContourSeries[timestep], check);
this->InvokeEvent( ContourModelSizeChangeEvent() );
this->Modified();
}
}
}
mitk::ContourModel::VertexIterator mitk::ContourModel::IteratorBegin( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->IteratorBegin();
}
else
{
mitkThrow() << "No iterator at invalid timestep " << timestep << ". There are only " << this->GetTimeSteps() << " timesteps available.";
}
}
-
-
mitk::ContourModel::VertexIterator mitk::ContourModel::IteratorEnd( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->IteratorEnd();
}
else
{
mitkThrow() << "No iterator at invalid timestep " << timestep << ". There are only " << this->GetTimeSteps() << " timesteps available.";
}
}
bool mitk::ContourModel::IsClosed( int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return this->m_ContourSeries[timestep]->IsClosed();
}
return false;
}
bool mitk::ContourModel::SelectVertexAt(mitk::Point3D &point, float eps, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_SelectedVertex = this->m_ContourSeries[timestep]->GetVertexAt(point, eps);
}
return this->m_SelectedVertex != NULL;
}
bool mitk::ContourModel::SelectVertexAt(int index, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
return (this->m_SelectedVertex = this->m_ContourSeries[timestep]->GetVertexAt(index));
}
return false;
}
bool mitk::ContourModel::SetControlVertexAt(mitk::Point3D &point, float eps, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
VertexType* vertex = this->m_ContourSeries[timestep]->GetVertexAt(point, eps);
if (vertex != NULL)
{
vertex->IsControlPoint = true;
return true;
}
}
return false;
}
bool mitk::ContourModel::SetControlVertexAt(int index, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
VertexType* vertex = this->m_ContourSeries[timestep]->GetVertexAt(index);
if (vertex != NULL)
{
vertex->IsControlPoint = true;
return true;
}
}
return false;
}
bool mitk::ContourModel::RemoveVertex(VertexType* vertex, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
if(this->m_ContourSeries[timestep]->RemoveVertex(vertex))
{
this->Modified();
this->InvokeEvent( ContourModelSizeChangeEvent() );
return true;
}
}
return false;
}
bool mitk::ContourModel::RemoveVertexAt(int index, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
if(this->m_ContourSeries[timestep]->RemoveVertexAt(index))
{
this->Modified();
this->InvokeEvent( ContourModelSizeChangeEvent() );
return true;
}
}
return false;
}
bool mitk::ContourModel::RemoveVertexAt(mitk::Point3D &point, float eps, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
if(this->m_ContourSeries[timestep]->RemoveVertexAt(point, eps))
{
this->Modified();
this->InvokeEvent( ContourModelSizeChangeEvent() );
return true;
}
}
return false;
}
void mitk::ContourModel::ShiftSelectedVertex(mitk::Vector3D &translate)
{
if(this->m_SelectedVertex)
{
this->ShiftVertex(this->m_SelectedVertex,translate);
this->Modified();
}
}
void mitk::ContourModel::ShiftContour(mitk::Vector3D &translate, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
VertexListType* vList = this->m_ContourSeries[timestep]->GetVertexList();
VertexIterator it = vList->begin();
VertexIterator end = vList->end();
//shift all vertices
while(it != end)
{
this->ShiftVertex((*it),translate);
it++;
}
this->Modified();
this->InvokeEvent( ContourModelShiftEvent() );
}
}
void mitk::ContourModel::ShiftVertex(VertexType* vertex, mitk::Vector3D &vector)
{
vertex->Coordinates[0] += vector[0];
vertex->Coordinates[1] += vector[1];
vertex->Coordinates[2] += vector[2];
}
void mitk::ContourModel::Clear(int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
//clear data at timestep
this->m_ContourSeries[timestep]->Clear();
this->InitializeEmpty();
this->Modified();
}
}
void mitk::ContourModel::Expand( int timeSteps )
{
int oldSize = this->m_ContourSeries.size();
if( timeSteps > 0 && timeSteps > oldSize )
{
Superclass::Expand(timeSteps);
//insert contours for each new timestep
for( int i = oldSize; i < timeSteps; i++)
{
m_ContourSeries.push_back(mitk::ContourElement::New());
}
this->InvokeEvent( ContourModelExpandTimeBoundsEvent() );
}
}
void mitk::ContourModel::SetRequestedRegionToLargestPossibleRegion ()
{
//no support for regions
}
bool mitk::ContourModel::RequestedRegionIsOutsideOfTheBufferedRegion ()
{
//no support for regions
return false;
}
bool mitk::ContourModel::VerifyRequestedRegion ()
{
//no support for regions
return true;
}
const mitk::Geometry3D * mitk::ContourModel::GetUpdatedGeometry (int t)
{
return Superclass::GetUpdatedGeometry(t);
}
mitk::Geometry3D* mitk::ContourModel::GetGeometry (int t)const
{
return Superclass::GetGeometry(t);
}
-
void mitk::ContourModel::SetRequestedRegion( const itk::DataObject *data)
{
//no support for regions
}
void mitk::ContourModel::Clear()
{
//clear data and set to initial state again
this->ClearData();
this->InitializeEmpty();
this->Modified();
}
-void mitk::ContourModel::Interpolate(int timestep)
-{
- if(!this->IsEmptyTimeStep(timestep))
- {
- this->m_ContourSeries[timestep]->Interpolate();
- this->InvokeEvent( ContourModelClosedEvent() );
- this->Modified();
- }
-}
-
void mitk::ContourModel::RedistributeControlVertices(int period, int timestep)
{
if(!this->IsEmptyTimeStep(timestep))
{
this->m_ContourSeries[timestep]->RedistributeControlVertices(this->GetSelectedVertex(), period);
this->InvokeEvent( ContourModelClosedEvent() );
this->Modified();
}
}
void mitk::ContourModel::ClearData()
{
//call the superclass, this releases the data of BaseData
Superclass::ClearData();
//clear out the time resolved contours
this->m_ContourSeries.clear();
}
-
void mitk::ContourModel::InitializeEmpty()
{
//clear data at timesteps
this->m_ContourSeries.resize(0);
this->m_ContourSeries.push_back(mitk::ContourElement::New());
//set number of timesteps to one
this->InitializeTimeSlicedGeometry(1);
m_SelectedVertex = NULL;
this->m_lineInterpolation = ContourModel::LINEAR;
}
-
void mitk::ContourModel::UpdateOutputInformation()
{
-
if ( this->GetSource() )
{
this->GetSource()->UpdateOutputInformation();
}
-
-
//update the bounds of the geometry according to the stored vertices
float mitkBounds[6];
-
//calculate the boundingbox at each timestep
-
typedef itk::BoundingBox BoundingBoxType;
typedef BoundingBoxType::PointsContainer PointsContainer;
int timesteps = this->GetTimeSteps();
//iterate over the timesteps
for(int currenTimeStep = 0; currenTimeStep < timesteps; currenTimeStep++)
{
if( dynamic_cast< mitk::PlaneGeometry* >(this->GetGeometry(currenTimeStep)) )
{
//do not update bounds for 2D geometries, as they are unfortunately defined with min bounds 0!
return;
}
else
{//we have a 3D geometry -> let's update bounds
//only update bounds if the contour was modified
if (this->GetMTime() > this->GetGeometry(currenTimeStep)->GetBoundingBox()->GetMTime())
{
mitkBounds[0] = 0.0;
mitkBounds[1] = 0.0;
mitkBounds[2] = 0.0;
mitkBounds[3] = 0.0;
mitkBounds[4] = 0.0;
mitkBounds[5] = 0.0;
BoundingBoxType::Pointer boundingBox = BoundingBoxType::New();
PointsContainer::Pointer points = PointsContainer::New();
VertexIterator it = this->IteratorBegin(currenTimeStep);
VertexIterator end = this->IteratorEnd(currenTimeStep);
//fill the boundingbox with the points
while(it != end)
{
Point3D currentP = (*it)->Coordinates;
BoundingBoxType::PointType p;
p.CastFrom(currentP);
points->InsertElement(points->Size(), p);
it++;
}
//construct the new boundingBox
boundingBox->SetPoints(points);
boundingBox->ComputeBoundingBox();
BoundingBoxType::BoundsArrayType tmp = boundingBox->GetBounds();
mitkBounds[0] = tmp[0];
mitkBounds[1] = tmp[1];
mitkBounds[2] = tmp[2];
mitkBounds[3] = tmp[3];
mitkBounds[4] = tmp[4];
mitkBounds[5] = tmp[5];
//set boundingBox at current timestep
Geometry3D* geometry3d = this->GetGeometry(currenTimeStep);
geometry3d->SetBounds(mitkBounds);
}
}
}
GetTimeSlicedGeometry()->UpdateInformation();
}
void mitk::ContourModel::ExecuteOperation(mitk::Operation* operation)
{
//not supported yet
}
diff --git a/Modules/Segmentation/DataManagement/mitkContourModel.h b/Modules/Segmentation/DataManagement/mitkContourModel.h
index ec83260af0..44e8319058 100644
--- a/Modules/Segmentation/DataManagement/mitkContourModel.h
+++ b/Modules/Segmentation/DataManagement/mitkContourModel.h
@@ -1,427 +1,426 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef _MITK_CONTOURMODEL_H_
#define _MITK_CONTOURMODEL_H_
#include "mitkCommon.h"
#include "SegmentationExports.h"
#include "mitkBaseData.h"
#include
namespace mitk
{
/**
\brief ContourModel is a structure of linked vertices defining a contour in 3D space.
The vertices are stored in a mitk::ContourElement is stored for each timestep.
The contour line segments are implicitly defined by the given linked vertices.
By default two control points are are linked by a straight line.It is possible to add
vertices at front and end of the contour and to iterate in both directions.
Points are specified containing coordinates and additional (data) information,
see mitk::ContourElement.
For accessing a specific vertex either an index or a position in 3D Space can be used.
The vertices are best accessed by using a VertexIterator.
Interaction with the contour is thus available without any mitk interactor class using the
api of ContourModel. It is possible to shift single vertices also as shifting the whole
contour.
A contour can be either open like a single curved line segment or
closed. A closed contour can for example represent a jordan curve.
\section mitkPointSetDisplayOptions
The default mappers for this data structure are mitk::ContourModelGLMapper2D and
mitk::ContourModelMapper3D. See these classes for display options which can
can be set via properties.
*/
class Segmentation_EXPORT ContourModel : public BaseData
{
public:
mitkClassMacro(ContourModel, BaseData);
itkNewMacro(Self);
mitkCloneMacro(Self);
/*+++++++++++++++ typedefs +++++++++++++++++++++++++++++++*/
typedef mitk::ContourElement::VertexType VertexType;
typedef mitk::ContourElement::VertexListType VertexListType;
typedef mitk::ContourElement::VertexIterator VertexIterator;
typedef mitk::ContourElement::ConstVertexIterator ConstVertexIterator;
typedef std::vector< mitk::ContourElement::Pointer > ContourModelSeries;
/*+++++++++++++++ END typedefs ++++++++++++++++++++++++++++*/
/** \brief Possible interpolation of the line segments between control points */
enum LineSegmentInterpolation{
LINEAR, B_SPLINE
};
/*++++++++++++++++ inline methods +++++++++++++++++++++++*/
/** \brief Get the current selected vertex.
*/
VertexType* GetSelectedVertex()
{
return this->m_SelectedVertex;
}
/** \brief Deselect vertex.
*/
void Deselect()
{
this->m_SelectedVertex = NULL;
}
/** \brief Set selected vertex as control point
*/
void SetSelectedVertexAsControlPoint(bool isControlPoint=true)
{
if (this->m_SelectedVertex)
{
m_SelectedVertex->IsControlPoint = isControlPoint;
this->Modified();
}
}
/** \brief Set the interpolation of the line segments between control points.
*/
void SetLineSegmentInterpolation(LineSegmentInterpolation interpolation)
{
this->m_lineInterpolation = interpolation;
this->Modified();
}
/** \brief Get the interpolation of the line segments between control points.
*/
LineSegmentInterpolation GetLineSegmentInterpolation()
{
return this->m_lineInterpolation;
}
/*++++++++++++++++ END inline methods +++++++++++++++++++++++*/
/** \brief Add a vertex to the contour at given timestep.
The vertex is added at the end of contour.
\pararm vertex - coordinate representation of a control point
\pararm timestep - the timestep at which the vertex will be add ( default 0)
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertex(mitk::Point3D &vertex, int timestep=0);
/** \brief Add a vertex to the contour at given timestep.
The vertex is added at the end of contour.
\param vertex - coordinate representation of a control point
\param timestep - the timestep at which the vertex will be add ( default 0)
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertex(VertexType &vertex, int timestep=0);
/** \brief Add a vertex to the contour.
\pararm vertex - coordinate representation of a control point
\pararm timestep - the timestep at which the vertex will be add ( default 0)
\pararm isControlPoint - specifies the vertex to be handled in a special way (e.g. control points
will be rendered).
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertex(mitk::Point3D &vertex, bool isControlPoint, int timestep=0);
/** \brief Add a vertex to the contour at given timestep AT THE FRONT of the contour.
The vertex is added at the FRONT of contour.
\pararm vertex - coordinate representation of a control point
\pararm timestep - the timestep at which the vertex will be add ( default 0)
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertexAtFront(mitk::Point3D &vertex, int timestep=0);
/** \brief Add a vertex to the contour at given timestep AT THE FRONT of the contour.
The vertex is added at the FRONT of contour.
\pararm vertex - coordinate representation of a control point
\pararm timestep - the timestep at which the vertex will be add ( default 0)
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertexAtFront(VertexType &vertex, int timestep=0);
/** \brief Add a vertex to the contour at given timestep AT THE FRONT of the contour.
\pararm vertex - coordinate representation of a control point
\pararm timestep - the timestep at which the vertex will be add ( default 0)
\pararm isControlPoint - specifies the vertex to be handled in a special way (e.g. control points
will be rendered).
@Note Adding a vertex to a timestep which exceeds the timebounds of the contour
will not be added, the TimeSlicedGeometry will not be expanded.
*/
void AddVertexAtFront(mitk::Point3D &vertex, bool isControlPoint, int timestep=0);
/** \brief Insert a vertex at given index.
*/
void InsertVertexAtIndex(mitk::Point3D &vertex, int index, bool isControlPoint=false, int timestep=0);
/** \brief Return if the contour is closed or not.
*/
bool IsClosed( int timestep=0);
/** \brief Concatenate two contours.
The starting control point of the other will be added at the end of the contour.
+ \pararm timestep - the timestep at which the vertex will be add ( default 0)
+ \pararm check - check for intersections ( default false)
*/
- void Concatenate(mitk::ContourModel* other, int timestep=0);
-
- void RemoveIntersections(mitk::ContourModel* other, int timestep=0);
+ void Concatenate(mitk::ContourModel* other, int timestep=0, bool check=false);
/** \brief Returns a const VertexIterator at the start element of the contour.
@throw mitk::Exception if the timestep is invalid.
*/
VertexIterator IteratorBegin( int timestep=0);
/** \brief Returns a const VertexIterator at the end element of the contour.
@throw mitk::Exception if the timestep is invalid.
*/
VertexIterator IteratorEnd( int timestep=0);
/** \brief Close the contour.
The last control point will be linked with the first point.
*/
virtual void Close( int timestep=0);
/** \brief Set isClosed to false contour.
The link between the last control point the first point will be removed.
*/
virtual void Open( int timestep=0);
/** \brief Set isClosed to given boolean.
false - The link between the last control point the first point will be removed.
true - The last control point will be linked with the first point.
*/
virtual void SetIsClosed(bool isClosed, int timestep=0);
/** \brief Returns the number of vertices at a given timestep.
\pararm timestep - default = 0
*/
int GetNumberOfVertices( int timestep=0);
/** \brief Returns whether the contour model is empty at a given timestep.
\pararm timestep - default = 0
*/
bool IsEmpty( int timestep=0);
/** \brief Returns the vertex at the index position within the container.
*/
virtual const VertexType* GetVertexAt(int index, int timestep=0) const;
/** \brief Check if there isn't something at this timestep.
*/
virtual bool IsEmptyTimeStep( int t) const;
/** \brief Check if mouse cursor is near the contour.
*/
virtual bool IsNearContour(mitk::Point3D &point, float eps, int timestep);
/** \brief Mark a vertex at an index in the container as selected.
*/
bool SelectVertexAt(int index, int timestep=0);
/** \brief Mark a vertex at an index in the container as control point.
*/
bool SetControlVertexAt(int index, int timestep=0);
/** \brief Mark a vertex at a given position in 3D space.
\pararm point - query point in 3D space
\pararm eps - radius for nearest neighbour search (error bound).
\pararm timestep - search at this timestep
@return true = vertex found; false = no vertex found
*/
bool SelectVertexAt(mitk::Point3D &point, float eps, int timestep=0);
/*
\pararm point - query point in 3D space
\pararm eps - radius for nearest neighbour search (error bound).
\pararm timestep - search at this timestep
@return true = vertex found; false = no vertex found
*/
bool SetControlVertexAt(mitk::Point3D &point, float eps, int timestep=0);
/** \brief Remove a vertex at given index within the container.
@return true = the vertex was successfuly removed; false = wrong index.
*/
bool RemoveVertexAt(int index, int timestep=0);
/** \brief Remove a vertex at given timestep within the container.
@return true = the vertex was successfuly removed.
*/
bool RemoveVertex(VertexType* vertex, int timestep=0);
/** \brief Remove a vertex at a query position in 3D space.
The vertex to be removed will be search by nearest neighbour search.
Note that possibly no vertex at this position and eps is stored inside
the contour.
@return true = the vertex was successfuly removed; false = no vertex found.
*/
bool RemoveVertexAt(mitk::Point3D &point, float eps, int timestep=0);
/** \brief Shift the currently selected vertex by a translation vector.
\pararm translate - the translation vector.
*/
void ShiftSelectedVertex(mitk::Vector3D &translate);
/** \brief Shift the whole contour by a translation vector at given timestep.
\pararm translate - the translation vector.
\pararm timestep - at this timestep the contour will be shifted.
*/
void ShiftContour(mitk::Vector3D &translate, int timestep=0);
/** \brief Clear the storage container at given timestep.
All control points are removed at
timestep.
*/
virtual void Clear(int timestep);
/*++++++++++++++++++ method inherit from base data +++++++++++++++++++++++++++*/
/**
\brief Inherit from base data - no region support available for contourModel objects.
*/
virtual void SetRequestedRegionToLargestPossibleRegion ();
/**
\brief Inherit from base data - no region support available for contourModel objects.
*/
virtual bool RequestedRegionIsOutsideOfTheBufferedRegion ();
/**
\brief Inherit from base data - no region support available for contourModel objects.
*/
virtual bool VerifyRequestedRegion ();
/**
\brief Get the updated geometry with recomputed bounds.
*/
virtual const mitk::Geometry3D* GetUpdatedGeometry (int t=0);
/**
\brief Get the Geometry3D for timestep t.
*/
virtual mitk::Geometry3D* GetGeometry (int t=0) const;
/**
\brief Inherit from base data - no region support available for contourModel objects.
*/
virtual void SetRequestedRegion( const itk::DataObject *data);
/**
\brief Expand the timebounds of the TimeSlicedGeometry to given number of timesteps.
*/
virtual void Expand( int timeSteps );
/**
\brief Update the OutputInformation of a ContourModel object
The BoundingBox of the contour will be updated, if necessary.
*/
virtual void UpdateOutputInformation();
/**
\brief Clear the storage container.
The object is set to initial state. All control points are removed and the number of
timesteps are set to 1.
*/
virtual void Clear();
/**
\brief overwrite if the Data can be called by an Interactor (StateMachine).
*/
void ExecuteOperation(Operation* operation);
- /** \brief Rebuilds all line segments for timestep according to the active type of interpolation method
+ /** \brief Redistributes ontrol vertices with a given period (as number of vertices)
+ \param period - the number of vertices between control points.
\param timestep - at this timestep all lines will be rebuilt.
*/
- virtual void Interpolate(int timestep);
-
virtual void RedistributeControlVertices(int period, int timestep);
protected:
ContourModel();
ContourModel(const mitk::ContourModel &other);
virtual ~ContourModel();
//inherit from BaseData. called by Clear()
virtual void ClearData();
//inherit from BaseData. Initial state of a contour with no vertices and a single timestep.
virtual void InitializeEmpty();
//Shift a vertex
void ShiftVertex(VertexType* vertex, mitk::Vector3D &vector);
//Storage with time resolved support.
ContourModelSeries m_ContourSeries;
//The currently selected vertex.
VertexType* m_SelectedVertex;
//The interpolation of the line segment between control points.
LineSegmentInterpolation m_lineInterpolation;
};
itkEventMacro( ContourModelEvent, itk::AnyEvent );
itkEventMacro( ContourModelShiftEvent, ContourModelEvent );
itkEventMacro( ContourModelSizeChangeEvent, ContourModelEvent );
itkEventMacro( ContourModelAddEvent, ContourModelSizeChangeEvent );
itkEventMacro( ContourModelRemoveEvent, ContourModelSizeChangeEvent );
itkEventMacro( ContourModelExpandTimeBoundsEvent, ContourModelEvent );
itkEventMacro( ContourModelClosedEvent, ContourModelEvent );
}
#endif
diff --git a/Modules/Segmentation/Interactions/mitkContourModelInteractor.cpp b/Modules/Segmentation/Interactions/mitkContourModelInteractor.cpp
index 79c36baebc..cfa2eea6ea 100644
--- a/Modules/Segmentation/Interactions/mitkContourModelInteractor.cpp
+++ b/Modules/Segmentation/Interactions/mitkContourModelInteractor.cpp
@@ -1,279 +1,276 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "mitkContourModelInteractor.h"
#include "mitkToolManager.h"
#include "mitkBaseRenderer.h"
#include "mitkRenderingManager.h"
#include
#include
#include
mitk::ContourModelInteractor::ContourModelInteractor(DataNode* dataNode)
-:Interactor("ContourModelInteractor2", dataNode)
+:Interactor("ContourModelInteractor", dataNode)
{
CONNECT_ACTION( AcCHECKPOINT, OnCheckPointClick );
CONNECT_ACTION( AcCHECKOBJECT, OnCheckContourClick );
CONNECT_ACTION( AcDELETEPOINT, OnDeletePoint );
CONNECT_ACTION( AcMOVEPOINT, OnMovePoint );
// CONNECT_ACTION( AcMOVE, OnMoveContour );
CONNECT_ACTION( AcMOVE, OnMove );
CONNECT_ACTION( AcFINISH, OnFinishEditing );
}
mitk::ContourModelInteractor::~ContourModelInteractor()
{
}
float mitk::ContourModelInteractor::CanHandleEvent(StateEvent const* stateEvent) const
{
float returnValue = 0.0;
//if it is a key event that can be handled in the current state, then return 0.5
mitk::PositionEvent const *positionEvent =
dynamic_cast (stateEvent->GetEvent());
//Key event handling:
if (positionEvent == NULL)
{
//check for delete and escape event
if(stateEvent->GetId() == 12 || stateEvent->GetId() == 14)
{
return 1.0;
}
//check, if the current state has a transition waiting for that key event.
else if (this->GetCurrentState()->GetTransition(stateEvent->GetId())!=NULL)
{
return 0.5;
}
else
{
return 0;
}
}
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast(
m_DataNode->GetData() );
if ( contour != NULL )
{
mitk::Point3D worldPoint3D = positionEvent->GetWorldPosition();
mitk::Geometry3D *contourGeometry =
dynamic_cast< Geometry3D * >( contour->GetGeometry( timestep ) );
if ( contourGeometry )
{
//if click is inside bounds the interactor can handle the event best
if( contourGeometry->IsInside(worldPoint3D) )
{
return 1.0;
}
return 0.9;
}
}
return returnValue;
}
-
-
void mitk::ContourModelInteractor::DataChanged()
{
//go to initial state
const mitk::Event* nullEvent = new mitk::Event(NULL, Type_User, BS_NoButton, BS_NoButton, Key_none);
mitk::StateEvent* newStateEvent = new mitk::StateEvent(AcFINISH, nullEvent);
this->HandleEvent( newStateEvent );
delete newStateEvent;
delete nullEvent;
return;
}
-
bool mitk::ContourModelInteractor::OnCheckPointClick( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
mitk::StateEvent* newStateEvent = NULL;
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast(
m_DataNode->GetData() );
contour->Deselect();
/*
* Check distance to any vertex.
* Transition YES if click close to a vertex
*/
mitk::Point3D click = positionEvent->GetWorldPosition();
if (contour->SelectVertexAt(click, 1.5, timestep) )
{
contour->SetSelectedVertexAsControlPoint();
assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
newStateEvent = new mitk::StateEvent(EIDYES, stateEvent->GetEvent());
m_lastMousePosition = click;
}
else
{
newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
}
this->HandleEvent( newStateEvent );
return true;
}
-
bool mitk::ContourModelInteractor::OnCheckContourClick( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::Point3D click = positionEvent->GetWorldPosition();
mitk::StateEvent* newStateEvent = NULL;
mitk::ContourModel *contour = dynamic_cast(
m_DataNode->GetData() );
mitk::Geometry3D *contourGeometry = dynamic_cast< Geometry3D * >( contour->GetGeometry( timestep ) );
if ( contourGeometry->IsInside(click) )
{
m_lastMousePosition = click;
newStateEvent = new mitk::StateEvent(EIDYES, stateEvent->GetEvent());
}
else
{
newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
}
this->HandleEvent( newStateEvent );
return true;
}
+
bool mitk::ContourModelInteractor::OnDeletePoint( Action* action, const StateEvent* stateEvent)
{
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
contour->RemoveVertex(contour->GetSelectedVertex());
return true;
}
bool mitk::ContourModelInteractor::OnMove( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
int timestep = positionEvent->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
mitk::Point3D currentPosition = positionEvent->GetWorldPosition();
m_DataNode->SetBoolProperty("contour.hovering", contour->IsNearContour(currentPosition, 1.5, timestep) );
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::ContourModelInteractor::OnMovePoint( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
mitk::Vector3D translation;
mitk::Point3D currentPosition = positionEvent->GetWorldPosition();
translation[0] = currentPosition[0] - this->m_lastMousePosition[0];
translation[1] = currentPosition[1] - this->m_lastMousePosition[1];
translation[2] = currentPosition[2] - this->m_lastMousePosition[2];
contour->ShiftSelectedVertex(translation);
this->m_lastMousePosition = positionEvent->GetWorldPosition();
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::ContourModelInteractor::OnMoveContour( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
int timestep = positionEvent->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
mitk::Vector3D translation;
mitk::Point3D currentPosition = positionEvent->GetWorldPosition();
translation[0] = currentPosition[0] - this->m_lastMousePosition[0];
translation[1] = currentPosition[1] - this->m_lastMousePosition[1];
translation[2] = currentPosition[2] - this->m_lastMousePosition[2];
contour->ShiftContour(translation, timestep);
this->m_lastMousePosition = positionEvent->GetWorldPosition();
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::ContourModelInteractor::OnFinishEditing( Action* action, const StateEvent* stateEvent)
{
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
contour->Deselect();
assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
return true;
}
diff --git a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
index cac0698b73..1cbf067bf6 100644
--- a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
+++ b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.cpp
@@ -1,483 +1,475 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "mitkContourModelLiveWireInteractor.h"
#include "mitkToolManager.h"
#include "mitkBaseRenderer.h"
#include "mitkRenderingManager.h"
#include
#include
#include
#include "mitkIOUtil.h"
mitk::ContourModelLiveWireInteractor::ContourModelLiveWireInteractor(DataNode* dataNode)
:ContourModelInteractor(dataNode)
{
- CONNECT_ACTION( AcCLEAR, OnDumpImage ); // auxiliar for debug
+
m_LiveWireFilter = mitk::ImageLiveWireContourModelFilter::New();
m_NextActiveVertexDown.Fill(0);
m_NextActiveVertexUp.Fill(0);
}
mitk::ContourModelLiveWireInteractor::~ContourModelLiveWireInteractor()
{
}
bool mitk::ContourModelLiveWireInteractor::OnCheckPointClick( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent)
{
this->HandleEvent( new mitk::StateEvent(EIDNO, stateEvent->GetEvent()) );
return false;
}
mitk::StateEvent* newStateEvent = NULL;
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
assert ( contour );
contour->Deselect();
// Check distance to any vertex.
// Transition YES if click close to a vertex
mitk::Point3D click = positionEvent->GetWorldPosition();
if (contour->SelectVertexAt(click, 1.5, timestep) )
{
contour->SetSelectedVertexAsControlPoint(false);
- m_lastMousePosition = click;
+ //m_lastMousePosition = click;
m_ContourLeft = mitk::ContourModel::New();
//get coordinates of next active vertex downwards from selected vertex
int downIndex = this->SplitContourFromSelectedVertex( contour, m_ContourLeft, false, timestep);
m_NextActiveVertexDownIter = contour->IteratorBegin() + downIndex;
m_NextActiveVertexDown = (*m_NextActiveVertexDownIter)->Coordinates;
m_ContourRight = mitk::ContourModel::New();
//get coordinates of next active vertex upwards from selected vertex
int upIndex = this->SplitContourFromSelectedVertex( contour, m_ContourRight, true, timestep);
m_NextActiveVertexUpIter = contour->IteratorBegin() + upIndex;
m_NextActiveVertexUp = (*m_NextActiveVertexUpIter)->Coordinates;
// clear previous void positions
this->m_LiveWireFilter->ClearRepulsivePoints();
// set the current contour as void positions in the cost map
// start with down side
mitk::ContourModel::VertexIterator iter = contour->IteratorBegin(timestep);
for (;iter != m_NextActiveVertexDownIter; iter++)
{
itk::Index<2> idx;
this->m_WorkingSlice->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
this->m_LiveWireFilter->AddRepulsivePoint( idx );
}
// continue with upper side
iter = m_NextActiveVertexUpIter + 1;
for (;iter != contour->IteratorEnd(timestep); iter++)
{
itk::Index<2> idx;
this->m_WorkingSlice->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
this->m_LiveWireFilter->AddRepulsivePoint( idx );
}
// clear container with void points between neighboring control points
m_ContourBeingModified.clear();
// let us have the selected point as a control point
contour->SetSelectedVertexAsControlPoint(true);
// finally, allow to leave current state
newStateEvent = new mitk::StateEvent(EIDYES, stateEvent->GetEvent());
}
else
{
// do not allow to leave current state
newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
}
this->HandleEvent( newStateEvent );
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
+void mitk::ContourModelLiveWireInteractor::SetEditingContourModelNode (mitk::DataNode* _arg)
+{
+ if (this->m_EditingContourNode != _arg)
+ {
+ this->m_EditingContourNode = _arg;
+ this->Modified();
+ }
+}
+
void mitk::ContourModelLiveWireInteractor::SetWorkingImage (mitk::Image* _arg)
{
if (this->m_WorkingSlice != _arg)
{
this->m_WorkingSlice = _arg;
this->m_LiveWireFilter->SetInput(this->m_WorkingSlice);
this->Modified();
}
}
-// delete me
-
-bool mitk::ContourModelLiveWireInteractor::OnDumpImage( Action* action, const StateEvent* stateEvent)
-{
- this->m_LiveWireFilter->DumpMaskImage();
- mitk::IOUtil::SaveImage(this->m_WorkingSlice, "G:\\Data\\slice.nrrd");
-
- return true;
-}
-
bool mitk::ContourModelLiveWireInteractor::OnDeletePoint( Action* action, const StateEvent* stateEvent)
{
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
assert ( contour );
if (contour->GetSelectedVertex())
{
mitk::ContourModel::Pointer newContour = mitk::ContourModel::New();
newContour->Expand(contour->GetTimeSteps());
newContour->Concatenate( m_ContourLeft, timestep );
//recompute contour between neighbored two active control points
this->m_LiveWireFilter->SetStartPoint( this->m_NextActiveVertexDown );
this->m_LiveWireFilter->SetEndPoint( this->m_NextActiveVertexUp );
// this->m_LiveWireFilter->ClearRepulsivePoints();
this->m_LiveWireFilter->Update();
mitk::ContourModel *liveWireContour = this->m_LiveWireFilter->GetOutput();
assert ( liveWireContour );
if ( liveWireContour->IsEmpty(timestep) )
return false;
liveWireContour->RemoveVertexAt( 0, timestep);
liveWireContour->RemoveVertexAt( liveWireContour->GetNumberOfVertices(timestep) - 1, timestep);
//insert new live wire computed points
newContour->Concatenate( liveWireContour, timestep );
// insert right side of original contour
newContour->Concatenate( this->m_ContourRight, timestep );
newContour->SetIsClosed(contour->IsClosed(timestep), timestep);
m_DataNode->SetData(newContour);
assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
return true;
}
return false;
}
bool mitk::ContourModelLiveWireInteractor::OnMovePoint( Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::Point3D currentPosition = positionEvent->GetWorldPosition();
mitk::ContourModel *contour = dynamic_cast( m_DataNode->GetData() );
assert ( contour );
// recompute left live wire, i.e. the contour between previous active vertex and selected vertex
this->m_LiveWireFilter->SetStartPoint( this->m_NextActiveVertexDown );
this->m_LiveWireFilter->SetEndPoint( currentPosition );
// remove void positions between previous active vertex and next active vertex.
if (!m_ContourBeingModified.empty())
{
std::vector< itk::Index< 2 > >::const_iterator iter = m_ContourBeingModified.begin();
for (;iter != m_ContourBeingModified.end(); iter++)
{
this->m_LiveWireFilter->RemoveRepulsivePoint( (*iter) );
}
}
// update to get the left livewire. Remember that the points in the rest of the contour are already
// set as void positions in the filter
this->m_LiveWireFilter->Update();
mitk::ContourModel::Pointer leftLiveWire = this->m_LiveWireFilter->GetOutput();
assert ( leftLiveWire );
- // if ( leftLiveWire->GetNumberOfVertices(timestep) > 1.5*m_EditingSize )
- // return false;
-
if ( !leftLiveWire->IsEmpty(timestep) )
leftLiveWire->RemoveVertexAt(0, timestep);
// at this point the container has to be empty
m_ContourBeingModified.clear();
// add points from left live wire contour
mitk::ContourModel::VertexIterator iter = leftLiveWire->IteratorBegin(timestep);
for (;iter != leftLiveWire->IteratorEnd(timestep); iter++)
{
itk::Index<2> idx;
this->m_WorkingSlice->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
this->m_LiveWireFilter->AddRepulsivePoint( idx );
// add indices
m_ContourBeingModified.push_back(idx);
}
// recompute right live wire, i.e. the contour between selected vertex and next active vertex
this->m_LiveWireFilter->SetStartPoint( currentPosition );
this->m_LiveWireFilter->SetEndPoint( m_NextActiveVertexUp );
// update filter with all contour points set as void but the right live wire portion to be calculated now
this->m_LiveWireFilter->Update();
mitk::ContourModel::Pointer rightLiveWire = this->m_LiveWireFilter->GetOutput();
assert ( rightLiveWire );
-/*
+
// reject strange paths
if ( abs (rightLiveWire->GetNumberOfVertices(timestep) - leftLiveWire->GetNumberOfVertices(timestep)) > 50 )
{
- MITK_INFO << "reject strange path";
return false;
}
-*/
+
if ( !leftLiveWire->IsEmpty(timestep) )
leftLiveWire->SetControlVertexAt(leftLiveWire->GetNumberOfVertices()-1, timestep);
if ( !rightLiveWire->IsEmpty(timestep) )
rightLiveWire->RemoveVertexAt(0, timestep);
-
- // set corrected left live wire to its node
- // m_EditingContourNode->SetData(leftLiveWire);
-
- // set corrected right live wire to its node
- // m_RightLiveWireContourNode->SetData(rightLiveWire);
-
// not really needed
/*
// add points from right live wire contour
iter = rightLiveWire->IteratorBegin(timestep);
for (;iter != rightLiveWire->IteratorEnd(timestep); iter++)
{
itk::Index<2> idx;
this->m_WorkingSlice->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
this->m_LiveWireFilter->AddRepulsivePoint( idx );
// add indices
m_ContourBeingModified.push_back(idx);
}
*/
mitk::ContourModel::Pointer editingContour = mitk::ContourModel::New();
editingContour->Expand(contour->GetTimeSteps());
editingContour->Concatenate( leftLiveWire, timestep );
editingContour->Concatenate( rightLiveWire, timestep );
m_EditingContourNode->SetData(editingContour);
mitk::ContourModel::Pointer newContour = mitk::ContourModel::New();
newContour->Expand(contour->GetTimeSteps());
// concatenate left original contour
newContour->Concatenate( this->m_ContourLeft, timestep );
newContour->Deselect();
// concatenate left live wire but only if we have more than one vertex
- if (leftLiveWire->GetNumberOfVertices(timestep)>1)
- newContour->Concatenate( leftLiveWire, timestep );
+ if (!leftLiveWire->IsEmpty())
+ {
+ newContour->Concatenate( leftLiveWire, timestep, true);
+ }
// set last inserted vertex as selected
newContour->SelectVertexAt(newContour->GetNumberOfVertices()-1, timestep);
// concatenate right live wire but only if we have more than one vertex
- if (rightLiveWire->GetNumberOfVertices(timestep)>1)
- newContour->Concatenate( rightLiveWire, timestep );
+ if (!rightLiveWire->IsEmpty())
+ {
+ newContour->Concatenate( rightLiveWire, timestep, true );
+ }
// concatenate right original contour
newContour->Concatenate( this->m_ContourRight, timestep );
newContour->SetIsClosed(contour->IsClosed(timestep), timestep);
m_DataNode->SetData(newContour);
- this->m_lastMousePosition = positionEvent->GetWorldPosition();
+ //this->m_lastMousePosition = positionEvent->GetWorldPosition();
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
int mitk::ContourModelLiveWireInteractor::SplitContourFromSelectedVertex(mitk::ContourModel* srcContour,
mitk::ContourModel* destContour,
bool fromSelectedUpwards, int timestep)
{
mitk::ContourModel::VertexIterator end = srcContour->IteratorEnd();
mitk::ContourModel::VertexIterator begin = srcContour->IteratorBegin();
//search next active control point to left and rigth and set as start and end point for filter
mitk::ContourModel::VertexIterator itSelected = begin;
// move iterator to position
while ((*itSelected) != srcContour->GetSelectedVertex())
{
itSelected++;
}
// CASE search upwards for next control point
if(fromSelectedUpwards)
{
mitk::ContourModel::VertexIterator itUp = itSelected;
if(itUp != end)
{
itUp++;//step once up otherwise the loop breaks immediately
}
while( itUp != end && !((*itUp)->IsControlPoint))
{
itUp++;
}
mitk::ContourModel::VertexIterator it = itUp;
if (itSelected != begin)
{
//copy the rest of the original contour
while (it != end)
{
destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
it++;
}
}
//else do not copy the contour
//return the offset of iterator at one before next-vertex-upwards
if(itUp != begin)
{
return std::distance( begin, itUp) - 1;
}
else
{
return std::distance( begin, itUp);
}
}
else //CASE search downwards for next control point
{
mitk::ContourModel::VertexIterator itDown = itSelected;
mitk::ContourModel::VertexIterator it = srcContour->IteratorBegin();
if( itSelected != begin )
{
if(itDown != begin)
{
itDown--;//step once down otherwise the the loop breaks immediately
}
while( itDown != begin && !((*itDown)->IsControlPoint)){ itDown--; }
if(it != end)//if not empty
{
//always add the first vertex
destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
it++;
}
//copy from begin to itDown
while(it <= itDown)
{
destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
it++;
}
}
else
{
//if selected vertex is the first element search from end of contour downwards
itDown = end;
itDown--;
while(!((*itDown)->IsControlPoint)){itDown--;}
//move one forward as we don't want the first control point
it++;
//move iterator to second control point
while( (it!=end) && !((*it)->IsControlPoint) ){it++;}
//copy from begin to itDown
while(it <= itDown)
{
//copy the contour from second control point to itDown
destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
it++;
}
}
/*
//add vertex at itDown - it's not considered during while loop
if( it != begin && it != end)
{
//destContour->AddVertex( (*it)->Coordinates, (*it)->IsControlPoint, timestep);
}
*/
//return the offset of iterator at one after next-vertex-downwards
if( itDown != end)
{
return std::distance( begin, itDown);// + 1;//index of next vertex
}
else
{
return std::distance( begin, itDown) - 1;
}
}
}
bool mitk::ContourModelLiveWireInteractor::OnFinishEditing( Action* action, const StateEvent* stateEvent)
{
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
mitk::ContourModel *editingContour = dynamic_cast( this->m_EditingContourNode->GetData() );
assert ( editingContour );
editingContour->Clear(timestep);
/*
mitk::ContourModel *rightLiveWire = dynamic_cast( this->m_RightLiveWireContourNode->GetData() );
assert ( rightLiveWire );
rightLiveWire->Clear(timestep);
*/
assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
return true;
}
diff --git a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h
index 53757b026f..c0964cbd7d 100644
--- a/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h
+++ b/Modules/Segmentation/Interactions/mitkContourModelLiveWireInteractor.h
@@ -1,92 +1,87 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef mitkContourModelLiveWireInteractor_h_Included
#define mitkContourModelLiveWireInteractor_h_Included
#include "mitkCommon.h"
#include "SegmentationExports.h"
#include "mitkContourModelInteractor.h"
#include
namespace mitk
{
/**
\brief
\sa Interactor
\sa ContourModelInteractor
\ingroup Interaction
\warning Make sure the working image is properly set, otherwise the algorithm for computing livewire contour segments will not work!
*/
class Segmentation_EXPORT ContourModelLiveWireInteractor : public ContourModelInteractor
{
public:
mitkClassMacro(ContourModelLiveWireInteractor, ContourModelInteractor);
mitkNewMacro1Param(Self, DataNode*);
- virtual void SetEditingContourModelNode (mitk::DataNode* _arg)
- {
- this->m_EditingContourNode = _arg;
- this->Modified();
- }
+ virtual void SetEditingContourModelNode (mitk::DataNode* _arg);
virtual void SetWorkingImage (mitk::Image* _arg);
protected:
ContourModelLiveWireInteractor(DataNode* dataNode);
virtual ~ContourModelLiveWireInteractor();
- virtual bool OnDumpImage(Action*, const StateEvent*);
virtual bool OnDeletePoint(Action*, const StateEvent*);
virtual bool OnMovePoint(Action*, const StateEvent*);
virtual bool OnCheckPointClick( Action* action, const StateEvent* stateEvent);
virtual bool OnFinishEditing( Action* action, const StateEvent* stateEvent);
int SplitContourFromSelectedVertex(mitk::ContourModel* srcContour,
mitk::ContourModel* destContour,
bool fromSelectedUpwards,
int timestep);
mitk::ImageLiveWireContourModelFilter::Pointer m_LiveWireFilter;
mitk::Image::Pointer m_WorkingSlice;
mitk::Point3D m_NextActiveVertexDown;
mitk::Point3D m_NextActiveVertexUp;
mitk::ContourModel::VertexIterator m_NextActiveVertexDownIter;
mitk::ContourModel::VertexIterator m_NextActiveVertexUpIter;
std::vector < itk::Index<2> > m_ContourBeingModified;
mitk::DataNode::Pointer m_EditingContourNode;
mitk::ContourModel::Pointer m_ContourLeft;
mitk::ContourModel::Pointer m_ContourRight;
};
} // namespace mitk
#endif // mitkContourModelLiveWireInteractor_h_Included
diff --git a/Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp b/Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
index bcca9cf8b4..dd4c40390d 100644
--- a/Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
+++ b/Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
@@ -1,617 +1,630 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "mitkLiveWireTool2D.h"
#include "mitkToolManager.h"
#include "mitkBaseRenderer.h"
#include "mitkRenderingManager.h"
#include "mitkLiveWireTool2D.xpm"
#include
#include
#include "mitkContourUtils.h"
#include "mitkContour.h"
#include
namespace mitk {
MITK_TOOL_MACRO(Segmentation_EXPORT, LiveWireTool2D, "LiveWire tool");
}
mitk::LiveWireTool2D::LiveWireTool2D()
:SegTool2D("LiveWireTool")
{
// great magic numbers
CONNECT_ACTION( AcINITNEWOBJECT, OnInitLiveWire );
CONNECT_ACTION( AcADDPOINT, OnAddPoint );
CONNECT_ACTION( AcMOVE, OnMouseMoveNoDynamicCosts );
CONNECT_ACTION( AcCHECKPOINT, OnCheckPoint );
CONNECT_ACTION( AcFINISH, OnFinish );
CONNECT_ACTION( AcDELETEPOINT, OnLastSegmentDelete );
CONNECT_ACTION( AcADDLINE, OnMouseMoved );
}
mitk::LiveWireTool2D::~LiveWireTool2D()
{
- m_Contours.clear();
+ this->m_WorkingContours.clear();
+ this->m_EditingContours.clear();
}
float mitk::LiveWireTool2D::CanHandleEvent( StateEvent const *stateEvent) const
{
mitk::PositionEvent const *positionEvent =
dynamic_cast (stateEvent->GetEvent());
//Key event handling:
if (positionEvent == NULL)
{
//check for delete and escape event
if(stateEvent->GetId() == 12 || stateEvent->GetId() == 14)
{
return 1.0;
}
//check, if the current state has a transition waiting for that key event.
else if (this->GetCurrentState()->GetTransition(stateEvent->GetId())!=NULL)
{
return 0.5;
}
else
{
return 0.0;
}
}
else
{
if ( positionEvent->GetSender()->GetMapperID() != BaseRenderer::Standard2D )
return 0.0; // we don't want anything but 2D
return 1.0;
}
}
const char** mitk::LiveWireTool2D::GetXPM() const
{
return mitkLiveWireTool2D_xpm;
}
const char* mitk::LiveWireTool2D::GetName() const
{
return "LiveWire";
}
void mitk::LiveWireTool2D::Activated()
{
Superclass::Activated();
}
void mitk::LiveWireTool2D::Deactivated()
{
- // this->FinishTool();
-
- //add interactor to globalInteraction instance
- mitk::GlobalInteraction::GetInstance()->RemoveInteractor(m_LiveWireInteractor);
-
DataNode* workingNode( m_ToolManager->GetWorkingData(0) );
- if ( !workingNode ) return;
+ assert ( workingNode );
Image* workingImage = dynamic_cast(workingNode->GetData());
- if ( !workingImage ) return;
+ assert ( workingImage );
ContourUtils::Pointer contourUtils = mitk::ContourUtils::New();
// for all contours in list (currently created by tool)
- std::vector< std::pair >::iterator it = m_Contours.begin();
- while(it != m_Contours.end() )
+ std::vector< std::pair >::iterator itWorkingContours = this->m_WorkingContours.begin();
+ while(itWorkingContours != this->m_WorkingContours.end() )
{
-
// if node contains data
- if( it->first->GetData() )
+ if( itWorkingContours->first->GetData() )
{
// if this is a contourModel
- mitk::ContourModel* contourModel = dynamic_cast(it->first->GetData());
+ mitk::ContourModel* contourModel = dynamic_cast(itWorkingContours->first->GetData());
if( contourModel )
{
- //++++++++++++++++++++++ for each timestep of this contourModel
+ // for each timestep of this contourModel
for( int currentTimestep = 0; currentTimestep < contourModel->GetTimeSlicedGeometry()->GetTimeSteps(); currentTimestep++)
{
//get the segmentation image slice at current timestep
- mitk::Image::Pointer workingSlice = this->GetAffectedImageSliceAs2DImage(it->second, workingImage, currentTimestep);
+ mitk::Image::Pointer workingSlice = this->GetAffectedImageSliceAs2DImage(itWorkingContours->second, workingImage, currentTimestep);
// transfer to plain old contour to use contour util functionality
mitk::Contour::Pointer plainOldContour = mitk::Contour::New();
mitk::ContourModel::VertexIterator iter = contourModel->IteratorBegin(currentTimestep);
while(iter != contourModel->IteratorEnd(currentTimestep) )
{
plainOldContour->AddVertex( (*iter)->Coordinates );
iter++;
}
mitk::Contour::Pointer projectedContour = contourUtils->ProjectContourTo2DSlice(workingSlice, plainOldContour, true, false);
contourUtils->FillContourInSlice(projectedContour, workingSlice, 1.0);
//write back to image volume
- this->WriteBackSegmentationResult(it->second, workingSlice, currentTimestep);
+ this->WriteBackSegmentationResult(itWorkingContours->second, workingSlice, currentTimestep);
}
//remove contour node from datastorage
- m_ToolManager->GetDataStorage()->Remove( it->first );
+ m_ToolManager->GetDataStorage()->Remove( itWorkingContours->first );
}
}
- ++it;
+ ++itWorkingContours;
}
- m_Contours.clear();
+ this->m_WorkingContours.clear();
+
+ // for all contours in list (currently created by tool)
+ std::vector< std::pair >::iterator itEditingContours = this->m_EditingContours.begin();
+ while(itEditingContours != this->m_EditingContours.end() )
+ {
+ //remove contour node from datastorage
+ m_ToolManager->GetDataStorage()->Remove( itEditingContours->first );
+ ++itEditingContours;
+ }
-// m_ToolManager->GetDataStorage()->Remove( m_LeftLiveWireContourNode );
- m_ToolManager->GetDataStorage()->Remove( m_EditingContourNode );
+ this->m_EditingContours.clear();
- m_EditingContourNode = NULL;
- m_EditingContour = NULL;
+ std::vector< mitk::ContourModelLiveWireInteractor::Pointer >::iterator itLiveWireInteractors = this->m_LiveWireInteractors.begin();
+ while(itLiveWireInteractors != this->m_LiveWireInteractors.end() )
+ {
+ // remove interactors from globalInteraction instance
+ mitk::GlobalInteraction::GetInstance()->RemoveInteractor( *itLiveWireInteractors );
+ ++itLiveWireInteractors;
+ }
-// m_RightLiveWireContourNode = NULL;
-// m_RightLiveWireContour = NULL;
+ this->m_LiveWireInteractors.clear();
Superclass::Deactivated();
}
bool mitk::LiveWireTool2D::OnInitLiveWire (Action* action, const StateEvent* stateEvent)
{
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
m_LastEventSender = positionEvent->GetSender();
m_LastEventSlice = m_LastEventSender->GetSlice();
if ( Superclass::CanHandleEvent(stateEvent) < 1.0 ) return false;
int timestep = positionEvent->GetSender()->GetTimeStep();
m_Contour = mitk::ContourModel::New();
m_Contour->Expand(timestep+1);
m_ContourModelNode = mitk::DataNode::New();
m_ContourModelNode->SetData( m_Contour );
m_ContourModelNode->SetName("working contour node");
m_ContourModelNode->AddProperty( "contour.color", ColorProperty::New(1, 1, 0), NULL, true );
m_ContourModelNode->AddProperty( "contour.points.color", ColorProperty::New(1.0, 0.0, 0.1), NULL, true );
m_ContourModelNode->AddProperty( "contour.controlpoints.show", BoolProperty::New(true), NULL, true );
m_LiveWireContour = mitk::ContourModel::New();
m_LiveWireContour->Expand(timestep+1);
m_LiveWireContourNode = mitk::DataNode::New();
m_LiveWireContourNode->SetData( m_LiveWireContour );
m_LiveWireContourNode->SetName("active livewire node");
m_LiveWireContourNode->AddProperty( "contour.color", ColorProperty::New(0.1, 1.0, 0.1), NULL, true );
m_LiveWireContourNode->AddProperty( "contour.width", mitk::FloatProperty::New( 4.0 ), NULL, true );
m_EditingContour = mitk::ContourModel::New();
m_EditingContour->Expand(timestep+1);
m_EditingContourNode = mitk::DataNode::New();
m_EditingContourNode->SetData( m_EditingContour );
m_EditingContourNode->SetName("editing node");
m_EditingContourNode->AddProperty( "contour.color", ColorProperty::New(0.1, 1.0, 0.1), NULL, true );
m_EditingContourNode->AddProperty( "contour.points.color", ColorProperty::New(0.0, 0.0, 1.0), NULL, true );
m_EditingContourNode->AddProperty( "contour.width", mitk::FloatProperty::New( 4.0 ), NULL, true );
m_ToolManager->GetDataStorage()->Add( m_ContourModelNode );
m_ToolManager->GetDataStorage()->Add( m_LiveWireContourNode );
m_ToolManager->GetDataStorage()->Add( m_EditingContourNode );
//set current slice as input for ImageToLiveWireContourFilter
m_WorkingSlice = this->GetAffectedReferenceSlice(positionEvent);
m_LiveWireFilter = mitk::ImageLiveWireContourModelFilter::New();
m_LiveWireFilter->SetInput(m_WorkingSlice);
//map click to pixel coordinates
mitk::Point3D click = const_cast(positionEvent->GetWorldPosition());
itk::Index<3> idx;
m_WorkingSlice->GetGeometry()->WorldToIndex(click, idx);
// get the pixel the gradient in region of 5x5
itk::Index<3> indexWithHighestGradient;
AccessFixedDimensionByItk_2(m_WorkingSlice, FindHighestGradientMagnitudeByITK, 2, idx, indexWithHighestGradient);
// itk::Index to mitk::Point3D
click[0] = indexWithHighestGradient[0];
click[1] = indexWithHighestGradient[1];
click[2] = indexWithHighestGradient[2];
m_WorkingSlice->GetGeometry()->IndexToWorld(click, click);
//set initial start point
m_Contour->AddVertex( click, true, timestep );
m_LiveWireFilter->SetStartPoint(click);
m_CreateAndUseDynamicCosts = true;
//render
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::LiveWireTool2D::OnAddPoint (Action* action, const StateEvent* stateEvent)
{
//complete LiveWire interaction for last segment
//add current LiveWire contour to the finished contour and reset
//to start new segment and computation
/* check if event can be handled */
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
if ( Superclass::CanHandleEvent(stateEvent) < 1.0 ) return false;
/* END check if event can be handled */
int timestep = positionEvent->GetSender()->GetTimeStep();
typedef mitk::ImageLiveWireContourModelFilter::InternalImageType::IndexType IndexType;
mitk::ContourModel::ConstVertexIterator iter = m_LiveWireContour->IteratorBegin(timestep);
for (;iter != m_LiveWireContour->IteratorEnd(timestep); iter++)
{
IndexType idx;
this->m_WorkingSlice->GetGeometry()->WorldToIndex((*iter)->Coordinates, idx);
this->m_LiveWireFilter->AddRepulsivePoint( idx );
}
this->m_LiveWireFilter->Update();
//remove duplicate first vertex, it's already contained in m_Contour
m_LiveWireContour->RemoveVertexAt(0, timestep);
// set last added point as control point
m_LiveWireContour->SetControlVertexAt(m_LiveWireContour->GetNumberOfVertices(timestep)-1, timestep);
//merge contours
m_Contour->Concatenate(m_LiveWireContour, timestep);
//clear the livewire contour and reset the corresponding datanode
m_LiveWireContour->Clear(timestep);
//set new start point
m_LiveWireFilter->SetStartPoint(const_cast(positionEvent->GetWorldPosition()));
if( m_CreateAndUseDynamicCosts )
{
//use dynamic cost map for next update
m_LiveWireFilter->CreateDynamicCostMap(m_Contour);
m_LiveWireFilter->SetUseDynamicCostMap(true);
//m_CreateAndUseDynamicCosts = false;
}
//render
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::LiveWireTool2D::OnMouseMoved( Action* action, const StateEvent* stateEvent)
{
//compute LiveWire segment from last control point to current mouse position
// check if event can be handled
if ( Superclass::CanHandleEvent(stateEvent) < 1.0 ) return false;
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
// actual LiveWire computation
int timestep = positionEvent->GetSender()->GetTimeStep();
m_LiveWireFilter->SetEndPoint(const_cast(positionEvent->GetWorldPosition()));
m_LiveWireFilter->SetTimeStep(m_TimeStep);
m_LiveWireFilter->Update();
m_LiveWireContour = this->m_LiveWireFilter->GetOutput();
m_LiveWireContourNode->SetData( this->m_LiveWireContour );
//render
assert( positionEvent->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( positionEvent->GetSender()->GetRenderWindow() );
return true;
}
bool mitk::LiveWireTool2D::OnMouseMoveNoDynamicCosts(Action* action, const StateEvent* stateEvent)
{
//do not use dynamic cost map
m_LiveWireFilter->SetUseDynamicCostMap(false);
OnMouseMoved(action, stateEvent);
m_LiveWireFilter->SetUseDynamicCostMap(true);
return true;
}
bool mitk::LiveWireTool2D::OnCheckPoint( Action* action, const StateEvent* stateEvent)
{
//check double click on first control point to finish the LiveWire tool
//
//Check distance to first point.
//Transition YES if click close to first control point
//
mitk::StateEvent* newStateEvent = NULL;
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent)
{
//stay in current state
newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
}
else
{
int timestep = positionEvent->GetSender()->GetTimeStep();
mitk::Point3D click = positionEvent->GetWorldPosition();
mitk::Point3D first = this->m_Contour->GetVertexAt(0, timestep)->Coordinates;
if (first.EuclideanDistanceTo(click) < 4.5)
{
// allow to finish
newStateEvent = new mitk::StateEvent(EIDYES, stateEvent->GetEvent());
}
else
{
//stay active
newStateEvent = new mitk::StateEvent(EIDNO, stateEvent->GetEvent());
}
}
this->HandleEvent( newStateEvent );
return true;
}
bool mitk::LiveWireTool2D::OnFinish( Action* action, const StateEvent* stateEvent)
{
// finish livewire tool interaction
// check if event can be handled
if ( Superclass::CanHandleEvent(stateEvent) < 1.0 ) return false;
const PositionEvent* positionEvent = dynamic_cast(stateEvent->GetEvent());
if (!positionEvent) return false;
// actual timestep
int timestep = positionEvent->GetSender()->GetTimeStep();
// remove last control point being added by double click
m_Contour->RemoveVertexAt(m_Contour->GetNumberOfVertices(timestep) - 1, timestep);
// save contour and corresponding plane geometry to list
- std::pair contourPair(m_ContourModelNode.GetPointer(), dynamic_cast(positionEvent->GetSender()->GetCurrentWorldGeometry2D()->Clone().GetPointer()) );
- m_Contours.push_back(contourPair);
+ std::pair cp(m_ContourModelNode, dynamic_cast(positionEvent->GetSender()->GetCurrentWorldGeometry2D()->Clone().GetPointer()) );
+ this->m_WorkingContours.push_back(cp);
+
+ std::pair ecp(m_EditingContourNode, dynamic_cast(positionEvent->GetSender()->GetCurrentWorldGeometry2D()->Clone().GetPointer()) );
+ this->m_EditingContours.push_back(ecp);
m_LiveWireFilter->SetUseDynamicCostMap(false);
this->FinishTool();
return true;
}
void mitk::LiveWireTool2D::FinishTool()
{
unsigned int numberOfTimesteps = m_Contour->GetTimeSlicedGeometry()->GetTimeSteps();
//close contour in each timestep
for( int i = 0; i <= numberOfTimesteps; i++)
{
m_Contour->Close(i);
}
m_ToolManager->GetDataStorage()->Remove( m_LiveWireContourNode );
// clear live wire contour node
m_LiveWireContourNode = NULL;
m_LiveWireContour = NULL;
//change color as visual feedback of completed livewire
- m_ContourModelNode->AddProperty( "contour.color", ColorProperty::New(1.0, 1.0, 0.1), NULL, true );
- m_ContourModelNode->SetName("contour node");
+ //m_ContourModelNode->AddProperty( "contour.color", ColorProperty::New(1.0, 1.0, 0.1), NULL, true );
+ //m_ContourModelNode->SetName("contour node");
//set the livewire interactor to edit control points
- m_LiveWireInteractor = mitk::ContourModelLiveWireInteractor::New(m_ContourModelNode);
- m_LiveWireInteractor->SetWorkingImage(this->m_WorkingSlice);
- m_LiveWireInteractor->SetEditingContourModelNode(this->m_EditingContourNode);
- m_ContourModelNode->SetInteractor(m_LiveWireInteractor);
+ m_ContourInteractor = mitk::ContourModelLiveWireInteractor::New(m_ContourModelNode);
+ m_ContourInteractor->SetWorkingImage(this->m_WorkingSlice);
+ m_ContourInteractor->SetEditingContourModelNode(this->m_EditingContourNode);
+ m_ContourModelNode->SetInteractor(m_ContourInteractor);
+
+ this->m_LiveWireInteractors.push_back( m_ContourInteractor );
//add interactor to globalInteraction instance
- mitk::GlobalInteraction::GetInstance()->AddInteractor(m_LiveWireInteractor);
+ mitk::GlobalInteraction::GetInstance()->AddInteractor(m_ContourInteractor);
}
bool mitk::LiveWireTool2D::OnLastSegmentDelete( Action* action, const StateEvent* stateEvent)
{
int timestep = stateEvent->GetEvent()->GetSender()->GetTimeStep();
//if last point of current contour will be removed go to start state and remove nodes
if( m_Contour->GetNumberOfVertices(timestep) <= 1 )
{
m_ToolManager->GetDataStorage()->Remove( m_LiveWireContourNode );
m_ToolManager->GetDataStorage()->Remove( m_ContourModelNode );
+ m_ToolManager->GetDataStorage()->Remove( m_EditingContourNode );
m_LiveWireContour = mitk::ContourModel::New();
m_Contour = mitk::ContourModel::New();
m_ContourModelNode->SetData( m_Contour );
m_LiveWireContourNode->SetData( m_LiveWireContour );
Superclass::Deactivated(); //go to start state
}
else //remove last segment from contour and reset livewire contour
{
m_LiveWireContour = mitk::ContourModel::New();
m_LiveWireContourNode->SetData(m_LiveWireContour);
mitk::ContourModel::Pointer newContour = mitk::ContourModel::New();
newContour->Expand(m_Contour->GetTimeSteps());
mitk::ContourModel::VertexIterator begin = m_Contour->IteratorBegin();
//iterate from last point to next active point
mitk::ContourModel::VertexIterator newLast = m_Contour->IteratorBegin() + (m_Contour->GetNumberOfVertices() - 1);
//go at least one down
if(newLast != begin)
{
newLast--;
}
//search next active control point
while(newLast != begin && !((*newLast)->IsControlPoint) )
{
newLast--;
}
//set position of start point for livewire filter to coordinates of the new last point
m_LiveWireFilter->SetStartPoint((*newLast)->Coordinates);
mitk::ContourModel::VertexIterator it = m_Contour->IteratorBegin();
//fill new Contour
while(it <= newLast)
{
newContour->AddVertex((*it)->Coordinates, (*it)->IsControlPoint, timestep);
it++;
}
newContour->SetIsClosed(m_Contour->IsClosed());
//set new contour visible
m_ContourModelNode->SetData(newContour);
m_Contour = newContour;
assert( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
mitk::RenderingManager::GetInstance()->RequestUpdate( stateEvent->GetEvent()->GetSender()->GetRenderWindow() );
}
return true;
}
template
void mitk::LiveWireTool2D::FindHighestGradientMagnitudeByITK(itk::Image* inputImage, itk::Index<3> &index, itk::Index<3> &returnIndex)
{
typedef itk::Image InputImageType;
typedef typename InputImageType::IndexType IndexType;
unsigned long xMAX = inputImage->GetLargestPossibleRegion().GetSize()[0];
unsigned long yMAX = inputImage->GetLargestPossibleRegion().GetSize()[1];
returnIndex[0] = index[0];
returnIndex[1] = index[1];
returnIndex[2] = 0.0;
double gradientMagnitude = 0.0;
double maxGradientMagnitude = 0.0;
/*
the size and thus the region of 7x7 is only used to calculate the gradient magnitude in that region
not for searching the maximum value
*/
//maximum value in each direction for size
typename InputImageType::SizeType size;
size[0] = 7;
size[1] = 7;
//minimum value in each direction for startRegion
IndexType startRegion;
startRegion[0] = index[0] - 3;
startRegion[1] = index[1] - 3;
if(startRegion[0] < 0) startRegion[0] = 0;
if(startRegion[1] < 0) startRegion[1] = 0;
if(xMAX - index[0] < 7) startRegion[0] = xMAX - 7;
if(yMAX - index[1] < 7) startRegion[1] = yMAX - 7;
index[0] = startRegion[0] + 3;
index[1] = startRegion[1] + 3;
typename InputImageType::RegionType region;
region.SetSize( size );
region.SetIndex( startRegion );
typedef typename itk::GradientMagnitudeImageFilter< InputImageType, InputImageType> GradientMagnitudeFilterType;
typename GradientMagnitudeFilterType::Pointer gradientFilter = GradientMagnitudeFilterType::New();
gradientFilter->SetInput(inputImage);
gradientFilter->GetOutput()->SetRequestedRegion(region);
gradientFilter->Update();
typename InputImageType::Pointer gradientMagnImage;
gradientMagnImage = gradientFilter->GetOutput();
IndexType currentIndex;
currentIndex[0] = 0;
currentIndex[1] = 0;
// search max (approximate) gradient magnitude
for( int x = -1; x <= 1; ++x)
{
currentIndex[0] = index[0] + x;
for( int y = -1; y <= 1; ++y)
{
currentIndex[1] = index[1] + y;
gradientMagnitude = gradientMagnImage->GetPixel(currentIndex);
//check for new max
if(maxGradientMagnitude < gradientMagnitude)
{
maxGradientMagnitude = gradientMagnitude;
returnIndex[0] = currentIndex[0];
returnIndex[1] = currentIndex[1];
returnIndex[2] = 0.0;
}//end if
}//end for y
currentIndex[1] = index[1];
}//end for x
}
diff --git a/Modules/Segmentation/Interactions/mitkLiveWireTool2D.h b/Modules/Segmentation/Interactions/mitkLiveWireTool2D.h
index 3c1d630e17..fbbccd7ade 100644
--- a/Modules/Segmentation/Interactions/mitkLiveWireTool2D.h
+++ b/Modules/Segmentation/Interactions/mitkLiveWireTool2D.h
@@ -1,127 +1,134 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef mitkCorrectorTool2D_h_Included
#define mitkCorrectorTool2D_h_Included
#include "mitkCommon.h"
#include "SegmentationExports.h"
#include "mitkSegTool2D.h"
#include
#include
#include
namespace mitk
{
/**
\brief A 2D segmentation tool based on LiveWire approach.
The contour between the last user added point and the current mouse position
is computed by searching the shortest path according to specific features of
the image. The contour thus snappest to the boundary of objects.
\sa SegTool2D
\sa ImageLiveWireContourModelFilter
\ingroup Interaction
\ingroup ToolManagerEtAl
\warning Only to be instantiated by mitk::ToolManager.
*/
class Segmentation_EXPORT LiveWireTool2D : public SegTool2D
{
public:
mitkClassMacro(LiveWireTool2D, SegTool2D);
itkNewMacro(LiveWireTool2D);
virtual const char** GetXPM() const;
virtual const char* GetName() const;
protected:
LiveWireTool2D();
virtual ~LiveWireTool2D();
/**
* \brief Calculates how good the data, this statemachine handles, is hit by the event.
*
*/
virtual float CanHandleEvent( StateEvent const *stateEvent) const;
virtual void Activated();
virtual void Deactivated();
/// \brief Initialize tool
virtual bool OnInitLiveWire (Action*, const StateEvent*);
/// \brief Add a control point and finish current segment
virtual bool OnAddPoint (Action*, const StateEvent*);
/// \breif Actual LiveWire computation
virtual bool OnMouseMoved(Action*, const StateEvent*);
/// \brief Check double click on first control point to finish the LiveWire tool
virtual bool OnCheckPoint(Action*, const StateEvent*);
/// \brief Finish LiveWire tool
virtual bool OnFinish(Action*, const StateEvent*);
/// \brief Close the contour
virtual bool OnLastSegmentDelete(Action*, const StateEvent*);
/// \brief Don't use dynamic cost map for LiveWire calculation
virtual bool OnMouseMoveNoDynamicCosts(Action*, const StateEvent*);
/// \brief Finish contour interaction.
void FinishTool();
//the contour already set by the user
mitk::ContourModel::Pointer m_Contour;
+
//the corresponding datanode
mitk::DataNode::Pointer m_ContourModelNode;
//the current LiveWire computed contour
mitk::ContourModel::Pointer m_LiveWireContour;
- mitk::ContourModel::Pointer m_EditingContour;
-// mitk::ContourModel::Pointer m_LeftLiveWireContour;
//the corresponding datanode
mitk::DataNode::Pointer m_LiveWireContourNode;
+
+ // the contour for the editing portion
+ mitk::ContourModel::Pointer m_EditingContour;
+
+ //the corresponding datanode
mitk::DataNode::Pointer m_EditingContourNode;
-// mitk::DataNode::Pointer m_RightLiveWireContourNode;
- mitk::ContourModelLiveWireInteractor::Pointer m_LiveWireInteractor;
+ // the corresponding contour interactor
+ mitk::ContourModelLiveWireInteractor::Pointer m_ContourInteractor;
//the current reference image
mitk::Image::Pointer m_WorkingSlice;
+ // the filter for live wire calculation
mitk::ImageLiveWireContourModelFilter::Pointer m_LiveWireFilter;
bool m_CreateAndUseDynamicCosts;
- std::vector< std::pair > m_Contours;
+ std::vector< std::pair > m_WorkingContours;
+ std::vector< std::pair > m_EditingContours;
+ std::vector< mitk::ContourModelLiveWireInteractor::Pointer > m_LiveWireInteractors;
template
void FindHighestGradientMagnitudeByITK(itk::Image* inputImage, itk::Index<3> &index, itk::Index<3> &returnIndex);
};
} // namespace
#endif