X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.cxx;h=27703963c345be05e09715957a59423295319d38;hb=5a79dfb9e4860dc684c7bde0765c5de2b792891b;hp=0e4e428110c4a2958e2441fee248149406ca5fb7;hpb=0d2c2b622e94b353cef04e5bd39d9f8de7b0d6a7;p=clitk.git diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx index 0e4e428..2770396 100644 --- a/vv/vvImageContour.cxx +++ b/vv/vvImageContour.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ #include "vvImageContour.h" #include "vvImage.h" @@ -34,6 +34,8 @@ vvImageContour::vvImageContour() mSlice = 0; mHiddenImageIsUsed = false; mDisplayModeIsPreserveMemory = true; + SetPreserveMemoryModeEnabled(true); + mPreviousOrientation = -1; } //------------------------------------------------------------------------------ @@ -44,9 +46,6 @@ vvImageContour::~vvImageContour() for (unsigned int i = 0; i < mSlicer->GetImage()->GetVTKImages().size(); i++) { mSlicer->GetRenderer()->RemoveActor(mSquaresActorList[i]); } - mSquaresActorList.clear(); - mSquaresList.clear(); - mClipperList.clear(); } //------------------------------------------------------------------------------ @@ -56,20 +55,14 @@ 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); - mSquaresActorList.push_back(mSquaresActor); - mSquaresList.push_back(mSquares); - mClipperList.push_back(mClipper); + CreateNewActor(numImage); } } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::SetImage(vvImage::Pointer image) { +void vvImageContour::SetImage(vvImage * image) { for (unsigned int numImage = 0; numImage < image->GetVTKImages().size(); numImage++) { mClipperList[numImage]->SetInput(image->GetVTKImages()[numImage]); } @@ -85,6 +78,7 @@ void vvImageContour::SetPreserveMemoryModeEnabled(bool b) { if (mDisplayModeIsPreserveMemory == b) return; mDisplayModeIsPreserveMemory = b; if (!b) { + clitkExceptionMacro("TODO : not implemented yet"); HideActors(); InitializeCacheMode(); } @@ -133,23 +127,21 @@ void vvImageContour::ShowActors() { if (!mSlicer) return; mSlice = mSlicer->GetSlice(); mTSlice = mSlicer->GetTSlice(); - // for(unsigned int i=0; iVisibilityOn(); Update(mValue); - //} } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvImageContour::Update(double value) { - // DD(value); if (!mSlicer) return; if (mPreviousValue == value) { if (mPreviousSlice == mSlicer->GetSlice()) { if (mPreviousTSlice == mSlicer->GetTSlice()) { - // DD("vvImageContour::update nothing"); - return; // Nothing to do + if (mPreviousOrientation == ComputeCurrentOrientation()) { + return; // Nothing to do + } } } } @@ -159,7 +151,7 @@ void vvImageContour::Update(double value) { // Get current slice mSlice = mSlicer->GetSlice(); - // DD(mDisplayModeIsPreserveMemory); + if (mDisplayModeIsPreserveMemory) { UpdateWithPreserveMemoryMode(); } @@ -167,13 +159,12 @@ void vvImageContour::Update(double value) { UpdateWithFastCacheMode(); } - - mSlicer->Render(); //DS ---> REMOVE ?? - + //mSlicer->Render(); //DS ---> REMOVE ?? mPreviousTSlice = mSlicer->GetTSlice(); mPreviousSlice = mSlicer->GetSlice(); mPreviousValue = value; + mPreviousOrientation = ComputeCurrentOrientation(); } //------------------------------------------------------------------------------ @@ -181,43 +172,35 @@ void vvImageContour::Update(double value) { //------------------------------------------------------------------------------ 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(); + mPreviousTslice = mTSlice; mTSlice = mSlicer->GetTSlice(); - // } - // else return; - // DD(mTSlice); + vtkMarchingSquares * mSquares = mSquaresList[mTSlice]; + vtkPolyDataMapper* mapper = mSquaresMapperList[mTSlice]; vtkImageClip * mClipper = mClipperList[mTSlice]; vtkActor * mSquaresActor = mSquaresActorList[mTSlice]; int orientation = ComputeCurrentOrientation(); - // DD(orientation); - //DD(mValue); - //DD(mSlice); - //DD(mPreviousTslice); - UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); - mSquaresActorList[mTSlice]->VisibilityOn(); + + UpdateActor(mSquaresActor, mapper, mSquares, mClipper, mValue, orientation, mSlice); + if (mPreviousTslice != mTSlice) { if (mPreviousTslice != -1) mSquaresActorList[mPreviousTslice]->VisibilityOff(); } + + mSlicer->Render(); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvImageContour::InitializeCacheMode() { +clitkExceptionMacro("TODO : not implemented yet"); 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; jVisibilityOn(); } else { - vtkImageClip * mClipper; - vtkMarchingSquares * mSquares; - vtkActor * mSquaresActor; - CreateNewActor(&mSquaresActor, &mSquares, &mClipper, 0); - UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); - mListOfCachedContourActors[orientation][mSlice] = mSquaresActor; - mSquaresActor->VisibilityOn(); + CreateNewActor(0); + //SR: commented out, this code is never reached anyway + //UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); + //mListOfCachedContourActors[orientation][mSlice] = mSquaresActor; + //mSquaresActor->VisibilityOn(); } if (mListOfCachedContourActors[mPreviousOrientation][mPreviousSlice] != NULL) @@ -274,37 +257,41 @@ void vvImageContour::UpdateWithFastCacheMode() { //------------------------------------------------------------------------------ -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(); +void vvImageContour::CreateNewActor(int numImage) { + vtkSmartPointer squaresActor = vtkSmartPointer::New(); + vtkSmartPointer clipper = vtkSmartPointer::New(); + vtkSmartPointer squares = vtkSmartPointer::New(); + vtkSmartPointer squaresMapper = vtkSmartPointer::New(); if (mHiddenImageIsUsed) - mClipper->SetInput(mHiddenImage->GetVTKImages()[0]); + clipper->SetInput(mHiddenImage->GetVTKImages()[0]); else - mClipper->SetInput(mSlicer->GetImage()->GetVTKImages()[numImage]); - mSquares->SetInput(mClipper->GetOutput()); - mSquaresMapper->SetInput(mSquares->GetOutput()); - mSquaresMapper->ScalarVisibilityOff(); - mSquaresActor->SetMapper(mSquaresMapper); - mSquaresActor->GetProperty()->SetColor(1.0,0,0); - mSquaresActor->SetPickable(0); - mSquaresActor->VisibilityOff(); - mSlicer->GetRenderer()->AddActor(mSquaresActor); + clipper->SetInput(mSlicer->GetImage()->GetVTKImages()[numImage]); + squares->SetInput(clipper->GetOutput()); + squaresMapper->SetInput(squares->GetOutput()); + squaresMapper->ScalarVisibilityOff(); + squaresActor->SetMapper(squaresMapper); + squaresActor->GetProperty()->SetColor(1.0,0,0); + squaresActor->SetPickable(0); + squaresActor->VisibilityOff(); + mSlicer->GetRenderer()->AddActor(squaresActor); + + mSquaresActorList.push_back(squaresActor); + mClipperList.push_back(clipper); + mSquaresList.push_back(squares); + mSquaresMapperList.push_back(squaresMapper); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvImageContour::UpdateActor(vtkActor * actor, + vtkPolyDataMapper * mapper, vtkMarchingSquares * squares, vtkImageClip * clipper, double threshold, int orientation, int slice) { - // Set parameter for the MarchigSquare + + // Set parameter for the MarchigSquare squares->SetValue(0, threshold); // Get image extent @@ -316,6 +303,7 @@ 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 @@ -329,51 +317,72 @@ void vvImageContour::UpdateActor(vtkActor * actor, extent2[orientation*2] = (int)floor(s); extent2[orientation*2+1] = extent2[orientation*2]; } + + // 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; + actor->VisibilityOn(); } + clipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2], extent2[3],extent2[4],extent2[5]); - if (mHiddenImage) delete extent2; + //std::cout << mTSlice << " " << mSlice << " " << extent2[0] << " " << extent2[1] << " " << extent2[2] << " " << extent2[3] << " " << extent2[4] << " " << extent2[5] << std::endl; - // Move the actor to be visible - // DD(orientation); - // DD(slice); - - //TO SIMPLiFY :!!!!!!!!! == ??????? - // actor->SetPosition(-1,-1,-1); + if (mHiddenImageIsUsed) delete extent2; - switch (orientation) { - case 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); - } - break; - case 1: - // DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1]); - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > slice) { - actor->SetPosition(0,1,0); - } else { - actor->SetPosition(0,-1,0); - } - break; - case 2: - // DD(mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2]); - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > slice) { - // DD("1"); - actor->SetPosition(0,0,1); - } else { - // DD("-1"); - actor->SetPosition(0,0,-1); - } - break; - } - - squares->Update(); + // Move the actor to be visible + double position[3] = {0, 0, 0}; + position[orientation] = -1; + actor->SetPosition(position); + +// switch (orientation) { +// 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); +// }*/ +// break; +// 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 { +// actor->SetPosition(0,-1,0); +// } +// */ +// break; +// 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"); +// actor->SetPosition(0,0,-1); +// } +// */ +// break; +// } + + mapper->Update(); + + + } //------------------------------------------------------------------------------