X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.cxx;h=56a91203b1a8609bf4e8465d34cd01e5996bcd1b;hb=7b7aa6a850620a9932b5a65ec035845c5800319e;hp=35215794be42afaf0358bd22288d9a5f4ca4ad94;hpb=f98406ee8b0a0961caa09e36b771d480481e6b20;p=clitk.git diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx index 3521579..56a9120 100644 --- a/vv/vvImageContour.cxx +++ b/vv/vvImageContour.cxx @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + Authors belong to: - University of LYON http://www.universite-lyon.fr/ - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr @@ -28,17 +28,20 @@ #include //------------------------------------------------------------------------------ -vvImageContour::vvImageContour() { +vvImageContour::vvImageContour() +{ mTSlice = -1; mSlice = 0; mHiddenImageIsUsed = false; mDisplayModeIsPreserveMemory = true; + SetPreserveMemoryModeEnabled(true); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -vvImageContour::~vvImageContour() { +vvImageContour::~vvImageContour() +{ for (unsigned int i = 0; i < mSlicer->GetImage()->GetVTKImages().size(); i++) { mSlicer->GetRenderer()->RemoveActor(mSquaresActorList[i]); } @@ -50,14 +53,14 @@ vvImageContour::~vvImageContour() { //------------------------------------------------------------------------------ -void vvImageContour::setSlicer(vvSlicer * slicer) { +void vvImageContour::SetSlicer(vvSlicer * slicer) { mSlicer = slicer; // Create an actor for each time slice for (unsigned int numImage = 0; numImage < mSlicer->GetImage()->GetVTKImages().size(); numImage++) { vtkImageClip * mClipper = vtkImageClip::New(); vtkMarchingSquares * mSquares = vtkMarchingSquares::New(); vtkActor * mSquaresActor = vtkActor::New(); - createNewActor(&mSquaresActor, &mSquares, &mClipper, numImage); + CreateNewActor(&mSquaresActor, &mSquares, &mClipper, numImage); mSquaresActorList.push_back(mSquaresActor); mSquaresList.push_back(mSquares); mClipperList.push_back(mClipper); @@ -67,7 +70,7 @@ void vvImageContour::setSlicer(vvSlicer * slicer) { //------------------------------------------------------------------------------ -void vvImageContour::setImage(vvImage::Pointer image) { +void vvImageContour::SetImage(vvImage::Pointer image) { for (unsigned int numImage = 0; numImage < image->GetVTKImages().size(); numImage++) { mClipperList[numImage]->SetInput(image->GetVTKImages()[numImage]); } @@ -78,26 +81,27 @@ void vvImageContour::setImage(vvImage::Pointer image) { //------------------------------------------------------------------------------ -void vvImageContour::setPreserveMemoryModeEnabled(bool b) { +void vvImageContour::SetPreserveMemoryModeEnabled(bool b) { // FastCache mode work only if threshold is always the same if (mDisplayModeIsPreserveMemory == b) return; mDisplayModeIsPreserveMemory = b; if (!b) { - hideActors(); - initializeCacheMode(); + clitkExceptionMacro("TODO : not implemented yet"); + HideActors(); + InitializeCacheMode(); } else { for(unsigned int d=0; dGetProperty()->SetColor(r,g,b); } @@ -106,7 +110,17 @@ void vvImageContour::setColor(double r, double g, double b) { //------------------------------------------------------------------------------ -void vvImageContour::hideActors() { +void vvImageContour::SetLineWidth(double w) +{ + for(unsigned int i=0; iGetProperty()->SetLineWidth(w); + } +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvImageContour::HideActors() { if (!mSlicer) return; mSlice = mSlicer->GetSlice(); for(unsigned int i=0; iGetSlice(); mTSlice = mSlicer->GetTSlice(); - // for(unsigned int i=0; iVisibilityOn(); - update(mValue); - //} + Update(mValue); } //------------------------------------------------------------------------------ - + //------------------------------------------------------------------------------ -void vvImageContour::update(double value) { +void vvImageContour::Update(double value) { if (!mSlicer) return; if (mPreviousValue == value) { if (mPreviousSlice == mSlicer->GetSlice()) { @@ -147,12 +159,14 @@ void vvImageContour::update(double value) { mSlice = mSlicer->GetSlice(); if (mDisplayModeIsPreserveMemory) { - updateWithPreserveMemoryMode(); + UpdateWithPreserveMemoryMode(); } else { - updateWithFastCacheMode(); + UpdateWithFastCacheMode(); } - mSlicer->Render(); + + // mSlicer->Render(); //DS ---> REMOVE ?? + mPreviousTSlice = mSlicer->GetTSlice(); mPreviousSlice = mSlicer->GetSlice(); mPreviousValue = value; @@ -161,25 +175,19 @@ void vvImageContour::update(double value) { //------------------------------------------------------------------------------ -void vvImageContour::updateWithPreserveMemoryMode() { +void vvImageContour::UpdateWithPreserveMemoryMode() { // Only change actor visibility if tslice change - //DD(mTSlice); - //DD(mSlice); int mPreviousTslice = mTSlice; - // ; - // if (mTSlice != mSlicer->GetTSlice()) { - // if (mTSlice != -1) mTsliceToSetOff = mTSlice; - // mSquaresActorList[mTSlice]->VisibilityOff(); mTSlice = mSlicer->GetTSlice(); - // } - // else return; - // DD(mTSlice); + vtkMarchingSquares * mSquares = mSquaresList[mTSlice]; vtkImageClip * mClipper = mClipperList[mTSlice]; vtkActor * mSquaresActor = mSquaresActorList[mTSlice]; - int orientation = computeCurrentOrientation(); - updateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); + int orientation = ComputeCurrentOrientation(); + + UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); mSquaresActorList[mTSlice]->VisibilityOn(); + if (mPreviousTslice != mTSlice) { if (mPreviousTslice != -1) mSquaresActorList[mPreviousTslice]->VisibilityOff(); } @@ -188,14 +196,13 @@ void vvImageContour::updateWithPreserveMemoryMode() { //------------------------------------------------------------------------------ -void vvImageContour::initializeCacheMode() { +void vvImageContour::InitializeCacheMode() { mPreviousSlice = mPreviousOrientation = 0; int dim = mSlicer->GetImage()->GetNumberOfDimensions(); mListOfCachedContourActors.resize(dim); for(int d=0; dGetImage()->GetSize()[d]; - //DD(size); mListOfCachedContourActors[d].resize(size); for(int j=0; jGetImageActor()->GetDisplayExtent(); - + // Compute orientation int orientation; - for (orientation = 0; orientation < 6;orientation = orientation+2) { + for (orientation = 0; orientation < 6; orientation = orientation+2) { if (extent[orientation] == extent[orientation+1]) { break; } @@ -224,22 +231,21 @@ int vvImageContour::computeCurrentOrientation() { //------------------------------------------------------------------------------ -void vvImageContour::updateWithFastCacheMode() { +void vvImageContour::UpdateWithFastCacheMode() { // Compute orientation - int orientation = computeCurrentOrientation(); + int orientation = ComputeCurrentOrientation(); if ((mPreviousSlice == mSlice) && (mPreviousOrientation == orientation)) return; vtkActor * actor = mListOfCachedContourActors[orientation][mSlice]; if (actor != NULL) { mListOfCachedContourActors[orientation][mSlice]->VisibilityOn(); - } - else { + } else { vtkImageClip * mClipper; vtkMarchingSquares * mSquares; vtkActor * mSquaresActor; - createNewActor(&mSquaresActor, &mSquares, &mClipper, 0); - updateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); + CreateNewActor(&mSquaresActor, &mSquares, &mClipper, 0); + UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); mListOfCachedContourActors[orientation][mSlice] = mSquaresActor; mSquaresActor->VisibilityOn(); } @@ -253,18 +259,18 @@ void vvImageContour::updateWithFastCacheMode() { //------------------------------------------------------------------------------ -void vvImageContour::createNewActor(vtkActor ** actor, - vtkMarchingSquares ** squares, - vtkImageClip ** clipper, +void vvImageContour::CreateNewActor(vtkActor ** actor, + vtkMarchingSquares ** squares, + vtkImageClip ** clipper, int numImage) { vtkActor * mSquaresActor = (*actor = vtkActor::New()); vtkImageClip * mClipper = (*clipper = vtkImageClip::New()); vtkMarchingSquares * mSquares = (*squares = vtkMarchingSquares::New()); vtkPolyDataMapper * mSquaresMapper = vtkPolyDataMapper::New(); - - if (mHiddenImageIsUsed) + + if (mHiddenImageIsUsed) mClipper->SetInput(mHiddenImage->GetVTKImages()[0]); - else + else mClipper->SetInput(mSlicer->GetImage()->GetVTKImages()[numImage]); mSquares->SetInput(mClipper->GetOutput()); mSquaresMapper->SetInput(mSquares->GetOutput()); @@ -273,18 +279,17 @@ void vvImageContour::createNewActor(vtkActor ** actor, mSquaresActor->GetProperty()->SetColor(1.0,0,0); mSquaresActor->SetPickable(0); mSquaresActor->VisibilityOff(); - mSlicer->GetRenderer()->AddActor(mSquaresActor); + mSlicer->GetRenderer()->AddActor(mSquaresActor); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::updateActor(vtkActor * actor, - vtkMarchingSquares * squares, - vtkImageClip * clipper, - int threshold, int orientation, int slice) { - - // Set parameter for the MarchigSquare +void vvImageContour::UpdateActor(vtkActor * actor, + vtkMarchingSquares * squares, + vtkImageClip * clipper, + double threshold, int orientation, int slice) { + // Set parameter for the MarchigSquare squares->SetValue(0, threshold); // Get image extent @@ -296,65 +301,72 @@ void vvImageContour::updateActor(vtkActor * actor, extent2 = new int[6]; int * extent3; extent3 = mHiddenImage->GetFirstVTKImageData()->GetExtent(); + for(int i=0; i<6; i++) extent2[i] = extent3[i]; - + double s = (double)extent[orientation*2]*(double)mSlicer->GetImage()->GetSpacing()[orientation]; // in mm s = s+mSlicer->GetImage()->GetOrigin()[orientation]; // from origin s = s-mHiddenImage->GetFirstVTKImageData()->GetOrigin()[orientation]; // from corner second image s = s/mHiddenImage->GetFirstVTKImageData()->GetSpacing()[orientation]; // in voxel - - if (s == floor(s)) { + + if (s == floor(s)) { extent2[orientation*2] = extent2[orientation*2+1] = (int)floor(s); - } - else { + } else { extent2[orientation*2] = (int)floor(s); extent2[orientation*2+1] = extent2[orientation*2]; } - } - else { + + // Do not display a contour if there is no contour on this slice + if (extent2[orientation*2+1] > extent3[orientation*2+1]) { + actor->VisibilityOff(); + return; + } + else actor->VisibilityOn(); + + } else { extent2 = extent; } + clipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2], extent2[3],extent2[4],extent2[5]); if (mHiddenImage) delete extent2; // Move the actor to be visible - DD(orientation); - DD(slice); - - //TO SIMPLiFY :!!!!!!!!! == ??????? - // actor->SetPosition(-1,-1,-1); - switch (orientation) { - case 0: - DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0]); + case 0: + actor->SetPosition(-1,0,0); + /* + // DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0]); if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0] > slice) { - actor->SetPosition(1,0,0); - } - else { + actor->SetPosition(1,0,0); + } else { actor->SetPosition(-1,0,0); - } + }*/ break; - case 1: - DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1]); + case 1: + actor->SetPosition(0,-1,0); + /* + // DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1]); if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > slice) { actor->SetPosition(0,1,0); - } - else { + } else { actor->SetPosition(0,-1,0); } + */ break; - case 2: + case 2: + actor->SetPosition(0,0,-1); + /* DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2]); if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > slice) { DD("1"); actor->SetPosition(0,0,1); - } - else { - DD("-1"); + } else { + DD("-1"); actor->SetPosition(0,0,-1); } + */ break; }