X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvImageContour.cxx;h=27703963c345be05e09715957a59423295319d38;hb=473cb0db7da37740926a0ec36b3f449ef27ef565;hp=ab6d8202647e24485c156f51251e4dbbf4be6fc0;hpb=a515cd4eb114c9310570341ca29f35484356a1e8;p=clitk.git diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx index ab6d820..2770396 100644 --- a/vv/vvImageContour.cxx +++ b/vv/vvImageContour.cxx @@ -135,13 +135,11 @@ void vvImageContour::ShowActors() { //------------------------------------------------------------------------------ void vvImageContour::Update(double value) { - std::cout << "vvImageContour::Update " << value << std::endl; if (!mSlicer) return; if (mPreviousValue == value) { if (mPreviousSlice == mSlicer->GetSlice()) { if (mPreviousTSlice == mSlicer->GetTSlice()) { if (mPreviousOrientation == ComputeCurrentOrientation()) { - std::cout << "Nothing to do" << std::endl; return; // Nothing to do } } @@ -161,7 +159,7 @@ void vvImageContour::Update(double value) { UpdateWithFastCacheMode(); } - // mSlicer->Render(); //DS ---> REMOVE ?? + //mSlicer->Render(); //DS ---> REMOVE ?? mPreviousTSlice = mSlicer->GetTSlice(); mPreviousSlice = mSlicer->GetSlice(); @@ -174,7 +172,7 @@ 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]; @@ -184,11 +182,12 @@ void vvImageContour::UpdateWithPreserveMemoryMode() { int orientation = ComputeCurrentOrientation(); UpdateActor(mSquaresActor, mapper, mSquares, mClipper, mValue, orientation, mSlice); - //mSquaresActorList[mTSlice]->VisibilityOn(); if (mPreviousTslice != mTSlice) { if (mPreviousTslice != -1) mSquaresActorList[mPreviousTslice]->VisibilityOff(); } + + mSlicer->Render(); } //------------------------------------------------------------------------------ @@ -291,7 +290,6 @@ void vvImageContour::UpdateActor(vtkActor * actor, vtkMarchingSquares * squares, vtkImageClip * clipper, double threshold, int orientation, int slice) { - std::cout << "vvImageContour::UpdateActor" << std::endl; // Set parameter for the MarchigSquare squares->SetValue(0, threshold); @@ -329,11 +327,14 @@ void vvImageContour::UpdateActor(vtkActor * actor, } else { extent2 = extent; + actor->VisibilityOn(); } clipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2], extent2[3],extent2[4],extent2[5]); + //std::cout << mTSlice << " " << mSlice << " " << extent2[0] << " " << extent2[1] << " " << extent2[2] << " " << extent2[3] << " " << extent2[4] << " " << extent2[5] << std::endl; + if (mHiddenImageIsUsed) delete extent2; // Move the actor to be visible @@ -379,7 +380,9 @@ void vvImageContour::UpdateActor(vtkActor * actor, // } mapper->Update(); - actor->VisibilityOn(); + + + } //------------------------------------------------------------------------------