Commit 782057d0 authored by Mathieu Malaterre's avatar Mathieu Malaterre
Browse files

ENH: Remove const

parent 9e4e0f76
......@@ -31,7 +31,7 @@
#include <vtkstd/algorithm>
#include <vtkstd/iterator>
vtkCxxRevisionMacro(vtkContourRepresentation, "1.15");
vtkCxxRevisionMacro(vtkContourRepresentation, "1.16");
vtkCxxSetObjectMacro(vtkContourRepresentation, PointPlacer, vtkPointPlacer);
vtkCxxSetObjectMacro(vtkContourRepresentation, LineInterpolator, vtkContourLineInterpolator);
......@@ -370,13 +370,13 @@ int vtkContourRepresentation::GetActiveNodeDisplayPosition( double pos[2] )
}
//----------------------------------------------------------------------
int vtkContourRepresentation::GetNumberOfNodes() const
int vtkContourRepresentation::GetNumberOfNodes()
{
return this->Internal->Nodes.size();
}
//----------------------------------------------------------------------
int vtkContourRepresentation::GetNumberOfIntermediatePoints(int n) const
int vtkContourRepresentation::GetNumberOfIntermediatePoints(int n)
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......@@ -390,7 +390,7 @@ int vtkContourRepresentation::GetNumberOfIntermediatePoints(int n) const
//----------------------------------------------------------------------
int vtkContourRepresentation::GetIntermediatePointWorldPosition(int n,
int idx,
double point[3]) const
double point[3])
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......@@ -416,7 +416,7 @@ int vtkContourRepresentation::GetIntermediatePointWorldPosition(int n,
// from the world positions... It should not be queried from the renderer
// whose camera position may have changed
int vtkContourRepresentation::GetNthNodeDisplayPosition(
int n, double displayPos[2] ) const
int n, double displayPos[2] )
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......@@ -440,7 +440,7 @@ int vtkContourRepresentation::GetNthNodeDisplayPosition(
}
//----------------------------------------------------------------------
int vtkContourRepresentation::GetNthNodeWorldPosition( int n, double worldPos[3] ) const
int vtkContourRepresentation::GetNthNodeWorldPosition( int n, double worldPos[3] )
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......
......@@ -154,19 +154,19 @@ public:
// Description:
// Get the number of nodes.
virtual int GetNumberOfNodes() const;
virtual int GetNumberOfNodes();
// Description:
// Get the nth node's display position. Will return
// 1 on success, or 0 if there are not at least
// (n+1) nodes (0 based counting).
virtual int GetNthNodeDisplayPosition( int n, double pos[2] ) const;
virtual int GetNthNodeDisplayPosition( int n, double pos[2] );
// Description:
// Get the nth node's world position. Will return
// 1 on success, or 0 if there are not at least
// (n+1) nodes (0 based counting).
virtual int GetNthNodeWorldPosition( int n, double pos[3] ) const;
virtual int GetNthNodeWorldPosition( int n, double pos[3] );
// Description:
// Get the nth node's world orientation. Will return
......@@ -208,7 +208,7 @@ public:
// closed, this is the number of intermediate points
// between node n and node 0. 0 is returned if n is
// out of range.
virtual int GetNumberOfIntermediatePoints( int n ) const;
virtual int GetNumberOfIntermediatePoints( int n );
// Description:
// Get the world position of the intermediate point at
......@@ -216,7 +216,7 @@ public:
// n is the last node and the loop is closed). Returns
// 1 on success or 0 if n or idx are out of range.
virtual int GetIntermediatePointWorldPosition( int n,
int idx, double point[3] ) const;
int idx, double point[3] );
// Description:
// Add an intermediate point between node n and n+1
......@@ -320,7 +320,7 @@ public:
// Description:
// Get the points in this contour as a vtkPolyData.
//BTX
virtual const vtkPolyData * GetContourRepresentationAsPolyData() const = 0;
virtual vtkPolyData * GetContourRepresentationAsPolyData() = 0;
//ETX
protected:
......
......@@ -32,7 +32,7 @@
#include <vtkstd/algorithm>
#include <vtkstd/iterator>
vtkCxxRevisionMacro(vtkFocalPlaneContourRepresentation, "1.3");
vtkCxxRevisionMacro(vtkFocalPlaneContourRepresentation, "1.4");
//----------------------------------------------------------------------
vtkFocalPlaneContourRepresentation::vtkFocalPlaneContourRepresentation()
......@@ -50,7 +50,7 @@ vtkFocalPlaneContourRepresentation::~vtkFocalPlaneContourRepresentation()
// point using the renderer.
int vtkFocalPlaneContourRepresentation::GetIntermediatePointWorldPosition(int n,
int idx,
double point[3]) const
double point[3])
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......@@ -112,7 +112,7 @@ int vtkFocalPlaneContourRepresentation::GetIntermediatePointDisplayPosition(int
//----------------------------------------------------------------------
int vtkFocalPlaneContourRepresentation::GetNthNodeDisplayPosition(
int n, double displayPos[2] ) const
int n, double displayPos[2] )
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......@@ -129,7 +129,7 @@ int vtkFocalPlaneContourRepresentation::GetNthNodeDisplayPosition(
//----------------------------------------------------------------------
int vtkFocalPlaneContourRepresentation::GetNthNodeWorldPosition(
int n, double worldPos[3] ) const
int n, double worldPos[3] )
{
if ( n < 0 ||
static_cast<unsigned int>(n) >= this->Internal->Nodes.size() )
......
......@@ -48,7 +48,7 @@ public:
// n is the last node and the loop is closed). Returns
// 1 on success or 0 if n or idx are out of range.
virtual int GetIntermediatePointWorldPosition( int n,
int idx, double point[3] ) const;
int idx, double point[3] );
// Description:
// Get the world position of the intermediate point at
......@@ -62,13 +62,13 @@ public:
// Get the nth node's display position. Will return
// 1 on success, or 0 if there are not at least
// (n+1) nodes (0 based counting).
virtual int GetNthNodeDisplayPosition( int n, double pos[2] ) const;
virtual int GetNthNodeDisplayPosition( int n, double pos[2] );
// Description:
// Get the nth node's world position. Will return
// 1 on success, or 0 if there are not at least
// (n+1) nodes (0 based counting).
virtual int GetNthNodeWorldPosition( int n, double pos[3] ) const;
virtual int GetNthNodeWorldPosition( int n, double pos[3] );
// Description:
// The class maintains its true contour locations based on display co-ords
......
......@@ -40,7 +40,7 @@
#include "vtkTexture.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkImagePlaneWidget, "1.9");
vtkCxxRevisionMacro(vtkImagePlaneWidget, "1.10");
vtkStandardNewMacro(vtkImagePlaneWidget);
vtkCxxSetObjectMacro(vtkImagePlaneWidget, PlaneProperty, vtkProperty);
......@@ -534,7 +534,7 @@ void vtkImagePlaneWidget::PrintSelf(ostream& os, vtkIndent indent)
else
{
os << indent << "ColorMap: (none)\n";
}
}
double *o = this->PlaneSource->GetOrigin();
double *pt1 = this->PlaneSource->GetPoint1();
......
......@@ -40,7 +40,7 @@
#include "vtkFocalPlanePointPlacer.h"
#include "vtkBezierContourLineInterpolator.h"
vtkCxxRevisionMacro(vtkOrientedGlyphContourRepresentation, "1.8");
vtkCxxRevisionMacro(vtkOrientedGlyphContourRepresentation, "1.9");
vtkStandardNewMacro(vtkOrientedGlyphContourRepresentation);
//----------------------------------------------------------------------
......@@ -492,8 +492,8 @@ void vtkOrientedGlyphContourRepresentation::BuildLines()
}
//----------------------------------------------------------------------
const vtkPolyData *
vtkOrientedGlyphContourRepresentation::GetContourRepresentationAsPolyData() const
vtkPolyData *
vtkOrientedGlyphContourRepresentation::GetContourRepresentationAsPolyData()
{
// Get the points in this contour as a vtkPolyData.
return this->Lines;
......
......@@ -98,7 +98,7 @@ public:
// Description:
// Get the points in this contour as a vtkPolyData.
virtual const vtkPolyData * GetContourRepresentationAsPolyData() const;
virtual vtkPolyData * GetContourRepresentationAsPolyData();
protected:
vtkOrientedGlyphContourRepresentation();
......
......@@ -40,7 +40,7 @@
#include "vtkFocalPlanePointPlacer.h"
#include "vtkBezierContourLineInterpolator.h"
vtkCxxRevisionMacro(vtkOrientedGlyphFocalPlaneContourRepresentation, "1.3");
vtkCxxRevisionMacro(vtkOrientedGlyphFocalPlaneContourRepresentation, "1.4");
vtkStandardNewMacro(vtkOrientedGlyphFocalPlaneContourRepresentation);
//----------------------------------------------------------------------
......@@ -500,8 +500,8 @@ void vtkOrientedGlyphFocalPlaneContourRepresentation::BuildLines()
// set in vtkImageReslice or vtkImagePlaneWidget if there were a plane
// passing through the contour points. The origin passed here must be the
// origin on the image data under the contour.
const vtkMatrix4x4 * vtkOrientedGlyphFocalPlaneContourRepresentation
::GetContourPlaneDirectionCosines( const double origin[3] ) const
vtkMatrix4x4 * vtkOrientedGlyphFocalPlaneContourRepresentation
::GetContourPlaneDirectionCosines( const double origin[3] )
{
if (this->ContourPlaneDirectionCosines->GetMTime()
>= this->Renderer->GetMTime() ||
......@@ -560,8 +560,8 @@ const vtkMatrix4x4 * vtkOrientedGlyphFocalPlaneContourRepresentation
// Returns the contour representation as polydata in world co-ordinates
// For this class, the contour is overlayed on the focal plane.
//
const vtkPolyData * vtkOrientedGlyphFocalPlaneContourRepresentation
::GetContourRepresentationAsPolyData() const
vtkPolyData * vtkOrientedGlyphFocalPlaneContourRepresentation
::GetContourRepresentationAsPolyData()
{
// Get the points in this contour as a vtkPolyData.
......
......@@ -100,7 +100,7 @@ public:
// Description:
// Get the points in this contour as a vtkPolyData.
virtual const vtkPolyData * GetContourRepresentationAsPolyData() const;
virtual vtkPolyData * GetContourRepresentationAsPolyData();
// Description:
// Direction cosines of the plane on which the contour lies
......@@ -108,7 +108,7 @@ public:
// set in vtkImageReslice or vtkImagePlaneWidget if there were a plane
// passing through the contour points. The origin must be the origin of the
// data under the contour.
const vtkMatrix4x4 *GetContourPlaneDirectionCosines(const double origin[3]) const;
vtkMatrix4x4 *GetContourPlaneDirectionCosines(const double origin[3]);
protected:
vtkOrientedGlyphFocalPlaneContourRepresentation();
......
Supports Markdown
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