Commit d417f392 authored by Mathieu Malaterre's avatar Mathieu Malaterre
Browse files

FIX: HeaderTesting was failing:

- Parser for PrintSelf is very picky
- Added copy/= op
parent 26d84ce9
......@@ -50,7 +50,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLVolumeShearWarpMapper : public vtkVolumeShea
{
public:
// vtkTypeMacro(vtkOpenGLVolumeShearWarpMapper,vtkVolumeShearWarpMapper);
void PrintSelf( ostream& os, vtkIndent index );
void PrintSelf(ostream& os, vtkIndent indent);
static vtkOpenGLVolumeShearWarpMapper *New();
vtkTypeRevisionMacro(vtkOpenGLVolumeShearWarpMapper,vtkVolumeShearWarpMapper);
......
......@@ -12,6 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkShearWarpBase.h"
#define VTK_X_AXIS 0
#define VTK_Y_AXIS 1
#define VTK_Z_AXIS 2
......@@ -600,7 +602,7 @@ protected:
// A runlength encoded volume. It contains voxel data encoded for each major viewing direction.
template <class T>
class vtkShearWarpRLEVolume : public vtkShearWarpBase
class VTK_RENDERING_EXPORT vtkShearWarpRLEVolume : public vtkShearWarpBase
{
public:
vtkShearWarpRLEVolume()
......@@ -1017,9 +1019,12 @@ private:
};
template <class T>
class vtkShearWarpOctree : public vtkShearWarpBase
class VTK_RENDERING_EXPORT vtkShearWarpOctree : public vtkShearWarpBase
{
public:
vtkTypeRevisionMacro(vtkShearWarpOctree,vtkShearWarpBase);
void PrintSelf(ostream& os, vtkIndent indent);
vtkShearWarpOctree()
{
};
......@@ -1066,4 +1071,6 @@ private:
vtkShearWarpSummedAreaTable<T> Table;
int Dimensions[3];
vtkShearWarpOctree(const vtkShearWarpOctree&); // Not implemented.
void operator=(const vtkShearWarpOctree&); // Not implemented.
};
......@@ -61,8 +61,8 @@ class vtkMatrix4x4;
class vtkRenderer;
class vtkRenderWindow;
#include "vtkVolumeShearWarpDataStructure.h"
/*
//#include "vtkVolumeShearWarpDataStructure.h"
class vtkShearWarpPixelData;
class vtkShearWarpRLEImage;
struct vtkShearWarpVoxelData;
......@@ -74,7 +74,7 @@ class vtkShearWarpSummedAreaTable;
struct vtkShearWarpOctreeRun;
class vtkShearWarpOctreeNode;
class vtkShearWarpOctree;
*/
#define VTK_X_AXIS 0
#define VTK_Y_AXIS 1
#define VTK_Z_AXIS 2
......@@ -117,7 +117,7 @@ class VTK_RENDERING_EXPORT vtkVolumeShearWarpMapper : public vtkVolumeMapper
public:
static vtkVolumeShearWarpMapper *New();
vtkTypeRevisionMacro(vtkVolumeShearWarpMapper,vtkVolumeMapper);
void PrintSelf( ostream& os, vtkIndent index );
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Update the volume rendering pipeline by updating the scalar input
......
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