X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.cxx;h=5e50b06fd4032655e8eb2841c46e64263eea18fa;hb=e34a7746ec0b9f82124e344edc79e348bb0278d2;hp=fa22d45e98d60c234aa825f10e36979967dfa837;hpb=163fa80ef3873595f3e3cf75fb03e53536d1a6ee;p=clitk.git diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx index fa22d45..5e50b06 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,49 +28,39 @@ #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]); } - mSquaresActorList.clear(); - mSquaresList.clear(); - mClipperList.clear(); + mSquaresActorList.clear(); + mSquaresList.clear(); + mClipperList.clear(); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -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(); - // vtkPolyDataMapper * mSquaresMapper = vtkPolyDataMapper::New(); - vtkActor * mSquaresActor = vtkActor::New(); - - createNewActor(&mSquaresActor, &mSquares, &mClipper); - /* - 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); - */ + 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); @@ -80,8 +70,7 @@ void vvImageContour::setSlicer(vvSlicer * slicer) { //------------------------------------------------------------------------------ -void vvImageContour::setImage(vvImage::Pointer image) { - DD("vvImageContour::setImage"); +void vvImageContour::SetImage(vvImage * image) { for (unsigned int numImage = 0; numImage < image->GetVTKImages().size(); numImage++) { mClipperList[numImage]->SetInput(image->GetVTKImages()[numImage]); } @@ -92,26 +81,27 @@ void vvImageContour::setImage(vvImage::Pointer image) { //------------------------------------------------------------------------------ -void vvImageContour::setPreserveModeEnabled(bool b) { - DD("setPreserveModeEnabled"); - DD(b); - DD(mDisplayModeIsPreserveMemory); +void vvImageContour::SetPreserveMemoryModeEnabled(bool b) { + // FastCache mode work only if threshold is always the same if (mDisplayModeIsPreserveMemory == b) return; mDisplayModeIsPreserveMemory = b; if (!b) { - initializeCacheMode(); + clitkExceptionMacro("TODO : not implemented yet"); + HideActors(); + InitializeCacheMode(); } else { for(unsigned int d=0; dGetProperty()->SetColor(r,g,b); } @@ -120,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()) { + if (mPreviousTSlice == mSlicer->GetTSlice()) { + return; // Nothing to do + } + } + } + // Get current threshold value - mValue= value; + mValue = value; + // Get current slice mSlice = mSlicer->GetSlice(); if (mDisplayModeIsPreserveMemory) { - updateWithPreserveMemoryMode(); + UpdateWithPreserveMemoryMode(); } else { - updateWithFastCacheMode(); + UpdateWithFastCacheMode(); } + + // mSlicer->Render(); //DS ---> REMOVE ?? + + mPreviousTSlice = mSlicer->GetTSlice(); + mPreviousSlice = mSlicer->GetSlice(); + mPreviousValue = value; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::updateWithPreserveMemoryMode() { - +void vvImageContour::UpdateWithPreserveMemoryMode() { // Only change actor visibility if tslice change - if (mTSlice != mSlicer->GetTSlice()) { - if (mTSlice != -1) - mSquaresActorList[mTSlice]->VisibilityOff(); - mTSlice = mSlicer->GetTSlice(); - mSquaresActorList[mTSlice]->VisibilityOn(); - } - + int mPreviousTslice = mTSlice; + mTSlice = mSlicer->GetTSlice(); + vtkMarchingSquares * mSquares = mSquaresList[mTSlice]; vtkImageClip * mClipper = mClipperList[mTSlice]; vtkActor * mSquaresActor = mSquaresActorList[mTSlice]; - int orientation = computeCurrentOrientation(); - // DD(orientation); - - updateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); + int orientation = ComputeCurrentOrientation(); - return; - - // Do it - mSquares->SetValue(0, mValue ); + UpdateActor(mSquaresActor, mSquares, mClipper, mValue, orientation, mSlice); + mSquaresActorList[mTSlice]->VisibilityOn(); - int* extent = mSlicer->GetImageActor()->GetDisplayExtent(); - // DD(extent[0]); - // DD(extent[1]); - // DD(extent[2]); - // DD(extent[3]); - // DD(extent[4]); - // DD(extent[5]); - - // int* extent2 = mClipper->GetInput()->GetDisplayExtent(); - // DD(extent2[0]); - // DD(extent2[1]); - int* extent2 = new int[6]; - if (mHiddenImageIsUsed) { - int * extent3; - extent3 = mHiddenImage->GetFirstVTKImageData()->GetExtent(); - for(int i=0; i<6; i++) extent2[i] = extent3[i]; - // DD(extent2[0]); - // DD(extent2[1]); - // DD(extent2[2]); - // DD(extent2[3]); - // DD(extent2[4]); - // DD(extent2[5]); - for(int i=0; i<6; i+=2) { - if (extent[i] != extent[i+1]) { - // extent[i] = extent2[i]; - // extent[i+1] = extent2[i+1]; - } - else { - // DD(extent[i]); - // DD(mSlicer->GetImage()->GetSpacing()[i/2]); - // DD(mHiddenImage->GetFirstVTKImageData()->GetSpacing()[i/2]); - - double s = (double)extent[i]*(double)mSlicer->GetImage()->GetSpacing()[i/2]; // in mm - // DD(s); - s = s+mSlicer->GetImage()->GetOrigin()[i/2]; // from origin - // DD(s); - s = s-mHiddenImage->GetFirstVTKImageData()->GetOrigin()[i/2]; // from corner second image - s = s/mHiddenImage->GetFirstVTKImageData()->GetSpacing()[i/2]; // in voxel - // DD(s); - - if (s == floor(s)) { - extent2[i] = extent2[i+1] = (int)floor(s); - } - else { - extent2[i] = (int)floor(s); - extent2[i+1] = extent2[i]; - } - // DD(extent2[i]); - } - } - } - else extent2 = extent; - // DD(extent2[0]); - // DD(extent2[1]); - // DD(extent2[2]); - // DD(extent2[3]); - // DD(extent2[4]); - // DD(extent2[5]); - - - mClipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2], - extent2[3],extent2[4],extent2[5]); - int i; - for (i = 0; i < 6;i = i+2) { - if (extent[i] == extent[i+1]) { - break; - } + if (mPreviousTslice != mTSlice) { + if (mPreviousTslice != -1) mSquaresActorList[mPreviousTslice]->VisibilityOff(); } - - switch (i) - { - case 0: - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0] > mSlice) - { - mSquaresActor->SetPosition(1,0,0); - } - else - { - mSquaresActor->SetPosition(-1,0,0); - } - break; - case 2: - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > mSlice) - { - mSquaresActor->SetPosition(0,1,0); - } - else - { - mSquaresActor->SetPosition(0,-1,0); - } - break; - case 4: - if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > mSlice) - { - mSquaresActor->SetPosition(0,0,1); - } - else - { - mSquaresActor->SetPosition(0,0,-1); - } - break; - } - mSquares->Update(); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::initializeCacheMode() { - DD("vvImageContour::initializeCacheMode"); - +void vvImageContour::InitializeCacheMode() { +clitkExceptionMacro("TODO : not implemented yet"); mPreviousSlice = mPreviousOrientation = 0; - int dim; - if (mHiddenImageIsUsed) dim = mHiddenImage->GetNumberOfDimensions(); - else dim = mSlicer->GetImage()->GetNumberOfDimensions(); - DD(dim); + int dim = mSlicer->GetImage()->GetNumberOfDimensions(); mListOfCachedContourActors.resize(dim); for(int d=0; dGetSize()[d]; - else size = mSlicer->GetImage()->GetSize()[d]; - DD(size); + int size = mSlicer->GetImage()->GetSize()[d]; 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; } } orientation = orientation/2; - // DD(orientation); return orientation; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::updateWithFastCacheMode() { - DD("vvImageContour::updateWithFastCacheMode"); +void vvImageContour::UpdateWithFastCacheMode() { +clitkExceptionMacro("TODO : not implemented yet"); // Compute orientation - int orientation = computeCurrentOrientation(); + int orientation = ComputeCurrentOrientation(); - // Turn off previous actor - DD(mPreviousOrientation); - DD(mPreviousSlice); - if (mListOfCachedContourActors[mPreviousOrientation][mPreviousSlice] != NULL) - mListOfCachedContourActors[mPreviousOrientation][mPreviousSlice]->VisibilityOff(); - mPreviousSlice = mSlice; - mPreviousOrientation = orientation; + if ((mPreviousSlice == mSlice) && (mPreviousOrientation == orientation)) return; - // Display actor if it exist vtkActor * actor = mListOfCachedContourActors[orientation][mSlice]; if (actor != NULL) { - DD("Actor exist"); mListOfCachedContourActors[orientation][mSlice]->VisibilityOn(); - } - else { + } else { vtkImageClip * mClipper; vtkMarchingSquares * mSquares; vtkActor * mSquaresActor; - createNewActor(&mSquaresActor, &mSquares, &mClipper); - 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(); } + + if (mListOfCachedContourActors[mPreviousOrientation][mPreviousSlice] != NULL) + mListOfCachedContourActors[mPreviousOrientation][mPreviousSlice]->VisibilityOff(); + mPreviousSlice = mSlice; + mPreviousOrientation = orientation; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -void vvImageContour::createNewActor(vtkActor ** actor, - vtkMarchingSquares ** squares, - vtkImageClip ** clipper) { - // DD("vvImageContour::CreateNewActor"); - vtkActor * mSquaresActor = (*actor = vtkActor::New()); - vtkImageClip * mClipper = (*clipper = vtkImageClip::New()); - vtkMarchingSquares * mSquares = (*squares = vtkMarchingSquares::New()); - vtkPolyDataMapper * mSquaresMapper = vtkPolyDataMapper::New(); - - if (mHiddenImageIsUsed) +void vvImageContour::CreateNewActor(vtkActor ** actor, + vtkMarchingSquares ** squares, + vtkImageClip ** clipper, + int numImage) { + vtkSmartPointer mSquaresActor = (*actor = vtkSmartPointer::New()); + vtkSmartPointer mClipper = (*clipper = vtkSmartPointer::New()); + vtkSmartPointer mSquares = (*squares = vtkSmartPointer::New()); + vtkSmartPointer mSquaresMapper = vtkSmartPointer::New(); + + if (mHiddenImageIsUsed) mClipper->SetInput(mHiddenImage->GetVTKImages()[0]); - else - mClipper->SetInput(mSlicer->GetImage()->GetVTKImages()[0]); + else + mClipper->SetInput(mSlicer->GetImage()->GetVTKImages()[numImage]); mSquares->SetInput(mClipper->GetOutput()); mSquaresMapper->SetInput(mSquares->GetOutput()); mSquaresMapper->ScalarVisibilityOff(); @@ -394,46 +282,97 @@ 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) { - // DD("Update Actor according to extend/threshold"); - - int* extent = mSlicer->GetImageActor()->GetDisplayExtent(); - clipper->SetOutputWholeExtent(extent[0],extent[1],extent[2], - extent[3],extent[4],extent[5]); +void vvImageContour::UpdateActor(vtkActor * actor, + vtkMarchingSquares * squares, + vtkImageClip * clipper, + double threshold, int orientation, int slice) { + // Set parameter for the MarchigSquare squares->SetValue(0, threshold); - switch (orientation) { - case 0: if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[0] > slice) { - actor->SetPosition(1,0,0); + // Get image extent + int* extent = mSlicer->GetImageActor()->GetDisplayExtent(); + + // Change extent if needed + int* extent2; + if (mHiddenImageIsUsed) { + 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)) { + extent2[orientation*2] = extent2[orientation*2+1] = (int)floor(s); + } else { + extent2[orientation*2] = (int)floor(s); + extent2[orientation*2+1] = extent2[orientation*2]; } - else { - actor->SetPosition(-1,0,0); + + // 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 + 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: if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[1] > slice) { + 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: if (mSlicer->GetRenderer()->GetActiveCamera()->GetPosition()[2] > slice) { + 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 { + } else { + DD("-1"); actor->SetPosition(0,0,-1); } + */ break; } + squares->Update(); } //------------------------------------------------------------------------------