X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicer.h;h=43e08541386109a9f0e0b0b520dae4b51f337ced;hb=e502d745ac4c73037ef615931db2dcbf36a94341;hp=570c43ddcbd83b027fab6b7ac7f2a87f7e0c453a;hpb=cb4bdfed13b79735336f2e087a0b9372610aac06;p=clitk.git diff --git a/vv/vvSlicer.h b/vv/vvSlicer.h index 570c43d..43e0854 100644 --- a/vv/vvSlicer.h +++ b/vv/vvSlicer.h @@ -62,7 +62,7 @@ class vvSlicer: public vtkImageViewer2 { public: static vvSlicer *New(); - vtkTypeRevisionMacro(vvSlicer,vtkImageViewer2); + vtkTypeMacro(vvSlicer,vtkImageViewer2); void PrintSelf(ostream& os, vtkIndent indent); void SetImage(vvImage::Pointer inputImages); @@ -148,7 +148,6 @@ public: double* GetCursorPosition() { return mCursor; } - vtkTransform * GetSlicingTransform() { return mSlicingTransform; } vtkTransform * GetConcatenatedTransform() { return mConcatenatedTransform; } vtkTransform * GetConcatenatedFusionTransform() { return mConcatenatedFusionTransform; } @@ -205,9 +204,12 @@ public: return mVFColor; } void SetVFColor(double r, double g, double b); - + //necessary to flag the secondary sequence void SetFusionSequenceCode(int code) {mFusionSequenceCode=code;} + void SetRegisterExtent(int [6]); + void GetRegisterExtent(int [6]); + protected: vvSlicer(); ~vvSlicer(); @@ -277,14 +279,14 @@ protected: double mVFColor[3]; bool mUseReducedExtent; int * mReducedExtent; - int * mInitialExtent; + int * mRegisterExtent; bool mLinkOverlayWindowLevel; bool showFusionLegend; private: void UpdateOrientation(); void UpdateDisplayExtent(); - void ConvertImageToImageDisplayExtent(vtkImageData *sourceImage, const int sourceExtent[6], + void ConvertImageToImageDisplayExtent(vtkInformation *sourceImage, const int sourceExtent[6], vtkImageData *targetImage, int targetExtent[6]); ///Sets the surfaces to be cut on the image slice: update the vtkCutter void SetContourSlice(); @@ -297,5 +299,6 @@ private: bool mOverlayVisibility; bool mFusionVisibility; bool mVFVisibility; + bool mFirstSetSliceOrientation; }; #endif