mDisplayModeIsPreserveMemory = true;
SetPreserveMemoryModeEnabled(true);
mPreviousOrientation = -1;
+ mDepth = 1.0;
+ mSlice = 0;
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
vvImageContour::~vvImageContour()
{
- for (unsigned int i = 0; i < mSlicer->GetImage()->GetVTKImages().size(); i++) {
- mSlicer->GetRenderer()->RemoveActor(mSquaresActorList[i]);
+ mSquaresActorList.clear();
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvImageContour::RemoveActors()
+{
+ for (unsigned int i = 0; i < mSquaresActorList.size(); i++) {
+ if (mSlicer != 0) {
+ if (mSlicer!= NULL) {
+ if (mSlicer->GetRenderer() != NULL) {
+ if (mSquaresActorList[i] != NULL) {
+ mSlicer->GetRenderer()->RemoveActor(mSquaresActorList[i]);
+ }
+ }
+ }
+ }
}
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-void vvImageContour::SetImage(vvImage * image) {
+void vvImageContour::SetImage(vvImage::Pointer image) {
for (unsigned int numImage = 0; numImage < image->GetVTKImages().size(); numImage++) {
mClipperList[numImage]->SetInput(image->GetVTKImages()[numImage]);
}
//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+void vvImageContour::SetDepth(double d)
+{
+ mDepth = d;
+ // Move the actor to be visible
+ double position[3] = {0, 0, 0};
+ int orientation = ComputeCurrentOrientation();
+ position[orientation] = -mDepth;
+
+ for(unsigned int i=0; i<mSquaresActorList.size(); i++)
+ mSquaresActorList[i]->SetPosition(position);
+}
+//------------------------------------------------------------------------------
+
//------------------------------------------------------------------------------
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
}
}
UpdateWithFastCacheMode();
}
- // mSlicer->Render(); //DS ---> REMOVE ??
+ //mSlicer->Render(); //DS ---> REMOVE ??
mPreviousTSlice = mSlicer->GetTSlice();
mPreviousSlice = mSlicer->GetSlice();
//------------------------------------------------------------------------------
void vvImageContour::UpdateWithPreserveMemoryMode() {
// Only change actor visibility if tslice change
- int mPreviousTslice = mTSlice;
+ mPreviousTslice = mTSlice;
mTSlice = mSlicer->GetTSlice();
vtkMarchingSquares * mSquares = mSquaresList[mTSlice];
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();
}
//------------------------------------------------------------------------------
clipper->SetInput(mHiddenImage->GetVTKImages()[0]);
else
clipper->SetInput(mSlicer->GetImage()->GetVTKImages()[numImage]);
+
squares->SetInput(clipper->GetOutput());
squaresMapper->SetInput(squares->GetOutput());
squaresMapper->ScalarVisibilityOff();
vtkMarchingSquares * squares,
vtkImageClip * clipper,
double threshold, int orientation, int slice) {
- std::cout << "vvImageContour::UpdateActor" << std::endl;
-
- // Set parameter for the MarchigSquare
+ // Set parameter for the MarchigSquare
squares->SetValue(0, threshold);
// Get image extent
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];
- }
+ // Rint to the closest slice
+ extent2[orientation*2+1] = extent2[orientation*2] = (int)lrint(s);
// Do not display a contour if there is no contour on this slice
- if (extent2[orientation*2+1] > extent3[orientation*2+1]) {
+ // DD(extent2[orientation*2+1]);
+ // DD(extent3[orientation*2+1]);
+ // DD(extent2[orientation*2]);
+ // DD(extent3[orientation*2]);
+ if ((extent2[orientation*2+1] > extent3[orientation*2+1]) ||
+ (extent2[orientation*2] < extent3[orientation*2])) {
actor->VisibilityOff();
return;
}
} else {
extent2 = extent;
+ actor->VisibilityOn();
}
clipper->SetOutputWholeExtent(extent2[0],extent2[1],extent2[2],
if (mHiddenImageIsUsed) delete extent2;
// Move the actor to be visible
- double position[3] = {0, 0, 0};
- position[orientation] = -1;
- actor->SetPosition(position);
+ SetDepth(mDepth);
+ // double position[3] = {0, 0, 0};
+ // DD(mDepth);
+ // position[orientation] = -mDepth;
+ // 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();
- actor->VisibilityOn();
}
//------------------------------------------------------------------------------