X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.cxx;h=94129031759648c7808a40f6216b12b95ef74d1d;hb=2fc09af39b364b82ddf930be3fee40ca192218ff;hp=56a91203b1a8609bf4e8465d34cd01e5996bcd1b;hpb=8d8c142b9adc1529993aaa856dc5ac725bf37679;p=clitk.git diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx index 56a9120..9412903 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" @@ -35,6 +35,7 @@ vvImageContour::vvImageContour() mHiddenImageIsUsed = false; mDisplayModeIsPreserveMemory = true; SetPreserveMemoryModeEnabled(true); + mPreviousOrientation = -1; } //------------------------------------------------------------------------------ @@ -45,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(); } //------------------------------------------------------------------------------ @@ -57,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]); } @@ -147,7 +139,9 @@ void vvImageContour::Update(double value) { if (mPreviousValue == value) { if (mPreviousSlice == mSlicer->GetSlice()) { if (mPreviousTSlice == mSlicer->GetTSlice()) { - return; // Nothing to do + if (mPreviousOrientation == ComputeCurrentOrientation()) { + return; // Nothing to do + } } } } @@ -165,11 +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(); } //------------------------------------------------------------------------------ @@ -177,26 +172,29 @@ void vvImageContour::Update(double value) { //------------------------------------------------------------------------------ void vvImageContour::UpdateWithPreserveMemoryMode() { // Only change actor visibility if tslice change - int mPreviousTslice = mTSlice; + mPreviousTslice = mTSlice; mTSlice = mSlicer->GetTSlice(); vtkMarchingSquares * mSquares = mSquaresList[mTSlice]; + vtkPolyDataMapper* mapper = mSquaresMapperList[mTSlice]; vtkImageClip * mClipper = mClipperList[mTSlice]; vtkActor * mSquaresActor = mSquaresActorList[mTSlice]; int orientation = ComputeCurrentOrientation(); - 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(); @@ -232,6 +230,8 @@ int vvImageContour::ComputeCurrentOrientation() { //------------------------------------------------------------------------------ void vvImageContour::UpdateWithFastCacheMode() { +clitkExceptionMacro("TODO : not implemented yet"); + // Compute orientation int orientation = ComputeCurrentOrientation(); @@ -241,13 +241,11 @@ void vvImageContour::UpdateWithFastCacheMode() { if (actor != NULL) { mListOfCachedContourActors[orientation][mSlice]->VisibilityOn(); } 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) @@ -259,36 +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 squares->SetValue(0, threshold); @@ -325,52 +328,20 @@ void vvImageContour::UpdateActor(vtkActor * actor, } else { extent2 = extent; + actor->VisibilityOn(); } clipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2], extent2[3],extent2[4],extent2[5]); - if (mHiddenImage) delete extent2; + if (mHiddenImageIsUsed) delete extent2; // Move the actor to be visible - 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; - } - - squares->Update(); + double position[3] = {0, 0, 0}; + position[orientation] = -1; + actor->SetPosition(position); + + mapper->Update(); } //------------------------------------------------------------------------------