Attached Files | vtk5.10rc1MissingGetsPatch.patch [^] (47,342 bytes) 2012-05-08 03:55 [Show Content] [Hide Content]Index: IO/vtkMPASReader.h
===================================================================
--- IO/vtkMPASReader.h (Revision 1683)
+++ IO/vtkMPASReader.h (Arbeitskopie)
@@ -138,9 +138,11 @@
vtkGetVector2Macro(VerticalLevelRange, int);
void SetLayerThickness(int val);
+ int GetLayerThickness() const;
vtkGetVector2Macro(LayerThicknessRange, int);
void SetCenterLon(int val);
+ int GetCenterLon() const;
vtkGetVector2Macro(CenterLonRange, int);
void SetProjectLatLon(bool val);
Index: IO/vtkXMLWriter.h
===================================================================
--- IO/vtkXMLWriter.h (Revision 1677)
+++ IO/vtkXMLWriter.h (Arbeitskopie)
@@ -121,6 +121,7 @@
// Description:
// Convenience functions to set the compressor to certain known types.
void SetCompressorType(int compressorType);
+ int GetCompressorType();
void SetCompressorTypeToNone()
{
this->SetCompressorType(NONE);
Index: IO/vtkTecplotReader.h
===================================================================
--- IO/vtkTecplotReader.h (Revision 1683)
+++ IO/vtkTecplotReader.h (Arbeitskopie)
@@ -103,7 +103,11 @@
// Description:
// Specify a Tecplot ASCII file for data loading.
void SetFileName( const char * fileName );
-
+
+ // Description.
+ // Returns the currently set file name or "" if NULL or not set.
+ const char *GetFileName() const;
+
// Description:
// Get the Tecplot data title.
const char * GetDataTitle();
Index: IO/vtkMPASReader.cxx
===================================================================
--- IO/vtkMPASReader.cxx (Revision 1683)
+++ IO/vtkMPASReader.cxx (Arbeitskopie)
@@ -2212,6 +2212,15 @@
//----------------------------------------------------------------------------
+// Return current LayerThickness state.
+//----------------------------------------------------------------------------
+
+int vtkMPASReader::GetLayerThickness() const
+{
+ return LayerThickness;
+}
+
+//----------------------------------------------------------------------------
// Set center longitude for lat/lon projection
//----------------------------------------------------------------------------
@@ -2240,7 +2249,15 @@
}
}
+//----------------------------------------------------------------------------
+// Return current CenterLon state.
+//----------------------------------------------------------------------------
+int vtkMPASReader::GetCenterLon() const
+{
+ return CenterLon;
+}
+
//----------------------------------------------------------------------------
// Set view to be the lat/lon projection.
//----------------------------------------------------------------------------
Index: IO/vtkXMLWriter.cxx
===================================================================
--- IO/vtkXMLWriter.cxx (Revision 1683)
+++ IO/vtkXMLWriter.cxx (Arbeitskopie)
@@ -307,6 +307,15 @@
}
//----------------------------------------------------------------------------
+int vtkXMLWriter::GetCompressorType()
+{
+ if (this->Compressor && this->Compressor->IsTypeOf("vtkZLibDataCompressor")){
+ return ZLIB;
+ }
+ return NONE;
+}
+
+//----------------------------------------------------------------------------
void vtkXMLWriter::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
Index: IO/vtkTecplotReader.cxx
===================================================================
--- IO/vtkTecplotReader.cxx (Revision 1683)
+++ IO/vtkTecplotReader.cxx (Arbeitskopie)
@@ -555,6 +555,12 @@
}
}
+// ----------------------------------------------------------------------------
+const char *vtkTecplotReader::GetFileName() const
+{
+ return this->FileName ? this->FileName : "";
+}
+
//----------------------------------------------------------------------------
void vtkTecplotReader::SelectionModifiedCallback( vtkObject *, unsigned long,
void * tpReader, void * )
Index: IO/vtkUTF16TextCodec.cxx
===================================================================
--- IO/vtkUTF16TextCodec.cxx (Revision 1683)
+++ IO/vtkUTF16TextCodec.cxx (Arbeitskopie)
@@ -159,6 +159,11 @@
_bigEndian = state;
}
+bool vtkUTF16TextCodec::GetBigEndian() const
+{
+ return _bigEndian;
+}
+
void vtkUTF16TextCodec::FindEndianness(istream& InputStream)
{
_endianExplicitlySet = false;
Index: IO/vtkUTF16TextCodec.h
===================================================================
--- IO/vtkUTF16TextCodec.h (Revision 1677)
+++ IO/vtkUTF16TextCodec.h (Arbeitskopie)
@@ -52,6 +52,9 @@
// Description:
// Set the endianess - true if Big false is little
void SetBigEndian(bool) ;
+ // Description:
+ // Returns true if the currently set or determined endianess is bigendian.
+ bool GetBigEndian() const;
// Description:
// Set the endianess - true if Big false is little
Index: Imaging/vtkImageNoiseSource.h
===================================================================
--- Imaging/vtkImageNoiseSource.h (Revision 1677)
+++ Imaging/vtkImageNoiseSource.h (Arbeitskopie)
@@ -51,6 +51,15 @@
{
this->SetWholeExtent(ext[0], ext[1], ext[2], ext[3], ext[4], ext[5]);
}
+ void GetWholeExtent(int ext[6])
+ {
+ ext[0] = this->WholeExtent[0];
+ ext[1] = this->WholeExtent[1];
+ ext[2] = this->WholeExtent[2];
+ ext[3] = this->WholeExtent[3];
+ ext[4] = this->WholeExtent[4];
+ ext[5] = this->WholeExtent[5];
+ }
protected:
vtkImageNoiseSource();
Index: Rendering/vtkResliceCursorPicker.h
===================================================================
--- Rendering/vtkResliceCursorPicker.h (Revision 1683)
+++ Rendering/vtkResliceCursorPicker.h (Arbeitskopie)
@@ -65,6 +65,7 @@
vtkResliceCursorPolyDataAlgorithm );
virtual void SetTransformMatrix( vtkMatrix4x4 * );
+ virtual vtkMatrix4x4 * GetTransformMatrix() const;
// Description:
// Overloaded pick method that returns the picked coordinates of the current
Index: Rendering/vtkImageViewer2.h
===================================================================
--- Rendering/vtkImageViewer2.h (Revision 1677)
+++ Rendering/vtkImageViewer2.h (Arbeitskopie)
@@ -152,12 +152,14 @@
virtual int* GetPosition();
virtual void SetPosition(int a,int b);
virtual void SetPosition(int a[2]) { this->SetPosition(a[0],a[1]); }
+ virtual void GetPosition(int a[2]);
// Description:
// Set/Get the size of the window in screen coordinates in pixels.
virtual int* GetSize();
virtual void SetSize(int a, int b);
virtual void SetSize(int a[2]) { this->SetSize(a[0],a[1]); }
+ virtual void GetSize(int a[2]);
// Description:
// Get the internal render window, renderer, image actor, and
Index: Rendering/vtkImageViewer.h
===================================================================
--- Rendering/vtkImageViewer.h (Revision 1677)
+++ Rendering/vtkImageViewer.h (Arbeitskopie)
@@ -92,12 +92,14 @@
int *GetPosition() {return this->RenderWindow->GetPosition();};
void SetPosition(int a,int b) {this->RenderWindow->SetPosition(a,b);};
virtual void SetPosition(int a[2]);
+ virtual void GetPosition(int a[2]);
// Description:
// Set/Get the size of the window in screen coordinates in pixels.
int *GetSize() {return this->RenderWindow->GetSize();};
void SetSize(int a,int b) {this->RenderWindow->SetSize(a,b);};
virtual void SetSize(int a[2]);
+ virtual void GetSize(int a[2]);
// Description:
// Get the internal objects
Index: Rendering/vtkGlyph3DMapper.h
===================================================================
--- Rendering/vtkGlyph3DMapper.h (Revision 1683)
+++ Rendering/vtkGlyph3DMapper.h (Arbeitskopie)
@@ -309,6 +309,7 @@
// Description:
// Called by vtkGlyphSelectionRenderMode.
vtkSetMacro(SelectMode, int);
+ vtkGetMacro(SelectMode, int);
// Description:
// WARNING: INTERNAL METHOD - NOT INTENDED FOR GENERAL USE
Index: Rendering/vtkResliceCursorPicker.cxx
===================================================================
--- Rendering/vtkResliceCursorPicker.cxx (Revision 1683)
+++ Rendering/vtkResliceCursorPicker.cxx (Arbeitskopie)
@@ -305,6 +305,12 @@
}
//----------------------------------------------------------------------------
+vtkMatrix4x4 * vtkResliceCursorPicker::GetTransformMatrix() const
+{
+ return TransformMatrix;
+}
+
+//----------------------------------------------------------------------------
// Helper function for sanity check - to see if one point is different from
// another.
//
Index: Rendering/vtkImageViewer.cxx
===================================================================
--- Rendering/vtkImageViewer.cxx (Revision 1677)
+++ Rendering/vtkImageViewer.cxx (Arbeitskopie)
@@ -83,13 +83,30 @@
{
this->SetSize(a[0],a[1]);
}
+
//----------------------------------------------------------------------------
+void vtkImageViewer::GetSize(int a[2])
+{
+ int *s = this->GetSize();
+ a[0] = s[0];
+ a[1] = s[1];
+}
+
+//----------------------------------------------------------------------------
void vtkImageViewer::SetPosition(int a[2])
{
this->SetPosition(a[0],a[1]);
}
//----------------------------------------------------------------------------
+void vtkImageViewer::GetPosition(int a[2])
+{
+ int *p = this->GetPosition();
+ a[0] = p[0];
+ a[1] = p[1];
+}
+
+//----------------------------------------------------------------------------
class vtkImageViewerCallback : public vtkCommand
{
public:
Index: Rendering/vtkAxisActor2D.h
===================================================================
--- Rendering/vtkAxisActor2D.h (Revision 1677)
+++ Rendering/vtkAxisActor2D.h (Arbeitskopie)
@@ -81,6 +81,7 @@
virtual void SetPoint1(double x[2]) { this->SetPosition(x); };
virtual void SetPoint1(double x, double y) { this->SetPosition(x,y); };
virtual double *GetPoint1() { return this->GetPosition(); };
+ virtual void GetPoint1(double x[2]){ double *p = this->GetPosition(); x[0] = p[0]; x[1] = p[1]; }
// Description:
// Specify the position of the second point defining the axis. Note that
@@ -92,6 +93,7 @@
virtual void SetPoint2(double x[2]) { this->SetPosition2(x); };
virtual void SetPoint2(double x, double y) { this->SetPosition2(x,y); };
virtual double *GetPoint2() { return this->GetPosition2(); };
+ virtual void GetPoint2(double x[2]){ double *p = this->GetPosition2(); x[0] = p[0]; x[1] = p[1]; }
// Description:
// Specify the (min,max) axis range. This will be used in the generation
Index: Rendering/vtkImageViewer2.cxx
===================================================================
--- Rendering/vtkImageViewer2.cxx (Revision 1677)
+++ Rendering/vtkImageViewer2.cxx (Arbeitskopie)
@@ -183,6 +183,14 @@
}
//----------------------------------------------------------------------------
+void vtkImageViewer2::GetSize(int a[2])
+{
+ int *s = this->GetSize();
+ a[0] = s[0];
+ a[1] = s[1];
+}
+
+//----------------------------------------------------------------------------
int* vtkImageViewer2::GetSize()
{
return this->RenderWindow->GetSize();
@@ -415,6 +423,14 @@
}
//----------------------------------------------------------------------------
+void vtkImageViewer2::GetPosition(int a[2])
+{
+ int *p = this->GetPosition();
+ a[0] = p[0];
+ a[1] = p[1];
+}
+
+//----------------------------------------------------------------------------
void vtkImageViewer2::SetDisplayId(void *a)
{
this->RenderWindow->SetDisplayId(a);
Index: Hybrid/vtkExodusIIReader.cxx
===================================================================
--- Hybrid/vtkExodusIIReader.cxx (Revision 1683)
+++ Hybrid/vtkExodusIIReader.cxx (Arbeitskopie)
@@ -6588,6 +6588,10 @@
this->Modified();
}
+vtkIdType vtkExodusIIReader::GetFastPathObjectId() const
+{
+ return this->Metadata->GetFastPathObjectId();
+}
void vtkExodusIIReader::SetFastPathIdType(const char *type)
{
@@ -6595,6 +6599,11 @@
this->Modified();
}
+const char * vtkExodusIIReader::GetFastPathIdType()
+{
+ return this->Metadata->GetFastPathIdType();
+}
+
void vtkExodusIIReader::Reset()
{
this->Metadata->Reset();
Index: Hybrid/vtkExodusIIReader.h
===================================================================
--- Hybrid/vtkExodusIIReader.h (Revision 1683)
+++ Hybrid/vtkExodusIIReader.h (Arbeitskopie)
@@ -93,6 +93,13 @@
{
this->SetTimeStep(val-1);
}
+ // Description:
+ // Convenience method to get the mode-shape which is same as
+ // this->GetTimeStep()+1;
+ int GetModeShape()
+ {
+ return this->GetTimeStep() + 1;
+ }
// Description:
// Returns the available range of valid integer time steps.
@@ -667,7 +674,9 @@
// "GLOBAL" means the id refers to a global id
// "INDEX" means the id refers to an index into the VTK array
void SetFastPathIdType(const char *type);
+ const char *GetFastPathIdType();
void SetFastPathObjectId(vtkIdType id);
+ vtkIdType GetFastPathObjectId() const;
//@}
// Description:
Index: Hybrid/vtkExodusIICache.h
===================================================================
--- Hybrid/vtkExodusIICache.h (Revision 1683)
+++ Hybrid/vtkExodusIICache.h (Arbeitskopie)
@@ -129,6 +129,8 @@
/// Set the maximum allowable cache size. This will remove cache entries if the capacity is reduced below the current size.
void SetCacheCapacity( double sizeInMiB );
+ /// Returns the maximum allowable cache size.
+ double GetCacheCapacity() const;
/** See how much cache space is left.
* This is the difference between the capacity and the size of the cache.
Index: Hybrid/vtkCubeAxesActor2D.h
===================================================================
--- Hybrid/vtkCubeAxesActor2D.h (Revision 1677)
+++ Hybrid/vtkCubeAxesActor2D.h (Arbeitskopie)
@@ -118,6 +118,9 @@
vtkSetMacro( XOrigin, double );
vtkSetMacro( YOrigin, double );
vtkSetMacro( ZOrigin, double );
+ vtkGetMacro( XOrigin, double );
+ vtkGetMacro( YOrigin, double );
+ vtkGetMacro( ZOrigin, double );
// Description:
// Set/Get a flag that controls whether the axes use the data ranges
Index: Hybrid/vtkBSplineTransform.h
===================================================================
--- Hybrid/vtkBSplineTransform.h (Revision 1683)
+++ Hybrid/vtkBSplineTransform.h (Arbeitskopie)
@@ -56,6 +56,7 @@
// Description:
// Set/Get a scale to apply to the transformation.
vtkSetMacro(DisplacementScale,double);
+ vtkGetMacro(DisplacementScale,double);
// Description:
// Set/Get the border mode, to alter behavior at the edge of the grid.
Index: Hybrid/vtkExodusIICache.cxx
===================================================================
--- Hybrid/vtkExodusIICache.cxx (Revision 1683)
+++ Hybrid/vtkExodusIICache.cxx (Arbeitskopie)
@@ -105,6 +105,10 @@
this->Capacity = sizeInMiB < 0 ? 0 : sizeInMiB;
}
+double vtkExodusIICache::GetCacheCapacity() const
+{
+ return this->Capacity;
+}
int vtkExodusIICache::ReduceToSize( double newSize )
{
Index: Hybrid/vtkExodusIIReaderPrivate.h
===================================================================
--- Hybrid/vtkExodusIIReaderPrivate.h (Revision 1683)
+++ Hybrid/vtkExodusIIReaderPrivate.h (Arbeitskopie)
@@ -455,8 +455,12 @@
void SetFastPathObjectType(vtkExodusIIReader::ObjectType type)
{this->FastPathObjectType = type;};
+ vtkExodusIIReader::ObjectType GetFastPathObjectType() const
+ {return this->FastPathObjectType;};
void SetFastPathObjectId(vtkIdType id){this->FastPathObjectId = id;};
+ vtkIdType GetFastPathObjectId() const {return this->FastPathObjectId;};
vtkSetStringMacro(FastPathIdType);
+ vtkGetStringMacro(FastPathIdType);
bool IsXMLMetadataValid();
Index: Filtering/vtkParametricSpline.cxx
===================================================================
--- Filtering/vtkParametricSpline.cxx (Revision 1677)
+++ Filtering/vtkParametricSpline.cxx (Arbeitskopie)
@@ -78,6 +78,12 @@
}
//----------------------------------------------------------------------------
+vtkIdType vtkParametricSpline::GetNumberOfPoints()
+{
+ return this->Points ? this->Points->GetNumberOfPoints() : 0;
+}
+
+//----------------------------------------------------------------------------
void vtkParametricSpline::SetPoint(
vtkIdType index, double x, double y, double z)
{
Index: Filtering/vtkParametricSpline.h
===================================================================
--- Filtering/vtkParametricSpline.h (Revision 1677)
+++ Filtering/vtkParametricSpline.h (Arbeitskopie)
@@ -93,6 +93,10 @@
void SetPoint(vtkIdType index, double x, double y, double z);
// Description:
+ // Returns number of points (or 0 if still not set).
+ vtkIdType GetNumberOfPoints();
+
+ // Description:
// Control whether the spline is open or closed. A closed spline forms
// a continuous loop: the first and last points are the same, and
// derivatives are continuous.
Index: Common/vtkOutputWindow.h
===================================================================
--- Common/vtkOutputWindow.h (Revision 1677)
+++ Common/vtkOutputWindow.h (Arbeitskopie)
@@ -72,6 +72,7 @@
// messages.
vtkBooleanMacro(PromptUser,int);
vtkSetMacro(PromptUser, int);
+ vtkGetMacro(PromptUser, int);
//BTX
// use this as a way of memory management when the
// program exits the SmartPointer will be deleted which
Index: Common/vtkLookupTable.h
===================================================================
--- Common/vtkLookupTable.h (Revision 1683)
+++ Common/vtkLookupTable.h (Arbeitskopie)
@@ -196,6 +196,7 @@
// Sets/Gets the range of scalars which will be mapped. This is a duplicate
// of Get/SetTableRange.
double *GetRange() { return this->GetTableRange(); };
+ void GetRange(double rng[2]) { this->GetTableRange(rng); };
void SetRange(double min, double max) { this->SetTableRange(min, max); };
void SetRange(double rng[2]) { this->SetRange(rng[0], rng[1]); };
Index: Parallel/vtkVPICReader.h
===================================================================
--- Parallel/vtkVPICReader.h (Revision 1677)
+++ Parallel/vtkVPICReader.h (Arbeitskopie)
@@ -61,6 +61,9 @@
vtkSetVector2Macro(XExtent, int);
vtkSetVector2Macro(YExtent, int);
vtkSetVector2Macro(ZExtent, int);
+ vtkGetVector2Macro(XExtent, int);
+ vtkGetVector2Macro(YExtent, int);
+ vtkGetVector2Macro(ZExtent, int);
// Get the full layout size in files for setting the range in GUI
vtkGetVector2Macro(XLayout, int);
Index: Parallel/vtkCommunicator.cxx
===================================================================
--- Parallel/vtkCommunicator.cxx (Revision 1683)
+++ Parallel/vtkCommunicator.cxx (Arbeitskopie)
@@ -124,6 +124,10 @@
{
vtkCommunicator::UseCopy = useCopy;
}
+int vtkCommunicator::GetUseCopy()
+{
+ return vtkCommunicator::UseCopy;
+}
//----------------------------------------------------------------------------
void vtkCommunicator::PrintSelf(ostream& os, vtkIndent indent)
Index: Parallel/vtkCommunicator.h
===================================================================
--- Parallel/vtkCommunicator.h (Revision 1677)
+++ Parallel/vtkCommunicator.h (Arbeitskopie)
@@ -800,6 +800,7 @@
Operation *operation);
static void SetUseCopy(int useCopy);
+ static int GetUseCopy();
//BTX
// Description:
Index: Views/vtkRenderView.h
===================================================================
--- Views/vtkRenderView.h (Revision 1677)
+++ Views/vtkRenderView.h (Arbeitskopie)
@@ -163,6 +163,7 @@
vtkSetVector2Macro(DisplaySize, int);
int* GetDisplaySize();
void GetDisplaySize(int &dsx, int &dsy);
+ void GetDisplaySize(int ds[2]);
//BTX
enum
Index: Views/vtkParallelCoordinatesRepresentation.h
===================================================================
--- Views/vtkParallelCoordinatesRepresentation.h (Revision 1677)
+++ Views/vtkParallelCoordinatesRepresentation.h (Arbeitskopie)
@@ -108,6 +108,7 @@
// Description:
// Set the title for the entire plot
void SetPlotTitle(const char*);
+ const char *GetPlotTitle();
// Description:
// Get the number of axes in the plot
Index: Views/vtkRenderView.cxx
===================================================================
--- Views/vtkRenderView.cxx (Revision 1677)
+++ Views/vtkRenderView.cxx (Arbeitskopie)
@@ -701,6 +701,11 @@
}
}
+void vtkRenderView::GetDisplaySize(int ds[2])
+{
+ this->GetDisplaySize(ds[0], ds[1]);
+}
+
void vtkRenderView::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
Index: Views/vtkParallelCoordinatesRepresentation.cxx
===================================================================
--- Views/vtkParallelCoordinatesRepresentation.cxx (Revision 1683)
+++ Views/vtkParallelCoordinatesRepresentation.cxx (Arbeitskopie)
@@ -1329,6 +1329,11 @@
this->PlotTitleActor->VisibilityOff();
}
}
+//------------------------------------------------------------------------------
+const char *vtkParallelCoordinatesRepresentation::GetPlotTitle()
+{
+ return this->PlotTitleActor->GetVisibility() ? this->PlotTitleMapper->GetInput() : "";
+}
//------------------------------------------------------------------------------
void vtkParallelCoordinatesRepresentation::SetNumberOfAxisLabels(int num)
Index: Graphics/vtkUnstructuredGridGeometryFilter.cxx
===================================================================
--- Graphics/vtkUnstructuredGridGeometryFilter.cxx (Revision 1683)
+++ Graphics/vtkUnstructuredGridGeometryFilter.cxx (Arbeitskopie)
@@ -786,6 +786,17 @@
}
}
+//----------------------------------------------------------------------------
+void vtkUnstructuredGridGeometryFilter::GetExtent(double extent[6])
+{
+ extent[0] = this->Extent[0];
+ extent[1] = this->Extent[1];
+ extent[2] = this->Extent[2];
+ extent[3] = this->Extent[3];
+ extent[4] = this->Extent[4];
+ extent[5] = this->Extent[5];
+}
+
//-----------------------------------------------------------------------------
int vtkUnstructuredGridGeometryFilter::RequestData(
vtkInformation *vtkNotUsed(request),
Index: Graphics/vtkStreamer.h
===================================================================
--- Graphics/vtkStreamer.h (Revision 1677)
+++ Graphics/vtkStreamer.h (Arbeitskopie)
@@ -95,6 +95,8 @@
// Description:
// Get the start position in global x-y-z coordinates.
double *GetStartPosition();
+ void GetStartPosition(double &x, double &y, double &z);
+ void GetStartPosition(double startPos[3]);
// Description:
// Specify the source object used to generate starting points.
Index: Graphics/vtkHyperStreamline.h
===================================================================
--- Graphics/vtkHyperStreamline.h (Revision 1677)
+++ Graphics/vtkHyperStreamline.h (Arbeitskopie)
@@ -102,6 +102,7 @@
// Description:
// Get the start position of the hyperstreamline in global x-y-z coordinates.
double *GetStartPosition();
+ void GetStartPosition(double x[3]);
// Description:
// Set / get the maximum length of the hyperstreamline expressed as absolute
Index: Graphics/vtkUnstructuredGridGeometryFilter.h
===================================================================
--- Graphics/vtkUnstructuredGridGeometryFilter.h (Revision 1677)
+++ Graphics/vtkUnstructuredGridGeometryFilter.h (Arbeitskopie)
@@ -97,6 +97,7 @@
// Set / get a (xmin,xmax, ymin,ymax, zmin,zmax) bounding box to clip data.
void SetExtent(double extent[6]);
double *GetExtent() { return this->Extent;};
+ void GetExtent(double extent[6]);
// Description:
// Turn on/off merging of coincident points. Note that is merging is
Index: Graphics/vtkStreamer.cxx
===================================================================
--- Graphics/vtkStreamer.cxx (Revision 1677)
+++ Graphics/vtkStreamer.cxx (Arbeitskopie)
@@ -215,6 +215,22 @@
return this->StartPosition;
}
+void vtkStreamer::GetStartPosition(double &x, double &y, double &z)
+{
+ double *startPosition = this->GetStartPosition();
+ x = startPosition[0];
+ y = startPosition[1];
+ z = startPosition[2];
+}
+
+void vtkStreamer::GetStartPosition(double startPos[3])
+{
+ double *startPosition = this->GetStartPosition();
+ startPos[0] = startPosition[0];
+ startPos[1] = startPosition[1];
+ startPos[2] = startPosition[2];
+}
+
VTK_THREAD_RETURN_TYPE vtkStreamer::ThreadedIntegrate( void *arg )
{
vtkStreamer *self;
Index: Graphics/vtkExtractUnstructuredGrid.cxx
===================================================================
--- Graphics/vtkExtractUnstructuredGrid.cxx (Revision 1677)
+++ Graphics/vtkExtractUnstructuredGrid.cxx (Arbeitskopie)
@@ -89,6 +89,16 @@
}
}
+void vtkExtractUnstructuredGrid::GetExtent(double extent[6])
+{
+ extent[0] = this->Extent[0];
+ extent[1] = this->Extent[1];
+ extent[2] = this->Extent[2];
+ extent[3] = this->Extent[3];
+ extent[4] = this->Extent[4];
+ extent[5] = this->Extent[5];
+}
+
// Extract cells and pass points and point data through. Also handles
// cell data.
int vtkExtractUnstructuredGrid::RequestData(
Index: Graphics/vtkGeometryFilter.h
===================================================================
--- Graphics/vtkGeometryFilter.h (Revision 1677)
+++ Graphics/vtkGeometryFilter.h (Arbeitskopie)
@@ -102,6 +102,7 @@
// Set / get a (xmin,xmax, ymin,ymax, zmin,zmax) bounding box to clip data.
void SetExtent(double extent[6]);
double *GetExtent() { return this->Extent;};
+ void GetExtent(double extent[6]);
// Description:
// Turn on/off merging of coincident points. Note that is merging is
Index: Graphics/vtkGeometryFilter.cxx
===================================================================
--- Graphics/vtkGeometryFilter.cxx (Revision 1677)
+++ Graphics/vtkGeometryFilter.cxx (Arbeitskopie)
@@ -111,6 +111,17 @@
}
//----------------------------------------------------------------------------
+void vtkGeometryFilter::GetExtent(double extent[6])
+{
+ extent[0] = this->Extent[0];
+ extent[1] = this->Extent[1];
+ extent[2] = this->Extent[2];
+ extent[3] = this->Extent[3];
+ extent[4] = this->Extent[4];
+ extent[5] = this->Extent[5];
+}
+
+//----------------------------------------------------------------------------
int vtkGeometryFilter::RequestData(
vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector,
Index: Graphics/vtkImageDataGeometryFilter.cxx
===================================================================
--- Graphics/vtkImageDataGeometryFilter.cxx (Revision 1677)
+++ Graphics/vtkImageDataGeometryFilter.cxx (Arbeitskopie)
@@ -463,6 +463,16 @@
}
}
+void vtkImageDataGeometryFilter::GetExtent(int extent[6])
+{
+ extent[0] = this->Extent[0];
+ extent[1] = this->Extent[1];
+ extent[2] = this->Extent[2];
+ extent[3] = this->Extent[3];
+ extent[4] = this->Extent[4];
+ extent[5] = this->Extent[5];
+}
+
int vtkImageDataGeometryFilter::FillInputPortInformation(int, vtkInformation *info)
{
info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkImageData");
Index: Graphics/vtkImageDataGeometryFilter.h
===================================================================
--- Graphics/vtkImageDataGeometryFilter.h (Revision 1677)
+++ Graphics/vtkImageDataGeometryFilter.h (Arbeitskopie)
@@ -52,6 +52,7 @@
void SetExtent(int extent[6]);
void SetExtent(int iMin, int iMax, int jMin, int jMax, int kMin, int kMax);
int *GetExtent() { return this->Extent;};
+ void GetExtent(int extent[6]);
// Description:
// Set ThresholdCells to true if you wish to skip any voxel/pixels which have scalar
Index: Graphics/vtkExtractUnstructuredGrid.h
===================================================================
--- Graphics/vtkExtractUnstructuredGrid.h (Revision 1677)
+++ Graphics/vtkExtractUnstructuredGrid.h (Arbeitskopie)
@@ -97,7 +97,8 @@
// Set / get a (xmin,xmax, ymin,ymax, zmin,zmax) bounding box to clip data.
void SetExtent(double extent[6]);
double *GetExtent() { return this->Extent;};
-
+ void GetExtent(double extent[6]);
+
// Description:
// Turn on/off merging of coincident points. Note that is merging is
// on, points with different point attributes (e.g., normals) are merged,
Index: Graphics/vtkHyperStreamline.cxx
===================================================================
--- Graphics/vtkHyperStreamline.cxx (Revision 1677)
+++ Graphics/vtkHyperStreamline.cxx (Arbeitskopie)
@@ -261,6 +261,12 @@
{
return this->StartPosition;
}
+void vtkHyperStreamline::GetStartPosition(double x[3])
+{
+ x[0] = this->StartPosition[0];
+ x[1] = this->StartPosition[1];
+ x[2] = this->StartPosition[2];
+}
// Make sure coordinate systems are consistent
static void FixVectors(double **prev, double **current, int iv, int ix, int iy)
Index: Widgets/vtkAngleRepresentation3D.h
===================================================================
--- Widgets/vtkAngleRepresentation3D.h (Revision 1677)
+++ Widgets/vtkAngleRepresentation3D.h (Arbeitskopie)
@@ -86,6 +86,7 @@
// Description:
// Scale text.
virtual void SetTextActorScale( double scale[3] );
+ virtual void GetTextActorScale( double scale[3] );
virtual double * GetTextActorScale();
// Description:
Index: Widgets/vtkButtonRepresentation.h
===================================================================
--- Widgets/vtkButtonRepresentation.h (Revision 1677)
+++ Widgets/vtkButtonRepresentation.h (Arbeitskopie)
@@ -50,6 +50,7 @@
// Description:
// Retrieve the current button state.
vtkSetClampMacro(NumberOfStates,int,1,VTK_LARGE_INTEGER);
+ vtkGetMacro(NumberOfStates,int);
// Description:
// Retrieve the current button state.
Index: Widgets/vtkAngleRepresentation3D.cxx
===================================================================
--- Widgets/vtkAngleRepresentation3D.cxx (Revision 1677)
+++ Widgets/vtkAngleRepresentation3D.cxx (Arbeitskopie)
@@ -366,6 +366,12 @@
}
//----------------------------------------------------------------------
+void vtkAngleRepresentation3D::GetTextActorScale( double scale[3] )
+{
+ this->TextActor->GetScale( scale );
+}
+
+//----------------------------------------------------------------------
double * vtkAngleRepresentation3D::GetTextActorScale()
{
return this->TextActor->GetScale();
Index: Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
===================================================================
--- Widgets/vtkAbstractPolygonalHandleRepresentation3D.h (Revision 1683)
+++ Widgets/vtkAbstractPolygonalHandleRepresentation3D.h (Arbeitskopie)
@@ -111,6 +111,7 @@
this->SetLabelTextScale(scale);
}
virtual double * GetLabelTextScale();
+ virtual void GetLabelTextScale( double scale[3] );
// Description:
// Get the label text actor
Index: Widgets/vtkLineRepresentation.cxx
===================================================================
--- Widgets/vtkLineRepresentation.cxx (Revision 1677)
+++ Widgets/vtkLineRepresentation.cxx (Arbeitskopie)
@@ -919,6 +919,12 @@
}
//----------------------------------------------------------------------
+void vtkLineRepresentation::GetDistanceAnnotationScale( double scale[3] )
+{
+ this->TextActor->GetScale(scale);
+}
+
+//----------------------------------------------------------------------
double * vtkLineRepresentation::GetDistanceAnnotationScale()
{
return this->TextActor->GetScale();
Index: Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx
===================================================================
--- Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx (Revision 1683)
+++ Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx (Arbeitskopie)
@@ -762,6 +762,12 @@
}
//----------------------------------------------------------------------
+void vtkAbstractPolygonalHandleRepresentation3D::GetLabelTextScale( double scale[3] )
+{
+ this->LabelTextActor->GetScale(scale);
+}
+
+//----------------------------------------------------------------------
void vtkAbstractPolygonalHandleRepresentation3D::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
Index: Widgets/vtkAxesTransformRepresentation.h
===================================================================
--- Widgets/vtkAxesTransformRepresentation.h (Revision 1677)
+++ Widgets/vtkAxesTransformRepresentation.h (Arbeitskopie)
@@ -132,6 +132,7 @@
}
virtual void SetLabelScale( double scale[3] );
virtual double * GetLabelScale();
+ virtual void GetLabelScale( double scale[3] );
// Description:
// Get the distance annotation property
Index: Widgets/vtkContourRepresentation.h
===================================================================
--- Widgets/vtkContourRepresentation.h (Revision 1683)
+++ Widgets/vtkContourRepresentation.h (Arbeitskopie)
@@ -396,6 +396,7 @@
void GetNodePolyData( vtkPolyData* poly );
vtkSetMacro(RebuildLocator,bool);
+ vtkGetMacro(RebuildLocator,bool);
protected:
vtkContourRepresentation();
Index: Widgets/vtkAxesTransformRepresentation.cxx
===================================================================
--- Widgets/vtkAxesTransformRepresentation.cxx (Revision 1683)
+++ Widgets/vtkAxesTransformRepresentation.cxx (Arbeitskopie)
@@ -309,6 +309,15 @@
return this->LabelActor->GetScale();
}
+//----------------------------------------------------------------------
+void vtkAxesTransformRepresentation::GetLabelScale( double scale[3] )
+{
+ double * s = this->LabelActor->GetScale();
+ scale[0] = s[0];
+ scale[1] = s[1];
+ scale[2] = s[2];
+}
+
//----------------------------------------------------------------------------
vtkProperty * vtkAxesTransformRepresentation::GetLabelProperty()
{
Index: Widgets/vtkLineRepresentation.h
===================================================================
--- Widgets/vtkLineRepresentation.h (Revision 1677)
+++ Widgets/vtkLineRepresentation.h (Arbeitskopie)
@@ -210,6 +210,7 @@
this->SetDistanceAnnotationScale(scale);
}
virtual void SetDistanceAnnotationScale( double scale[3] );
+ virtual void GetDistanceAnnotationScale( double scale[3] );
virtual double * GetDistanceAnnotationScale();
// Description:
Index: Infovis/vtkGraphAnnotationLayersFilter.cxx
===================================================================
--- Infovis/vtkGraphAnnotationLayersFilter.cxx (Revision 1683)
+++ Infovis/vtkGraphAnnotationLayersFilter.cxx (Arbeitskopie)
@@ -87,6 +87,11 @@
this->ConvexHullFilter->SetOutline(b);
}
+bool vtkGraphAnnotationLayersFilter::GetOutline()
+{
+ return this->ConvexHullFilter->GetOutline();
+}
+
//-----------------------------------------------------------------------------
void vtkGraphAnnotationLayersFilter::SetScaleFactor(double scale)
{
@@ -94,6 +99,12 @@
}
//-----------------------------------------------------------------------------
+double vtkGraphAnnotationLayersFilter::GetScaleFactor()
+{
+ return this->ConvexHullFilter->GetScaleFactor();
+}
+
+//-----------------------------------------------------------------------------
void vtkGraphAnnotationLayersFilter::SetHullShapeToBoundingRectangle()
{
this->ConvexHullFilter->SetHullShape(vtkConvexHull2D::BoundingRectangle);
@@ -111,12 +122,22 @@
this->ConvexHullFilter->SetMinHullSizeInWorld(size);
}
+double vtkGraphAnnotationLayersFilter::GetMinHullSizeInWorld()
+{
+ return this->ConvexHullFilter->GetMinHullSizeInWorld();
+}
+
//-----------------------------------------------------------------------------
void vtkGraphAnnotationLayersFilter::SetMinHullSizeInDisplay(int size)
{
this->ConvexHullFilter->SetMinHullSizeInDisplay(size);
}
+int vtkGraphAnnotationLayersFilter::GetMinHullSizeInDisplay()
+{
+ return this->ConvexHullFilter->GetMinHullSizeInDisplay();
+}
+
//-----------------------------------------------------------------------------
void vtkGraphAnnotationLayersFilter::SetRenderer(vtkRenderer* renderer)
{
Index: Infovis/vtkStrahlerMetric.h
===================================================================
--- Infovis/vtkStrahlerMetric.h (Revision 1677)
+++ Infovis/vtkStrahlerMetric.h (Arbeitskopie)
@@ -57,6 +57,7 @@
// be stored within the output vertex data.
// Default is "Strahler"
vtkSetStringMacro(MetricArrayName);
+ vtkGetStringMacro(MetricArrayName);
// Description:
// Set/get setting of normalize flag. If this is set, the
Index: Infovis/vtkVertexDegree.h
===================================================================
--- Infovis/vtkVertexDegree.h (Revision 1677)
+++ Infovis/vtkVertexDegree.h (Arbeitskopie)
@@ -41,6 +41,7 @@
// Set the output array name. If no output array name is
// set then the name 'VertexDegree' is used.
vtkSetStringMacro(OutputArrayName);
+ vtkGetStringMacro(OutputArrayName);
protected:
vtkVertexDegree();
Index: Infovis/vtkPairwiseExtractHistogram2D.h
===================================================================
--- Infovis/vtkPairwiseExtractHistogram2D.h (Revision 1677)
+++ Infovis/vtkPairwiseExtractHistogram2D.h (Arbeitskopie)
@@ -66,6 +66,7 @@
// column range. This was (probably) necessary to get this class
// to interact with the ParaView client/server message passing interface.
vtkSetMacro(CustomColumnRangeIndex,int);
+ vtkGetMacro(CustomColumnRangeIndex,int);
void SetCustomColumnRangeByIndex(double,double);
// Description:
Index: Infovis/vtkKCoreLayout.h
===================================================================
--- Infovis/vtkKCoreLayout.h (Revision 1683)
+++ Infovis/vtkKCoreLayout.h (Arbeitskopie)
@@ -72,6 +72,7 @@
// Set the name of the vertex attribute array storing k-core labels.
// Default: kcore
vtkSetStringMacro(KCoreLabelArrayName);
+ vtkGetStringMacro(KCoreLabelArrayName);
// Description:
// Output polar coordinates for vertices if True. Default column names are
Index: Infovis/vtkKCoreDecomposition.h
===================================================================
--- Infovis/vtkKCoreDecomposition.h (Revision 1683)
+++ Infovis/vtkKCoreDecomposition.h (Arbeitskopie)
@@ -54,6 +54,7 @@
// Set the output array name. If no output array name is
// set then the name 'KCoreDecompositionNumbers' is used.
vtkSetStringMacro(OutputArrayName);
+ vtkGetStringMacro(OutputArrayName);
// Description:
// Directed graphs only. Use only the in edges to
Index: Infovis/vtkGraphAnnotationLayersFilter.h
===================================================================
--- Infovis/vtkGraphAnnotationLayersFilter.h (Revision 1683)
+++ Infovis/vtkGraphAnnotationLayersFilter.h (Arbeitskopie)
@@ -66,11 +66,13 @@
void OutlineOn();
void OutlineOff();
void SetOutline(bool b);
+ bool GetOutline();
// Description:
// Scale each hull by the amount specified. Defaults to 1.0.
void SetScaleFactor(double scale);
-
+ double GetScaleFactor();
+
// Description:
// Set the shape of the hulls to bounding rectangle.
void SetHullShapeToBoundingRectangle();
@@ -83,11 +85,13 @@
// Set the minimum x,y-dimensions of each hull in world coordinates. Defaults
// to 1.0. Set to 0.0 to disable.
void SetMinHullSizeInWorld(double size);
+ double GetMinHullSizeInWorld();
// Description:
// Set the minimum x,y-dimensions of each hull in pixels. You must also set a
// vtkRenderer. Defaults to 1. Set to 0 to disable.
void SetMinHullSizeInDisplay(int size);
+ int GetMinHullSizeInDisplay();
// Description:
// Renderer needed for MinHullSizeInDisplay calculation. Not reference counted.
Index: Charts/vtkBrush.h
===================================================================
--- Charts/vtkBrush.h (Revision 1683)
+++ Charts/vtkBrush.h (Arbeitskopie)
@@ -47,11 +47,13 @@
// Set the color of the brush with three component doubles (RGB), ranging from
// 0.0 to 1.0.
void SetColorF(double r, double g, double b);
+ void GetColorF(double &r, double &g, double &b) const;
// Description:
// Set the color of the brush with four component doubles (RGBA), ranging from
// 0.0 to 1.0.
void SetColorF(double r, double g, double b, double a);
+ void GetColorF(double &r, double &g, double &b, double &a) const;
// Description:
// Set the opacity with a double, ranging from 0.0 (transparent) to 1.0
@@ -71,6 +73,7 @@
// Set the color of the brush with three component unsigned chars (RGB),
// ranging from 0 to 255.
void SetColor(unsigned char r, unsigned char g, unsigned char b);
+ void GetColor(unsigned char &r, unsigned char &g, unsigned char &b) const;
// Description:
// Set the color of the brush with four component unsigned chars (RGBA),
@@ -78,6 +81,8 @@
void SetColor(unsigned char r, unsigned char g, unsigned char b,
unsigned char a);
void SetColor(const vtkColor4ub &color);
+ void GetColor(unsigned char &r, unsigned char &g, unsigned char &b,
+ unsigned char &a) const;
// Description:
// Set the opacity with an unsigned char, ranging from 0 (transparent) to 255
Index: Charts/vtkPen.cxx
===================================================================
--- Charts/vtkPen.cxx (Revision 1683)
+++ Charts/vtkPen.cxx (Arbeitskopie)
@@ -65,6 +65,14 @@
}
//-----------------------------------------------------------------------------
+void vtkPen::GetColorF(double &r, double &g, double &b) const
+{
+ r = this->Color[0] / 255.0;
+ g = this->Color[1] / 255.0;
+ b = this->Color[2] / 255.0;
+}
+
+//-----------------------------------------------------------------------------
void vtkPen::SetColorF(double r, double g, double b, double a)
{
this->Color[0] = static_cast<unsigned char>(r * 255.0);
@@ -74,12 +82,27 @@
}
//-----------------------------------------------------------------------------
+void vtkPen::GetColorF(double &r, double &g, double &b, double &a) const
+{
+ r = this->Color[0] / 255.0;
+ g = this->Color[1] / 255.0;
+ b = this->Color[2] / 255.0;
+ a = this->Color[3] / 255.0;
+}
+
+//-----------------------------------------------------------------------------
void vtkPen::SetOpacityF(double a)
{
this->Color[3] = static_cast<unsigned char>(a * 255.0);
}
//-----------------------------------------------------------------------------
+double vtkPen::GetOpacityF() const
+{
+ return this->Color[3] / 255.0;
+}
+
+//-----------------------------------------------------------------------------
void vtkPen::SetColor(unsigned char color[3])
{
this->Color[0] = color[0];
@@ -96,6 +119,14 @@
}
//-----------------------------------------------------------------------------
+void vtkPen::GetColor(unsigned char &r, unsigned char &g, unsigned char &b) const
+{
+ r = this->Color[0];
+ g = this->Color[1];
+ b = this->Color[2];
+}
+
+//-----------------------------------------------------------------------------
void vtkPen::SetColor(unsigned char r, unsigned char g, unsigned char b,
unsigned char a)
{
@@ -105,6 +136,17 @@
this->Color[3] = a;
}
+//-----------------------------------------------------------------------------
+void vtkPen::GetColor(unsigned char &r, unsigned char &g, unsigned char &b,
+ unsigned char &a) const
+{
+ r = this->Color[0];
+ g = this->Color[1];
+ b = this->Color[2];
+ a = this->Color[3];
+}
+
+//-----------------------------------------------------------------------------
void vtkPen::SetColor(const vtkColor4ub &color)
{
this->PenColor = color;
Index: Charts/vtkPen.h
===================================================================
--- Charts/vtkPen.h (Revision 1677)
+++ Charts/vtkPen.h (Arbeitskopie)
@@ -66,16 +66,19 @@
// Set the color of the brush with three component doubles (RGB), ranging from
// 0.0 to 1.0.
void SetColorF(double r, double g, double b);
+ void GetColorF(double &r, double &g, double &b) const;
// Description:
// Set the color of the brush with four component doubles (RGBA), ranging from
// 0.0 to 1.0.
void SetColorF(double r, double g, double b, double a);
+ void GetColorF(double &r, double &g, double &b, double &a) const;
// Description:
// Set the opacity with a double, ranging from 0.0 (transparent) to 1.0
// (opaque).
void SetOpacityF(double a);
+ double GetOpacityF() const;
// Description:
// Set the color of the brush with three component unsigned chars (RGB),
@@ -86,6 +89,7 @@
// Set the color of the brush with three component unsigned chars (RGB),
// ranging from 0 to 255.
void SetColor(unsigned char r, unsigned char g, unsigned char b);
+ void GetColor(unsigned char &r, unsigned char &g, unsigned char &b) const;
// Description:
// Set the color of the brush with four component unsigned chars (RGBA),
@@ -93,6 +97,8 @@
void SetColor(unsigned char r, unsigned char g, unsigned char b,
unsigned char a);
void SetColor(const vtkColor4ub &color);
+ void GetColor(unsigned char &r, unsigned char &g, unsigned char &b,
+ unsigned char &a) const;
// Description:
// Set the opacity with an unsigned char, ranging from 0 (transparent) to 255
Index: Charts/vtkBrush.cxx
===================================================================
--- Charts/vtkBrush.cxx (Revision 1683)
+++ Charts/vtkBrush.cxx (Arbeitskopie)
@@ -58,6 +58,14 @@
}
//-----------------------------------------------------------------------------
+void vtkBrush::GetColorF(double &r, double &g, double &b) const
+{
+ r = this->Color[0] / 255.0;
+ g = this->Color[1] / 255.0;
+ b = this->Color[2] / 255.0;
+}
+
+//-----------------------------------------------------------------------------
void vtkBrush::SetColorF(double r, double g, double b, double a)
{
this->Color[0] = static_cast<unsigned char>(r * 255.0);
@@ -67,6 +75,15 @@
}
//-----------------------------------------------------------------------------
+void vtkBrush::GetColorF(double &r, double &g, double &b, double &a) const
+{
+ r = this->Color[0] / 255.0;
+ g = this->Color[1] / 255.0;
+ b = this->Color[2] / 255.0;
+ a = this->Color[3] / 255.0;
+}
+
+//-----------------------------------------------------------------------------
void vtkBrush::SetOpacityF(double a)
{
this->Color[3] = static_cast<unsigned char>(a * 255.0);
@@ -95,6 +112,14 @@
}
//-----------------------------------------------------------------------------
+void vtkBrush::GetColor(unsigned char &r, unsigned char &g, unsigned char &b) const
+{
+ r = this->Color[0];
+ g = this->Color[1];
+ b = this->Color[2];
+}
+
+//-----------------------------------------------------------------------------
void vtkBrush::SetColor(unsigned char r, unsigned char g, unsigned char b,
unsigned char a)
{
@@ -105,6 +130,16 @@
}
//-----------------------------------------------------------------------------
+void vtkBrush::GetColor(unsigned char &r, unsigned char &g, unsigned char &b,
+ unsigned char &a) const
+{
+ r = this->Color[0];
+ g = this->Color[1];
+ b = this->Color[2];
+ a = this->Color[3];
+}
+
+//-----------------------------------------------------------------------------
void vtkBrush::SetColor(const vtkColor4ub &color)
{
this->BrushColor = color;
|