Commit 94ad509e authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED bug resulting from merge conflicts + code simplification

parent aa092313
This diff is collapsed.
......@@ -37,6 +37,7 @@
#include <vtkActor.h>
#include <vtkImageActor.h>
#include <vtkUnstructuredGrid.h>
#include <vtkImageReslice.h>
namespace camitk {
/**
......@@ -47,6 +48,8 @@ namespace camitk {
*
* This class manages the visual representation of one slice of a volume image.
* The slice depends on the orientation and the currently selected slice index.
* A special case is the arbitrary orientation, where the orientation is not perpendicular to one
* of the axes, but can have any free orientation and translation.
*
* A slice is represented in 2D and 3D thanks to:
* - image2DActor that provides a 2D representation (the slice in the world reference frame)
......@@ -302,26 +305,18 @@ protected:
/// @name Management of the arbitrary slice
/// @{
/// Transformation relative to the 3D image actor (it is not parallel to one
/// of the main axe, but has a specific rotation). This should be initialized
/// using the single image component transformation to the world or parent.
vtkSmartPointer<vtkTransform> resliceTransform;
/// Transformations required to compute the arbitrary slice inside the volume
/// this can be any transform, unlike the image orientation
vtkSmartPointer<vtkTransform> transformReslicer;
/// Transformation relative to the 3D image actor (it is not parallel to one
/// of the main axe, but has a specific rotation)
vtkSmartPointer<vtkTransform> resliceTransform;
/// The image reslicer computes the arbitrary slice pixels
vtkSmartPointer<vtkImageReslice> image2DReslicer;
/// update the 2D reslicer
void updateLocalTransformation();
/// This is required for the arbitrary slice.
/// It builds a simple image from the original image
/// that has default origin, extent and spacing
vtkSmartPointer<vtkImageChangeInformation> image2DChangeInfo;
/// The image reslicer computes the arbitrary slice pixels
vtkSmartPointer<vtkImageReslice> image2DReslicer;
/// @}
/// @name Used to visualize the current picking
......@@ -376,3 +371,4 @@ protected:
}
#endif // CANONICAL_SLICE_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment