Commit 33707e23 authored by Ben Boeckel's avatar Ben Boeckel

Interaction/Widgets: use VTK_SIZEHINT

parent ba0e7c5a
......@@ -194,7 +194,7 @@ public:
int ComputeInteractionState(int X, int Y, int modify=0) override;
void StartWidgetInteraction(double e[2]) override;
void WidgetInteraction(double e[2]) override;
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
//@}
//@{
......
......@@ -58,8 +58,8 @@ public:
*/
virtual void GetPoint1WorldPosition(double pos[3]) = 0;
virtual void GetPoint2WorldPosition(double pos[3]) = 0;
virtual double* GetPoint1WorldPosition() = 0;
virtual double* GetPoint2WorldPosition() = 0;
virtual double* GetPoint1WorldPosition() VTK_SIZEHINT(3) = 0;
virtual double* GetPoint2WorldPosition() VTK_SIZEHINT(3) = 0;
virtual void SetPoint1DisplayPosition(double pos[3]) = 0;
virtual void SetPoint2DisplayPosition(double pos[3]) = 0;
virtual void GetPoint1DisplayPosition(double pos[3]) = 0;
......
......@@ -74,10 +74,10 @@ public:
*/
virtual void SetDisplayPosition(double pos[3]);
virtual void GetDisplayPosition(double pos[3]);
virtual double* GetDisplayPosition();
virtual double* GetDisplayPosition() VTK_SIZEHINT(3);
virtual void SetWorldPosition(double pos[3]);
virtual void GetWorldPosition(double pos[3]);
virtual double* GetWorldPosition();
virtual double* GetWorldPosition() VTK_SIZEHINT(3);
//@}
//@{
......
......@@ -162,7 +162,7 @@ public:
*/
void SetOrigin(double x, double y, double z);
void SetOrigin(double xyz[3]);
double* GetOrigin();
double* GetOrigin() VTK_SIZEHINT(3);
void GetOrigin(double xyz[3]);
//@}
......@@ -172,7 +172,7 @@ public:
*/
void SetPoint1(double x, double y, double z);
void SetPoint1(double xyz[3]);
double* GetPoint1();
double* GetPoint1() VTK_SIZEHINT(3);
void GetPoint1(double xyz[3]);
//@}
......@@ -182,7 +182,7 @@ public:
*/
void SetPoint2(double x, double y, double z);
void SetPoint2(double xyz[3]);
double* GetPoint2();
double* GetPoint2() VTK_SIZEHINT(3);
void GetPoint2(double xyz[3]);
//@}
......@@ -190,7 +190,7 @@ public:
/**
* Get the center of the plane.
*/
double* GetCenter();
double* GetCenter() VTK_SIZEHINT(3);
void GetCenter(double xyz[3]);
//@}
......@@ -198,7 +198,7 @@ public:
/**
* Get the normal to the plane.
*/
double* GetNormal();
double* GetNormal() VTK_SIZEHINT(3);
void GetNormal(double xyz[3]);
//@}
......
......@@ -226,7 +226,7 @@ public:
void SetHandlePosition(int handle, double xyz[3]);
void SetHandlePosition(int handle, double x, double y, double z);
void GetHandlePosition(int handle, double xyz[3]);
double* GetHandlePosition(int handle);
double* GetHandlePosition(int handle) VTK_SIZEHINT(3);
//@}
//@{
......
......@@ -85,7 +85,7 @@ public:
*/
void SetCenter(double x, double y, double z);
void SetCenter(double x[3]);
double* GetCenter();
double* GetCenter() VTK_SIZEHINT(3);
void GetCenter(double xyz[3]);
//@}
......@@ -96,7 +96,7 @@ public:
*/
void SetAxis(double x, double y, double z);
void SetAxis(double a[3]);
double* GetAxis();
double* GetAxis() VTK_SIZEHINT(3);
void GetAxis(double a[3]);
//@}
......
......@@ -83,7 +83,7 @@ public:
*/
void SetOrigin(double x, double y, double z);
void SetOrigin(double x[3]);
double* GetOrigin();
double* GetOrigin() VTK_SIZEHINT(3);
void GetOrigin(double xyz[3]);
//@}
......@@ -94,7 +94,7 @@ public:
void SetNormal(double x, double y, double z);
void SetNormal(double x[3]);
void SetNormalToCamera();
double* GetNormal();
double* GetNormal() VTK_SIZEHINT(3);
void GetNormal(double xyz[3]);
//@}
......@@ -347,7 +347,7 @@ public:
/**
* Methods supporting the rendering process.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetActors(vtkPropCollection *pc) override;
void ReleaseGraphicsResources(vtkWindow*) override;
int RenderOpaqueGeometry(vtkViewport*) override;
......
......@@ -113,7 +113,7 @@ public:
*/
virtual void SetOrigin(double x, double y, double z);
virtual void SetOrigin(double x[3]);
double* GetOrigin();
double* GetOrigin() VTK_SIZEHINT(3);
void GetOrigin(double xyz[3]);
//@}
......@@ -123,7 +123,7 @@ public:
*/
void SetNormal(double x, double y, double z);
void SetNormal(double x[3]);
double* GetNormal();
double* GetNormal() VTK_SIZEHINT(3);
void GetNormal(double xyz[3]);
//@}
......
......@@ -78,15 +78,15 @@ public:
* display and world coordinates.
*/
void GetPoint1WorldPosition(double pos[3]);
double* GetPoint1WorldPosition();
double* GetPoint1WorldPosition() VTK_SIZEHINT(3);
void GetPoint1DisplayPosition(double pos[3]);
double* GetPoint1DisplayPosition();
double* GetPoint1DisplayPosition() VTK_SIZEHINT(3);
void SetPoint1WorldPosition(double pos[3]);
void SetPoint1DisplayPosition(double pos[3]);
void GetPoint2DisplayPosition(double pos[3]);
double* GetPoint2DisplayPosition();
double* GetPoint2DisplayPosition() VTK_SIZEHINT(3);
void GetPoint2WorldPosition(double pos[3]);
double* GetPoint2WorldPosition();
double* GetPoint2WorldPosition() VTK_SIZEHINT(3);
void SetPoint2WorldPosition(double pos[3]);
void SetPoint2DisplayPosition(double pos[3]);
//@}
......@@ -181,7 +181,7 @@ public:
int ComputeInteractionState(int X, int Y, int modify=0) override;
void StartWidgetInteraction(double e[2]) override;
void WidgetInteraction(double e[2]) override;
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
//@}
//@{
......@@ -273,7 +273,7 @@ public:
this->SetDistanceAnnotationScale(scale);
}
virtual void SetDistanceAnnotationScale( double scale[3] );
virtual double * GetDistanceAnnotationScale();
virtual double * GetDistanceAnnotationScale() VTK_SIZEHINT(3);
//@}
/**
......
......@@ -122,7 +122,7 @@ public:
void SetPoint1(double x, double y, double z);
void SetPoint1(double x[3])
{this->SetPoint1(x[0], x[1], x[2]); }
double* GetPoint1()
double* GetPoint1() VTK_SIZEHINT(3)
{return this->LineSource->GetPoint1();}
void GetPoint1(double xyz[3])
{this->LineSource->GetPoint1(xyz);}
......@@ -133,7 +133,7 @@ public:
void SetPoint2(double x, double y, double z);
void SetPoint2(double x[3])
{this->SetPoint2(x[0], x[1], x[2]);}
double* GetPoint2()
double* GetPoint2() VTK_SIZEHINT(3)
{return this->LineSource->GetPoint2();}
void GetPoint2(double xyz[3])
{this->LineSource->GetPoint2(xyz);}
......
......@@ -113,7 +113,7 @@ public:
/**
* The parallelopiped polydata.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
//@{
/**
......
......@@ -135,7 +135,7 @@ public:
*/
void SetOrigin(double x, double y, double z);
void SetOrigin(double x[3]);
double* GetOrigin();
double* GetOrigin() VTK_SIZEHINT(3);
void GetOrigin(double xyz[3]);
//@}
......@@ -145,7 +145,7 @@ public:
*/
void SetPoint1(double x, double y, double z);
void SetPoint1(double x[3]);
double* GetPoint1();
double* GetPoint1() VTK_SIZEHINT(3);
void GetPoint1(double xyz[3]);
//@}
......@@ -155,7 +155,7 @@ public:
*/
void SetPoint2(double x, double y, double z);
void SetPoint2(double x[3]);
double* GetPoint2();
double* GetPoint2() VTK_SIZEHINT(3);
void GetPoint2(double xyz[3]);
//@}
......@@ -165,7 +165,7 @@ public:
*/
void SetCenter(double x, double y, double z);
void SetCenter(double x[3]);
double* GetCenter();
double* GetCenter() VTK_SIZEHINT(3);
void GetCenter(double xyz[3]);
//@}
......@@ -175,7 +175,7 @@ public:
*/
void SetNormal(double x, double y, double z);
void SetNormal(double x[3]);
double* GetNormal();
double* GetNormal() VTK_SIZEHINT(3);
void GetNormal(double xyz[3]);
//@}
......
......@@ -89,7 +89,7 @@ public:
* methods. These are the methods that the widget and its representation
* use to communicate with each other.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void BuildRepresentation() override;
void StartWidgetInteraction(double eventPos[2]) override;
void WidgetInteraction(double eventPos[2]) override;
......
......@@ -180,7 +180,7 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void BuildRepresentation() override;
void StartWidgetInteraction(double eventPos[2]) override;
void WidgetInteraction(double eventPos[2]) override;
......
......@@ -113,7 +113,7 @@ public:
{this->Cursor3D->SetFocalPoint(x,y,z);}
void SetPosition(double x[3])
{this->SetPosition(x[0],x[1],x[2]);}
double* GetPosition()
double* GetPosition() VTK_SIZEHINT(3)
{return this->Cursor3D->GetFocalPoint();}
void GetPosition(double xyz[3])
{this->Cursor3D->GetFocalPoint(xyz);}
......
......@@ -157,7 +157,7 @@ public:
/**
* Methods supporting the rendering process.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void GetActors(vtkPropCollection*) override;
void ReleaseGraphicsResources(vtkWindow*) override;
int RenderOpaqueGeometry(vtkViewport*) override;
......
......@@ -114,7 +114,7 @@ public:
/**
* Methods to make this class properly act like a vtkWidgetRepresentation.
*/
double *GetBounds() override;
double *GetBounds() VTK_SIZEHINT(6) override;
void BuildRepresentation() override;
void StartWidgetInteraction(double eventPos[2]) override;
void WidgetInteraction(double eventPos[2]) override;
......
......@@ -130,7 +130,7 @@ public:
void SetCenter(double c[3]);
void SetCenter(double x, double y, double z)
{double c[3]; c[0]=x; c[1]=y; c[2]=z; this->SetCenter(c);}
double* GetCenter()
double* GetCenter() VTK_SIZEHINT(3)
{return this->SphereSource->GetCenter();}
void GetCenter(double xyz[3])
{this->SphereSource->GetCenter(xyz);}
......
......@@ -156,7 +156,7 @@ public:
{
this->SetCenter(x[0], x[1], x[2]);
}
double* GetCenter()
double* GetCenter() VTK_SIZEHINT(3)
{return this->SphereSource->GetCenter();}
void GetCenter(double xyz[3])
{this->SphereSource->GetCenter(xyz);}
......
......@@ -237,7 +237,7 @@ public:
void SetHandlePosition(int handle, double x, double y, double z);
void SetHandlePosition(int handle, double xyz[3]);
void GetHandlePosition(int handle, double xyz[3]);
double* GetHandlePosition(int handle);
double* GetHandlePosition(int handle) VTK_SIZEHINT(3);
//@}
//@{
......
......@@ -212,7 +212,7 @@ public:
* (i.e., not implementing the Render() methods properly) or leaking graphics resources
* (i.e., not implementing ReleaseGraphicsResources() properly).
*/
double *GetBounds() override {return nullptr;}
double *GetBounds() VTK_SIZEHINT(6) override {return nullptr;}
void ShallowCopy(vtkProp *prop) override;
void GetActors(vtkPropCollection *) override {}
void GetActors2D(vtkPropCollection *) override {}
......
......@@ -5,7 +5,6 @@ vtkAxisActor GetBounds 307 6
vtkBoundingBox GetMinPoint 307 3
vtkBoundingBox GetMaxPoint 307 3
vtkBox GetBounds 307 6
vtkBoxRepresentation GetBounds 307 6
vtkCell GetBounds 307 6
vtkCharArray GetValueRange 303 2
vtkCocoaRenderWindow GetPosition 304 2
......@@ -30,8 +29,6 @@ vtkDICOMImageReader GetImageOrientationPatient 301 6
vtkDICOMImageReader GetImagePositionPatient 301 3
vtkDICOMImageReader GetPixelSpacing 307 3
vtkDirectionEncoder GetDecodedGradient 301 3
vtkDistanceRepresentation GetPoint1WorldPosition 307 3
vtkDistanceRepresentation GetPoint2WorldPosition 307 3
vtkDoubleArray GetValueRange 307 2
vtkEGLRenderWindow GetPosition 304 2
vtkEGLRenderWindow GetScreenSize 304 2
......@@ -47,8 +44,6 @@ vtkGenericOpenGLRenderWindow GetSize 304 2
vtkGeometryFilter GetExtent 307 6
vtkGraph GetEdgePoint 307 3
vtkGridSynchronizedTemplates3D GetExecuteExtent 304 6
vtkHandleRepresentation GetDisplayPosition 307 3
vtkHandleRepresentation GetWorldPosition 307 3
vtkHexahedron GetEdgeArray 304 2
vtkHexahedron GetFaceArray 304 4
vtkHyperOctree GetPoint 307 3
......@@ -72,11 +67,6 @@ vtkImageExport GetDataOrigin 307 3
vtkImageExport GetDataSpacing 307 3
vtkImageMandelbrotSource GetSizeCX 307 4
vtkImagePadFilter GetOutputWholeExtent 304 6
vtkImagePlaneWidget GetCenter 307 3
vtkImagePlaneWidget GetNormal 307 3
vtkImagePlaneWidget GetOrigin 307 3
vtkImagePlaneWidget GetPoint1 307 3
vtkImagePlaneWidget GetPoint2 307 3
vtkImagePointDataIterator GetIndex 304 3
vtkImagePointIterator GetPosition 307 3
vtkImageReslice GetResliceAxesDirectionCosines 307 9
......@@ -87,18 +77,10 @@ vtkImageSpatialAlgorithm GetKernelMiddle 304 3
vtkImageSpatialAlgorithm GetKernelSize 304 3
vtkImageSpatialFilter GetKernelMiddle 304 3
vtkImageSpatialFilter GetKernelSize 304 3
vtkImageTracerWidget GetHandlePosition 307 3
vtkImageVectorConvolve GetKernel 301 3
vtkImageViewer GetPosition 304 2
vtkImageViewer GetSize 304 2
vtkImplicitFunction FunctionGradient 307 3
vtkImplicitCylinderRepresentation GetCenter 307 3
vtkImplicitCylinderRepresentation GetAxis 307 3
vtkImplicitPlaneRepresentation GetBounds 307 6
vtkImplicitPlaneRepresentation GetNormal 307 3
vtkImplicitPlaneRepresentation GetOrigin 307 3
vtkImplicitPlaneWidget GetNormal 307 3
vtkImplicitPlaneWidget GetOrigin 307 3
vtkIntArray GetValueRange 304 2
vtkIOSRenderWindow GetPosition 304 2
vtkIOSRenderWindow GetScreenSize 304 2
......@@ -118,13 +100,6 @@ vtkLinearTransform TransformFloatNormal 301 3
vtkLinearTransform TransformFloatVector 301 3
vtkLinearTransform TransformNormal 307 3
vtkLinearTransform TransformVector 307 3
vtkLineRepresentation GetBounds 307 6
vtkLineRepresentation GetPoint1DisplayPosition 307 3
vtkLineRepresentation GetPoint1WorldPosition 307 3
vtkLineRepresentation GetPoint2DisplayPosition 307 3
vtkLineRepresentation GetPoint2WorldPosition 307 3
vtkLineWidget GetPoint1 307 3
vtkLineWidget GetPoint2 307 3
vtkLongArray GetValueRange 306 2
vtkLongLongArray GetValueRange 30B 2
vtkLookupTable GetColor 307 3
......@@ -154,21 +129,12 @@ vtkOSOpenGLRenderWindow GetPosition 304 2
vtkOSOpenGLRenderWindow GetScreenSize 304 2
vtkOSOpenGLRenderWindow GetSize 304 2
vtkPainterPolyDataMapper GetBounds 307 6
vtkParallelopipedRepresentation GetBounds 307 6
vtkPiecewiseFunction GetRange 307 2
vtkPlaneWidget GetCenter 307 3
vtkPlaneWidget GetNormal 307 3
vtkPlaneWidget GetOrigin 307 3
vtkPlaneWidget GetPoint1 307 3
vtkPlaneWidget GetPoint2 307 3
vtkPointHandleRepresentation2D GetBounds 307 6
vtkPointHandleRepresentation3D GetBounds 307 6
vtkPointSet GetPoint 307 3
vtkPoints GetBounds 307 6
vtkPoints GetPoint 307 3
vtkPoints2D GetBounds 307 4
vtkPoints2D GetPoint 307 2
vtkPointWidget GetPosition 307 3
vtkPolyData GetUpdateExtent 304 6
vtkPolygon ConvertEllipseToImplicit 307 5
vtkPolygon FitEllipse 307 6
......@@ -188,12 +154,7 @@ vtkScalarsToColors GetColor 307 3
vtkScalarsToColors GetRange 307 2
vtkShortArray GetValueRange 305 2
vtkSignedCharArray GetValueRange 30D 2
vtkSliderRepresentation3D GetBounds 307 6
vtkSphereHandleRepresentation GetBounds 307 6
vtkSphereRepresentation GetCenter 307 3
vtkSphereWidget GetCenter 307 3
vtkSphericalDirectionEncoder GetDecodedGradient 301 3
vtkSplineWidget GetHandlePosition 307 3
vtkStreamer GetStartPosition 307 3
vtkStructuredGrid GetDimensions 304 3
vtkStructuredGrid GetExtent 304 6
......@@ -227,7 +188,6 @@ vtkVoxel GetFaceArray 304 4
vtkWarpLens GetCenter 307 2
vtkWedge GetEdgeArray 304 2
vtkWedge GetFaceArray 304 4
vtkWidgetRepresentation GetBounds 307 6
vtkWin32OpenGLRenderWindow GetPosition 304 2
vtkWin32OpenGLRenderWindow GetScreenSize 304 2
vtkWin32OpenGLRenderWindow GetSize 304 2
......
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