Commit 2964c66a authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'mark_accelerators_as_legacy'

94866116 Mark the entire Accelerators Dax module as legacy as of 6.3
7ae792fa Mark the entire Accelerators Piston module as legacy as of 6.3
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarDavid E DeMarle <dave.demarle@kitware.com>
Merge-request: !425
parents fa3af901 94866116
vtk_module(vtkAcceleratorsDax
IMPLEMENTS
vtkFiltersCore
DEPENDS
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
vtkFiltersCore
vtkFiltersGeometry
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRenderingVolume
vtkRenderingVolumeOpenGL
vtkIOLegacy
vtkIOXML
vtkImagingSources
EXCLUDE_FROM_ALL
)
if(NOT VTK_LEGACY_REMOVE)
vtk_module(vtkAcceleratorsDax
IMPLEMENTS
vtkFiltersCore
DEPENDS
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
vtkFiltersCore
vtkFiltersGeometry
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRenderingVolume
vtkRenderingVolumeOpenGL
vtkIOLegacy
vtkIOXML
vtkImagingSources
EXCLUDE_FROM_ALL
)
endif()
......@@ -39,6 +39,7 @@ namespace vtkDax {
//------------------------------------------------------------------------------
vtkDaxContour::vtkDaxContour()
{
VTK_LEGACY_BODY(vtkDaxContour::vtkDaxContour, "VTK 6.3");
}
//------------------------------------------------------------------------------
......
......@@ -35,7 +35,7 @@ vtkStandardNewMacro(vtkDaxThreshold)
//------------------------------------------------------------------------------
vtkDaxThreshold::vtkDaxThreshold()
{
VTK_LEGACY_BODY(vtkDaxContour::vtkDaxContour, "VTK 6.3");
}
//------------------------------------------------------------------------------
......
if(VTK_LEGACY_REMOVE)
message(STATUS
"vtkAcceleratorsPiston can not be enabled as it has been "
"marked for deprecation and legacy code has been disabled in this "
"build.")
return()
endif()
find_package(CUDA REQUIRED)
find_path(PISTON_INCLUDE
PistonCodingStyle.xml
......
vtk_module(vtkAcceleratorsPiston
DEPENDS
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
vtkRenderingCore
vtkRenderingOpenGL
vtkIOImage #from piston
vtkImagingHybrid #from piston
TEST_DEPENDS
vtkTestingRendering
vtkInteractionStyle
vtkInteractionWidgets
vtkImagingSources
vtkParallelCore
vtkParallelMPI
vtkRenderingParallel
EXCLUDE_FROM_ALL
)
if(NOT VTK_LEGACY_REMOVE)
vtk_module(vtkAcceleratorsPiston
DEPENDS
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
vtkRenderingCore
vtkRenderingOpenGL
vtkIOImage #from piston
vtkImagingHybrid #from piston
TEST_DEPENDS
vtkTestingRendering
vtkInteractionStyle
vtkInteractionWidgets
vtkImagingSources
vtkParallelCore
vtkParallelMPI
vtkRenderingParallel
EXCLUDE_FROM_ALL
)
endif()
......@@ -37,6 +37,7 @@ vtkStandardNewMacro(vtkDataSetToPiston);
//----------------------------------------------------------------------------
vtkDataSetToPiston::vtkDataSetToPiston()
{
VTK_LEGACY_BODY(vtkDataSetToPiston::vtkDataSetToPiston, "VTK 6.3");
}
//----------------------------------------------------------------------------
......
......@@ -29,6 +29,8 @@ vtkStandardNewMacro(vtkPistonAlgorithm);
//----------------------------------------------------------------------------
vtkPistonAlgorithm::vtkPistonAlgorithm()
{
VTK_LEGACY_BODY(vtkPistonAlgorithm::vtkPistonAlgorithm, "VTK 6.3");
// by default assume filters have one input and one output
// subclasses that deviate should modify this setting
this->SetNumberOfInputPorts(1);
......
......@@ -29,6 +29,7 @@ namespace vtkpiston {
//----------------------------------------------------------------------------
vtkPistonContour::vtkPistonContour()
{
VTK_LEGACY_BODY(vtkPistonContour::vtkPistonContour, "VTK 6.3");
this->IsoValue = 0.0;
}
......
......@@ -26,6 +26,8 @@ vtkStandardNewMacro(vtkPistonDataObject);
//----------------------------------------------------------------------------
vtkPistonDataObject::vtkPistonDataObject()
{
VTK_LEGACY_BODY(vtkPistonDataObject::vtkPistonDataObject, "VTK 6.3");
//cerr << "PDO(" << this << ") Create" << endl;
this->Information->Set(vtkDataObject::DATA_EXTENT_TYPE(), VTK_PIECES_EXTENT);
this->Information->Set(vtkDataObject::DATA_PIECE_NUMBER(), -1);
......
......@@ -115,6 +115,8 @@ void vtkPistonMapper::InitCudaGL(vtkRenderWindow *rw)
//-----------------------------------------------------------------------------
vtkPistonMapper::vtkPistonMapper()
{
VTK_LEGACY_BODY(vtkPistonMapper::vtkPistonMapper, "VTK 6.3");
//cerr << "PM(" << this << ") create" << endl;
vtkMath::UninitializeBounds(this->Bounds);
this->Center[0] = this->Center[1] = this->Center[2] = 0.0;
......
......@@ -38,6 +38,7 @@ public:
vtkPistonReference() : mtime(0), type(-1), data(NULL)
{
VTK_LEGACY_BODY(vtkPistonReference::vtkPistonReference, "VTK 6.3");
//cerr << "TR(" << this << ") CREATE" << endl;
}
......
......@@ -15,6 +15,7 @@ vtkPistonScalarsColors::vtkPistonScalarsColors() : vtkObject(),
NumberOfValues(256),
LookupTable(0)
{
VTK_LEGACY_BODY(vtkPistonScalarsColors::vtkPistonScalarsColors, "VTK 6.3");
this->TableRange[0] = this->TableRange[1] = 0.0;
this->ComputeColorsTime.Modified();
this->ComputeColorsfTime.Modified();
......
......@@ -30,6 +30,7 @@ namespace vtkpiston {
//----------------------------------------------------------------------------
vtkPistonSlice::vtkPistonSlice()
{
VTK_LEGACY_BODY(vtkPistonSlice::vtkPistonSlice, "VTK 6.3");
this->Plane = vtkPlane::New();
this->Offset = 0.0;
}
......
......@@ -33,7 +33,7 @@ public:
void PrintSelf(ostream& os, vtkIndent indent);
protected:
vtkPistonSort() {}
vtkPistonSort() {VTK_LEGACY_BODY(vtkPistonSort::vtkPistonSort, "VTK 6.3");}
~vtkPistonSort() {}
// Description:
......
......@@ -29,6 +29,7 @@ namespace vtkpiston {
//----------------------------------------------------------------------------
vtkPistonThreshold::vtkPistonThreshold()
{
VTK_LEGACY_BODY(vtkPistonThreshold::vtkPistonThreshold, "VTK 6.3");
this->MinValue = 0.0;
this->MaxValue = 0.0;
}
......
......@@ -37,6 +37,7 @@ vtkStandardNewMacro(vtkPistonToDataSet);
//----------------------------------------------------------------------------
vtkPistonToDataSet::vtkPistonToDataSet()
{
VTK_LEGACY_BODY(vtkPistonToDataSet::vtkPistonToDataSet, "VTK 6.3");
this->OutputDataSetType = VTK_POLY_DATA;
}
......
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