Commit bd018e59 authored by Yohann Bearzi's avatar Yohann Bearzi

Fixed warning from VTK bump

Function shadowing on widgets.
Moved `Scale` and `Translate` methods from `protected` to `public` in
`vtkPointHandleRepresentationSphere`.
parent 1dfa708c
......@@ -263,7 +263,7 @@ void vtkPointHandleRepresentationSphere::WidgetInteraction(double eventPos[2])
//----------------------------------------------------------------------
// Translate everything
void vtkPointHandleRepresentationSphere::Translate(double eventPos[2])
void vtkPointHandleRepresentationSphere::Translate(const double* eventPos)
{
double pos[3], dpos[2];
this->FocalPoint->GetPoint(0, pos);
......@@ -283,7 +283,7 @@ void vtkPointHandleRepresentationSphere::Translate(double eventPos[2])
}
//----------------------------------------------------------------------
void vtkPointHandleRepresentationSphere::Scale(double eventPos[2])
void vtkPointHandleRepresentationSphere::Scale(const double eventPos[2])
{
// Get the current scale factor
double sf = this->Glypher->GetScaleFactor();
......
......@@ -47,7 +47,7 @@ public:
*/
static vtkPointHandleRepresentationSphere* New();
using SuperClass::Translate;
using vtkHandleRepresentation::Translate;
//@{
/**
......@@ -129,6 +129,10 @@ public:
*/
void Highlight(int highlight) override;
// Methods to manipulate the cursor
void Translate(const double* eventPos) override;
void Scale(const double eventPos[2]);
protected:
vtkPointHandleRepresentationSphere();
~vtkPointHandleRepresentationSphere() override;
......@@ -141,15 +145,12 @@ protected:
vtkPolyData* FocalData;
vtkPoints* FocalPoint;
int ConstraintAxis;
// Support picking
double LastPickPosition[3];
double LastEventPosition[2];
// Methods to manipulate the cursor
int ConstraintAxis;
void Translate(double eventPos[2]);
void Scale(double eventPos[2]);
// A flag to use the disk source
int AddCircleAroundSphere;
vtkActor* DiskActor;
......
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