Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Scott Wittenburg
VTK
Commits
5401596b
Commit
5401596b
authored
Dec 14, 2017
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Common/DataModel: use VTK_SIZEHINT
parent
5e718ccb
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
38 additions
and
79 deletions
+38
-79
Common/DataModel/vtkBoundingBox.h
Common/DataModel/vtkBoundingBox.h
+2
-2
Common/DataModel/vtkBox.h
Common/DataModel/vtkBox.h
+1
-1
Common/DataModel/vtkCell.h
Common/DataModel/vtkCell.h
+1
-1
Common/DataModel/vtkDataSet.h
Common/DataModel/vtkDataSet.h
+4
-4
Common/DataModel/vtkGraph.h
Common/DataModel/vtkGraph.h
+1
-1
Common/DataModel/vtkHexahedron.h
Common/DataModel/vtkHexahedron.h
+2
-2
Common/DataModel/vtkHyperOctree.h
Common/DataModel/vtkHyperOctree.h
+1
-1
Common/DataModel/vtkImageData.h
Common/DataModel/vtkImageData.h
+4
-4
Common/DataModel/vtkImplicitFunction.h
Common/DataModel/vtkImplicitFunction.h
+2
-2
Common/DataModel/vtkKdNode.h
Common/DataModel/vtkKdNode.h
+4
-4
Common/DataModel/vtkLagrangeInterpolation.h
Common/DataModel/vtkLagrangeInterpolation.h
+4
-4
Common/DataModel/vtkPointSet.h
Common/DataModel/vtkPointSet.h
+1
-1
Common/DataModel/vtkPyramid.h
Common/DataModel/vtkPyramid.h
+2
-2
Common/DataModel/vtkRectilinearGrid.h
Common/DataModel/vtkRectilinearGrid.h
+1
-1
Common/DataModel/vtkStructuredGrid.h
Common/DataModel/vtkStructuredGrid.h
+2
-2
Common/DataModel/vtkTetra.h
Common/DataModel/vtkTetra.h
+2
-2
Common/DataModel/vtkVoxel.h
Common/DataModel/vtkVoxel.h
+2
-2
Common/DataModel/vtkWedge.h
Common/DataModel/vtkWedge.h
+2
-2
Wrapping/Tools/hints
Wrapping/Tools/hints
+0
-41
No files found.
Common/DataModel/vtkBoundingBox.h
View file @
5401596b
...
...
@@ -165,7 +165,7 @@ public:
/**
* Get the minimum point of the bounding box.
*/
const
double
*
GetMinPoint
()
const
;
const
double
*
GetMinPoint
()
const
VTK_SIZEHINT
(
3
)
;
void
GetMinPoint
(
double
&
x
,
double
&
y
,
double
&
z
)
const
;
//@}
...
...
@@ -173,7 +173,7 @@ public:
/**
* Get the maximum point of the bounding box.
*/
const
double
*
GetMaxPoint
()
const
;
const
double
*
GetMaxPoint
()
const
VTK_SIZEHINT
(
3
)
;
void
GetMaxPoint
(
double
&
x
,
double
&
y
,
double
&
z
)
const
;
//@}
...
...
Common/DataModel/vtkBox.h
View file @
5401596b
...
...
@@ -80,7 +80,7 @@ public:
double
&
yMin
,
double
&
yMax
,
double
&
zMin
,
double
&
zMax
);
void
GetBounds
(
double
bounds
[
6
]);
double
*
GetBounds
();
double
*
GetBounds
()
VTK_SIZEHINT
(
6
)
;
/**
* A special method that allows union set operation on bounding boxes.
...
...
Common/DataModel/vtkCell.h
View file @
5401596b
...
...
@@ -297,7 +297,7 @@ public:
* Compute cell bounding box (xmin,xmax,ymin,ymax,zmin,zmax). Return pointer
* to array of six double values.
*/
double
*
GetBounds
();
double
*
GetBounds
()
VTK_SIZEHINT
(
6
)
;
/**
...
...
Common/DataModel/vtkDataSet.h
View file @
5401596b
...
...
@@ -90,7 +90,7 @@ public:
* Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints.
* THIS METHOD IS NOT THREAD SAFE.
*/
virtual
double
*
GetPoint
(
vtkIdType
ptId
)
=
0
;
virtual
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
=
0
;
/**
* Copy point coordinates into user provided array x[3] for specified
...
...
@@ -271,7 +271,7 @@ public:
* (xmin,xmax, ymin,ymax, zmin,zmax).
* THIS METHOD IS NOT THREAD SAFE.
*/
double
*
GetBounds
();
double
*
GetBounds
()
VTK_SIZEHINT
(
6
)
;
/**
* Return a pointer to the geometry bounding box in the form
...
...
@@ -285,7 +285,7 @@ public:
* Get the center of the bounding box.
* THIS METHOD IS NOT THREAD SAFE.
*/
double
*
GetCenter
();
double
*
GetCenter
()
VTK_SIZEHINT
(
3
)
;
/**
* Get the center of the bounding box.
...
...
@@ -328,7 +328,7 @@ public:
* Update to create or refresh the scalars before calling this method.
* THIS METHOD IS NOT THREAD SAFE.
*/
double
*
GetScalarRange
();
double
*
GetScalarRange
()
VTK_SIZEHINT
(
2
)
;
/**
* Convenience method returns largest cell size in dataset. This is generally
...
...
Common/DataModel/vtkGraph.h
View file @
5401596b
...
...
@@ -559,7 +559,7 @@ public:
/**
* Get the x,y,z location of a point along edge e.
*/
double
*
GetEdgePoint
(
vtkIdType
e
,
vtkIdType
i
);
double
*
GetEdgePoint
(
vtkIdType
e
,
vtkIdType
i
)
VTK_SIZEHINT
(
3
)
;
/**
* Clear all points associated with an edge.
...
...
Common/DataModel/vtkHexahedron.h
View file @
5401596b
...
...
@@ -110,8 +110,8 @@ public:
* Return the ids of the vertices defining edge/face (`edgeId`/`faceId').
* Ids are related to the cell, not to the dataset.
*/
static
int
*
GetEdgeArray
(
int
edgeId
);
static
int
*
GetFaceArray
(
int
faceId
);
static
int
*
GetEdgeArray
(
int
edgeId
)
VTK_SIZEHINT
(
2
)
;
static
int
*
GetFaceArray
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
//@}
/**
...
...
Common/DataModel/vtkHyperOctree.h
View file @
5401596b
...
...
@@ -302,7 +302,7 @@ public:
* Get point coordinates with ptId such that: 0 <= ptId < NumberOfPoints.
* THIS METHOD IS NOT THREAD SAFE.
*/
double
*
GetPoint
(
vtkIdType
ptId
)
override
;
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
override
;
/**
* Copy point coordinates into user provided array x[3] for specified
...
...
Common/DataModel/vtkImageData.h
View file @
5401596b
...
...
@@ -61,7 +61,7 @@ public:
*/
vtkIdType
GetNumberOfCells
()
override
;
vtkIdType
GetNumberOfPoints
()
override
;
double
*
GetPoint
(
vtkIdType
ptId
)
override
;
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
override
;
void
GetPoint
(
vtkIdType
id
,
double
x
[
3
])
override
;
vtkCell
*
GetCell
(
vtkIdType
cellId
)
override
;
vtkCell
*
GetCell
(
int
i
,
int
j
,
int
k
)
override
;
...
...
@@ -113,7 +113,7 @@ public:
* Dimensions are computed from Extents during this call.
* \warning Non thread-safe, use second signature if you want it to be.
*/
virtual
int
*
GetDimensions
();
virtual
int
*
GetDimensions
()
VTK_SIZEHINT
(
3
)
;
/**
* Get dimensions of this structured points dataset.
...
...
@@ -228,10 +228,10 @@ public:
* up to date. The first three methods compute the increments based on the
* active scalar field while the next three, the scalar field is passed in.
*/
virtual
vtkIdType
*
GetIncrements
();
virtual
vtkIdType
*
GetIncrements
()
VTK_SIZEHINT
(
3
)
;
virtual
void
GetIncrements
(
vtkIdType
&
incX
,
vtkIdType
&
incY
,
vtkIdType
&
incZ
);
virtual
void
GetIncrements
(
vtkIdType
inc
[
3
]);
virtual
vtkIdType
*
GetIncrements
(
vtkDataArray
*
scalars
);
virtual
vtkIdType
*
GetIncrements
(
vtkDataArray
*
scalars
)
VTK_SIZEHINT
(
3
)
;
virtual
void
GetIncrements
(
vtkDataArray
*
scalars
,
vtkIdType
&
incX
,
vtkIdType
&
incY
,
vtkIdType
&
incZ
);
virtual
void
GetIncrements
(
vtkDataArray
*
scalars
,
vtkIdType
inc
[
3
]);
...
...
Common/DataModel/vtkImplicitFunction.h
View file @
5401596b
...
...
@@ -86,10 +86,10 @@ public:
* x[3] is transformed through transform (if provided).
*/
void
FunctionGradient
(
const
double
x
[
3
],
double
g
[
3
]);
double
*
FunctionGradient
(
const
double
x
[
3
])
{
double
*
FunctionGradient
(
const
double
x
[
3
])
VTK_SIZEHINT
(
3
)
{
this
->
FunctionGradient
(
x
,
this
->
ReturnValue
);
return
this
->
ReturnValue
;
};
double
*
FunctionGradient
(
double
x
,
double
y
,
double
z
)
{
double
*
FunctionGradient
(
double
x
,
double
y
,
double
z
)
VTK_SIZEHINT
(
3
)
{
double
xyz
[
3
]
=
{
x
,
y
,
z
};
return
this
->
FunctionGradient
(
xyz
);
};
//@}
...
...
Common/DataModel/vtkKdNode.h
View file @
5401596b
...
...
@@ -104,8 +104,8 @@ public:
* Get a pointer to the 3 bound minima (xmin, ymin and zmin) or the
* 3 bound maxima (xmax, ymax, zmax). Don't free this pointer.
*/
double
*
GetMinBounds
()
{
return
this
->
Min
;}
double
*
GetMaxBounds
()
{
return
this
->
Max
;}
double
*
GetMinBounds
()
VTK_SIZEHINT
(
3
)
{
return
this
->
Min
;}
double
*
GetMaxBounds
()
VTK_SIZEHINT
(
3
)
{
return
this
->
Max
;}
/**
* Set the xmin, ymin and zmin value of the bounds of this region
...
...
@@ -121,8 +121,8 @@ public:
* Get a pointer to the 3 data bound minima (xmin, ymin and zmin) or the
* 3 data bound maxima (xmax, ymax, zmax). Don't free this pointer.
*/
double
*
GetMinDataBounds
()
{
return
this
->
MinVal
;}
double
*
GetMaxDataBounds
()
{
return
this
->
MaxVal
;}
double
*
GetMinDataBounds
()
VTK_SIZEHINT
(
3
)
{
return
this
->
MinVal
;}
double
*
GetMaxDataBounds
()
VTK_SIZEHINT
(
3
)
{
return
this
->
MaxVal
;}
/**
* Set the xmin, ymin and zmin value of the bounds of this
...
...
Common/DataModel/vtkLagrangeInterpolation.h
View file @
5401596b
...
...
@@ -66,8 +66,8 @@ public:
static
int
GetVaryingParameterOfHexEdge
(
int
edgeId
);
static
vtkVector2i
GetFixedParametersOfHexEdge
(
int
edgeId
);
static
const
int
*
GetPointIndicesBoundingHexFace
(
int
faceId
);
static
const
int
*
GetEdgeIndicesBoundingHexFace
(
int
faceId
);
static
const
int
*
GetPointIndicesBoundingHexFace
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
static
const
int
*
GetEdgeIndicesBoundingHexFace
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
static
vtkVector2i
GetVaryingParametersOfHexFace
(
int
faceId
);
static
int
GetFixedParameterOfHexFace
(
int
faceId
);
...
...
@@ -76,8 +76,8 @@ public:
static
int
GetVaryingParameterOfWedgeEdge
(
int
edgeId
);
static
vtkVector2i
GetFixedParametersOfWedgeEdge
(
int
edgeId
);
static
const
int
*
GetPointIndicesBoundingWedgeFace
(
int
faceId
);
static
const
int
*
GetEdgeIndicesBoundingWedgeFace
(
int
faceId
);
static
const
int
*
GetPointIndicesBoundingWedgeFace
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
static
const
int
*
GetEdgeIndicesBoundingWedgeFace
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
static
vtkVector2i
GetVaryingParametersOfWedgeFace
(
int
faceId
);
static
int
GetFixedParameterOfWedgeFace
(
int
faceId
);
...
...
Common/DataModel/vtkPointSet.h
View file @
5401596b
...
...
@@ -77,7 +77,7 @@ public:
* and its values are only valid as long as another method invocation is not
* performed. Prefer GetPoint() with the return value in argument.
*/
double
*
GetPoint
(
vtkIdType
ptId
)
override
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
override
{
return
this
->
Points
->
GetPoint
(
ptId
);};
/**
...
...
Common/DataModel/vtkPyramid.h
View file @
5401596b
...
...
@@ -119,8 +119,8 @@ public:
* Return the ids of the vertices defining edge/face (`edgeId`/`faceId').
* Ids are related to the cell, not to the dataset.
*/
static
int
*
GetEdgeArray
(
int
edgeId
);
static
int
*
GetFaceArray
(
int
faceId
);
static
int
*
GetEdgeArray
(
int
edgeId
)
VTK_SIZEHINT
(
2
)
;
static
int
*
GetFaceArray
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
//@}
protected:
...
...
Common/DataModel/vtkRectilinearGrid.h
View file @
5401596b
...
...
@@ -77,7 +77,7 @@ public:
*/
vtkIdType
GetNumberOfCells
()
override
;
vtkIdType
GetNumberOfPoints
()
override
;
double
*
GetPoint
(
vtkIdType
ptId
)
override
;
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
override
;
void
GetPoint
(
vtkIdType
id
,
double
x
[
3
])
override
;
vtkCell
*
GetCell
(
vtkIdType
cellId
)
override
;
vtkCell
*
GetCell
(
int
i
,
int
j
,
int
k
)
override
;
...
...
Common/DataModel/vtkStructuredGrid.h
View file @
5401596b
...
...
@@ -78,7 +78,7 @@ public:
*/
vtkIdType
GetNumberOfPoints
()
override
{
return
vtkPointSet
::
GetNumberOfPoints
();}
double
*
GetPoint
(
vtkIdType
ptId
)
override
double
*
GetPoint
(
vtkIdType
ptId
)
VTK_SIZEHINT
(
3
)
override
{
return
this
->
vtkPointSet
::
GetPoint
(
ptId
);}
void
GetPoint
(
vtkIdType
ptId
,
double
p
[
3
])
override
{
this
->
vtkPointSet
::
GetPoint
(
ptId
,
p
);}
...
...
@@ -113,7 +113,7 @@ public:
/**
* Get dimensions of this structured points dataset.
*/
virtual
int
*
GetDimensions
();
virtual
int
*
GetDimensions
()
VTK_SIZEHINT
(
3
)
;
virtual
void
GetDimensions
(
int
dim
[
3
]);
//@}
...
...
Common/DataModel/vtkTetra.h
View file @
5401596b
...
...
@@ -182,8 +182,8 @@ public:
* Return the ids of the vertices defining edge/face (`edgeId`/`faceId').
* Ids are related to the cell, not to the dataset.
*/
static
int
*
GetEdgeArray
(
int
edgeId
);
static
int
*
GetFaceArray
(
int
faceId
);
static
int
*
GetEdgeArray
(
int
edgeId
)
VTK_SIZEHINT
(
2
)
;
static
int
*
GetFaceArray
(
int
faceId
)
VTK_SIZEHINT
(
3
)
;
//@}
protected:
...
...
Common/DataModel/vtkVoxel.h
View file @
5401596b
...
...
@@ -110,8 +110,8 @@ public:
* Return the ids of the vertices defining edge/face (`edgeId`/`faceId').
* Ids are related to the cell, not to the dataset.
*/
static
int
*
GetEdgeArray
(
int
edgeId
);
static
int
*
GetFaceArray
(
int
faceId
);
static
int
*
GetEdgeArray
(
int
edgeId
)
VTK_SIZEHINT
(
2
)
;
static
int
*
GetFaceArray
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
//@}
protected:
...
...
Common/DataModel/vtkWedge.h
View file @
5401596b
...
...
@@ -118,8 +118,8 @@ public:
* Return the ids of the vertices defining edge/face (`edgeId`/`faceId').
* Ids are related to the cell, not to the dataset.
*/
static
int
*
GetEdgeArray
(
int
edgeId
);
static
int
*
GetFaceArray
(
int
faceId
);
static
int
*
GetEdgeArray
(
int
edgeId
)
VTK_SIZEHINT
(
2
)
;
static
int
*
GetFaceArray
(
int
faceId
)
VTK_SIZEHINT
(
4
)
;
//@}
protected:
...
...
Wrapping/Tools/hints
View file @
5401596b
vtkBoundingBox GetMinPoint 307 3
vtkBoundingBox GetMaxPoint 307 3
vtkBox GetBounds 307 6
vtkCell GetBounds 307 6
vtkCocoaRenderWindow GetPosition 304 2
vtkCocoaRenderWindow GetScreenSize 304 2
vtkCocoaRenderWindow GetSize 304 2
vtkDataObject GetUpdateExtent 304 6
vtkDataObject GetWholeExtent 304 6
vtkDataSet GetBounds 307 6
vtkDataSet GetCenter 307 3
vtkDataSet GetPoint 307 3
vtkDataSet GetScalarRange 307 2
vtkDICOMImageReader GetImageOrientationPatient 301 6
vtkDICOMImageReader GetImagePositionPatient 301 3
vtkDICOMImageReader GetPixelSpacing 307 3
...
...
@@ -26,11 +18,7 @@ vtkGenericOpenGLRenderWindow GetPosition 304 2
vtkGenericOpenGLRenderWindow GetScreenSize 304 2
vtkGenericOpenGLRenderWindow GetSize 304 2
vtkGeometryFilter GetExtent 307 6
vtkGraph GetEdgePoint 307 3
vtkGridSynchronizedTemplates3D GetExecuteExtent 304 6
vtkHexahedron GetEdgeArray 304 2
vtkHexahedron GetFaceArray 304 4
vtkHyperOctree GetPoint 307 3
vtkHyperStreamline GetStartPosition 307 3
vtkImageAccumulate GetComponentExtent 304 6
vtkImageButterworthHighPass GetCutOff 307 3
...
...
@@ -39,10 +27,6 @@ vtkImageClip GetOutputWholeExtent 304 6
vtkImageConvolve GetKernel3x3 301 9
vtkImageConvolve GetKernel3x3x3 301 27
vtkImageConvolve GetKernel5x5 301 25
vtkImageData GetDimensions 304 3
vtkImageData GetExtent 304 6
vtkImageData GetIncrements 30A 3
vtkImageData GetPoint 307 3
vtkImageEllipsoidSource GetWholeExtent 304 6
vtkImageExport GetDataDimensions 304 3
vtkImageExport GetDataExtent 304 6
...
...
@@ -63,18 +47,9 @@ vtkImageSpatialFilter GetKernelSize 304 3
vtkImageVectorConvolve GetKernel 301 3
vtkImageViewer GetPosition 304 2
vtkImageViewer GetSize 304 2
vtkImplicitFunction FunctionGradient 307 3
vtkIOSRenderWindow GetPosition 304 2
vtkIOSRenderWindow GetScreenSize 304 2
vtkIOSRenderWindow GetSize 304 2
vtkKdNode GetMaxBounds 307 3
vtkKdNode GetMaxDataBounds 307 3
vtkKdNode GetMinBounds 307 3
vtkKdNode GetMinDataBounds 307 3
vtkLagrangeInterpolation GetPointIndicesBoundingHexFace 304 4
vtkLagrangeInterpolation GetEdgeIndicesBoundingHexFace 304 4
vtkLagrangeInterpolation GetPointIndicesBoundingWedgeFace 304 4
vtkLagrangeInterpolation GetEdgeIndicesBoundingWedgeFace 304 4
vtkLinearTransform TransformDoubleNormal 307 3
vtkLinearTransform TransformDoubleVector 307 3
vtkLinearTransform TransformFloatNormal 301 3
...
...
@@ -91,8 +66,6 @@ vtkOSOpenGLRenderWindow GetPosition 304 2
vtkOSOpenGLRenderWindow GetScreenSize 304 2
vtkOSOpenGLRenderWindow GetSize 304 2
vtkPainterPolyDataMapper GetBounds 307 6
vtkPiecewiseFunction GetRange 307 2
vtkPointSet GetPoint 307 3
vtkPolyData GetUpdateExtent 304 6
vtkPolygon ConvertEllipseToImplicit 307 5
vtkPolygon FitEllipse 307 6
...
...
@@ -100,24 +73,14 @@ vtkPolyLine ConvertEllipseToImplicit 307 5
vtkPolyLine EllipseToImplicit 307 3
vtkPolyLine FitEllipse 307 6
vtkProjectedPolyDataRayBounder GetRayBounds 301 2
vtkPyramid GetEdgeArray 304 2
vtkPyramid GetFaceArray 304 4
vtkQuadricClustering GetNumberOfDivisions 304 3
vtkRayCaster GetParallelIncrements 301 2
vtkRayCaster GetParallelStartPosition 301 3
vtkRectilinearGrid GetExtent 304 6
vtkRectilinearGrid GetPoint 307 3
vtkRecursiveSphereDirectionEncoder GetDecodedGradient 301 3
vtkSphericalDirectionEncoder GetDecodedGradient 301 3
vtkStreamer GetStartPosition 307 3
vtkStructuredGrid GetDimensions 304 3
vtkStructuredGrid GetExtent 304 6
vtkStructuredGrid GetPoint 307 3
vtkStructuredGrid GetScalarRange 307 2
vtkStructuredPointsGeometryFilter GetExtent 304 6
vtkSynchronizedTemplates3D GetExecuteExtent 304 6
vtkTetra GetEdgeArray 304 2
vtkTetra GetFaceArray 304 3
vtkTransform GetDoublePoint 307 4
vtkTransform GetOrientation 307 3
vtkTransform GetOrientationWXYZ 307 4
...
...
@@ -128,11 +91,7 @@ vtkUnstructuredGrid GetUpdateExtent 304 6
vtkViewRays GetParallelIncrements 301 2
vtkViewRays GetParallelStartPosition 301 3
vtkVolumeMapper GetBounds 307 6
vtkVoxel GetEdgeArray 304 2
vtkVoxel GetFaceArray 304 4
vtkWarpLens GetCenter 307 2
vtkWedge GetEdgeArray 304 2
vtkWedge GetFaceArray 304 4
vtkWin32OpenGLRenderWindow GetPosition 304 2
vtkWin32OpenGLRenderWindow GetScreenSize 304 2
vtkWin32OpenGLRenderWindow GetSize 304 2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment