From: Romulo Pinho Date: Mon, 2 Jul 2012 08:42:22 +0000 (+0200) Subject: corrected fusion/overlay refresh X-Git-Tag: v1.3.0~26 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a2a69c4f3626d907a101e1f984959106897f0d8b;p=clitk.git corrected fusion/overlay refresh - occurred with 4D and 3D+t images --- diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx index 2224a9a..ceceb6e 100644 --- a/vv/vvSlicer.cxx +++ b/vv/vvSlicer.cxx @@ -671,8 +671,6 @@ void vvSlicer::SetTSlice(int t) else if ((unsigned int)t >= mImage->GetVTKImages().size()) t = mImage->GetVTKImages().size() -1; - if (mCurrentTSlice == t) return; - mCurrentTSlice = t; mImageReslice->SetInput( mImage->GetVTKImages()[mCurrentTSlice] ); if (mVF && mVFActor->GetVisibility()) { @@ -1177,6 +1175,7 @@ void vvSlicer::GetExtremasAroundMousePointer(double & min, double & max, vtkImag corner1[i] = mCurrent[i]; corner2[i] = mCurrent[i]; } + this->Renderer->WorldToView(corner1[0], corner1[1], corner1[2]); this->Renderer->WorldToView(corner2[0], corner2[1], corner2[2]); diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx index 3f6f913..c86928f 100644 --- a/vv/vvSlicerManager.cxx +++ b/vv/vvSlicerManager.cxx @@ -846,7 +846,8 @@ void vvSlicerManager::Reload() //---------------------------------------------------------------------------- void vvSlicerManager::ReloadFusion() { - mFusionReader->Update(); + mFusionReader->Update(mImage->GetNumberOfDimensions(),mFusionComponent.c_str(),mType); + for ( unsigned int i = 0; i < mSlicers.size(); i++) { mSlicers[i]->SetFusion(mFusionReader->GetOutput()); mSlicers[i]->Render(); @@ -858,7 +859,7 @@ void vvSlicerManager::ReloadFusion() //---------------------------------------------------------------------------- void vvSlicerManager::ReloadOverlay() { - mOverlayReader->Update(); + mOverlayReader->Update(mImage->GetNumberOfDimensions(),mOverlayComponent.c_str(),mType); for ( unsigned int i = 0; i < mSlicers.size(); i++) { mSlicers[i]->SetOverlay(mOverlayReader->GetOutput()); mSlicers[i]->Render();