Commit dd48976d authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri
parent 9208156b
set(Module_Deprecated_SRCS)
if(NOT VTK_LEGACY_REMOVE)
list(APPEND Module_Deprecated_SRCS
vtkGeoAdaptiveArcs.cxx
vtkGeoAlignedImageRepresentation.cxx
vtkGeoAlignedImageSource.cxx
vtkGeoArcs.cxx
vtkGeoAssignCoordinates.cxx
vtkGeoCamera.cxx
vtkGeoFileImageSource.cxx
vtkGeoFileTerrainSource.cxx
vtkGeoGlobeSource.cxx
vtkGeoGraticule.cxx
vtkGeoImageNode.cxx
vtkGeoInteractorStyle.cxx
vtkGeoProjectionSource.cxx
vtkGeoRandomGraphSource.cxx
vtkGeoSampleArcs.cxx
vtkGeoSource.cxx
vtkGeoSphereTransform.cxx
vtkGeoTerrain.cxx
vtkGeoTerrain2D.cxx
vtkGeoTerrainNode.cxx
vtkGeoTreeNode.cxx
vtkGeoTreeNodeCache.cxx
vtkGlobeSource.cxx
)
endif()
set(Module_SRCS
${Module_Deprecated_SRCS}
vtkCompassRepresentation.cxx
vtkCompassWidget.cxx
vtkGeoAdaptiveArcs.cxx
vtkGeoAlignedImageRepresentation.cxx
vtkGeoAlignedImageSource.cxx
vtkGeoArcs.cxx
vtkGeoAssignCoordinates.cxx
vtkGeoCamera.cxx
vtkGeoFileImageSource.cxx
vtkGeoFileTerrainSource.cxx
vtkGeoGlobeSource.cxx
vtkGeoGraticule.cxx
vtkGeoImageNode.cxx
vtkGeoInteractorStyle.cxx
vtkGeoProjection.cxx
vtkGeoProjectionSource.cxx
vtkGeoRandomGraphSource.cxx
vtkGeoSampleArcs.cxx
vtkGeoSource.cxx
vtkGeoSphereTransform.cxx
vtkGeoTerrain.cxx
vtkGeoTerrain2D.cxx
vtkGeoTerrainNode.cxx
vtkGeoTransform.cxx
vtkGeoTreeNode.cxx
vtkGeoTreeNodeCache.cxx
vtkGlobeSource.cxx
)
vtk_module_library(vtkGeovisCore ${Module_SRCS})
......@@ -43,6 +43,7 @@ vtkStandardNewMacro(vtkGeoAdaptiveArcs);
//-------------------------------------------------------------------------
vtkGeoAdaptiveArcs::vtkGeoAdaptiveArcs()
{
VTK_LEGACY_BODY(vtkGeoAdaptiveArcs::vtkGeoAdaptiveArcs, "VTK 8.2");
this->GlobeRadius = vtkGeoMath::EarthRadiusMeters();
this->Renderer = nullptr;
this->MaximumPixelSeparation = 10.0;
......
......@@ -35,6 +35,7 @@ class vtkDoubleArray;
class vtkPolyData;
class vtkRenderer;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoAdaptiveArcs : public vtkPolyDataAlgorithm
{
public:
......@@ -111,4 +112,5 @@ private:
void operator=(const vtkGeoAdaptiveArcs&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -134,6 +134,9 @@ vtkCxxSetObjectMacro(vtkGeoAlignedImageRepresentation, GeoSource, vtkGeoSource);
//----------------------------------------------------------------------------
vtkGeoAlignedImageRepresentation::vtkGeoAlignedImageRepresentation()
{
VTK_LEGACY_BODY(
vtkGeoAlignedImageRepresentation::vtkGeoAlignedImageRepresentation,
"VTK 8.2");
this->GeoSource = nullptr;
this->Root = vtkGeoImageNode::New();
this->Cache = vtkGeoTreeNodeCache::New();
......
......@@ -38,6 +38,7 @@ class vtkGeoImageNode;
class vtkGeoSource;
class vtkGeoTreeNodeCache;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoAlignedImageRepresentation : public vtkDataRepresentation
{
public:
......@@ -102,4 +103,5 @@ private:
void operator=(const vtkGeoAlignedImageRepresentation&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -77,6 +77,8 @@ private:
//----------------------------------------------------------------------------
vtkGeoAlignedImageSource::vtkGeoAlignedImageSource()
{
VTK_LEGACY_BODY(vtkGeoAlignedImageSource::vtkGeoAlignedImageSource,
"VTK 8.2");
this->Image = nullptr;
this->LevelImages = vtkMultiBlockDataSet::New();
this->LatitudeRange[0] = -90;
......@@ -425,4 +427,3 @@ int vtkGeoAlignedImageSource::PowerOfTwo(int val)
}
return tmp;
}
......@@ -40,6 +40,7 @@ class vtkGeoImageNode;
class vtkImageData;
class vtkMultiBlockDataSet;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoAlignedImageSource : public vtkGeoSource
{
public:
......@@ -114,4 +115,5 @@ private:
void operator=(const vtkGeoAlignedImageSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -34,6 +34,7 @@ vtkStandardNewMacro(vtkGeoArcs);
vtkGeoArcs::vtkGeoArcs()
{
VTK_LEGACY_BODY(vtkGeoArcs::vtkGeoArcs, "VTK 8.2");
this->GlobeRadius = vtkGeoMath::EarthRadiusMeters();
this->ExplodeFactor = 0.2;
this->NumberOfSubdivisions = 20;
......
......@@ -33,6 +33,7 @@
#include "vtkGeovisCoreModule.h" // For export macro
#include "vtkPolyDataAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoArcs : public vtkPolyDataAlgorithm
{
public:
......@@ -86,4 +87,5 @@ private:
void operator=(const vtkGeoArcs&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -38,6 +38,7 @@ vtkStandardNewMacro(vtkGeoAssignCoordinates);
vtkGeoAssignCoordinates::vtkGeoAssignCoordinates()
{
VTK_LEGACY_BODY(vtkGeoAssignCoordinates::vtkGeoAssignCoordinates, "VTK 8.2");
this->LongitudeArrayName = nullptr;
this->LatitudeArrayName = nullptr;
this->CoordinatesInArrays = true;
......
......@@ -40,6 +40,7 @@
class vtkAbstractTransform;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoAssignCoordinates : public vtkPassInputTypeAlgorithm
{
public:
......@@ -114,5 +115,6 @@ private:
void operator=(const vtkGeoAssignCoordinates&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -33,6 +33,7 @@ vtkStandardNewMacro(vtkGeoCamera);
//----------------------------------------------------------------------------
vtkGeoCamera::vtkGeoCamera()
{
VTK_LEGACY_BODY(vtkGeoCamera::vtkGeoCamera, "VTK 8.2");
this->VTKCamera = vtkSmartPointer<vtkCamera>::New();
this->Transform = vtkSmartPointer<vtkTransform>::New();
......@@ -433,4 +434,3 @@ vtkCamera* vtkGeoCamera::GetVTKCamera()
{
return this->VTKCamera;
}
......@@ -80,6 +80,7 @@ class vtkCamera;
class vtkGeoTerrainNode;
class vtkTransform;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoCamera : public vtkObject
{
public:
......@@ -245,4 +246,5 @@ private:
void operator=(const vtkGeoCamera&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -40,6 +40,7 @@ vtkStandardNewMacro(vtkGeoFileImageSource);
//----------------------------------------------------------------------------
vtkGeoFileImageSource::vtkGeoFileImageSource()
{
VTK_LEGACY_BODY(vtkGeoFileImageSource::vtkGeoFileImageSource, "VTK 8.2");
this->Path = nullptr;
}
......
......@@ -38,6 +38,7 @@
class vtkGeoImageNode;
class vtkGeoTreeNode;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoFileImageSource : public vtkGeoSource
{
public:
......@@ -77,4 +78,5 @@ private:
char* Path;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -36,6 +36,7 @@ vtkStandardNewMacro(vtkGeoFileTerrainSource);
//----------------------------------------------------------------------------
vtkGeoFileTerrainSource::vtkGeoFileTerrainSource()
{
VTK_LEGACY_BODY(vtkGeoFileTerrainSource::vtkGeoFileTerrainSource, "VTK 8.2");
this->Path = nullptr;
}
......
......@@ -38,6 +38,7 @@
class vtkGeoTerrainNode;
class vtkGeoTreeNode;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoFileTerrainSource : public vtkGeoSource
{
public:
......@@ -77,4 +78,5 @@ private:
char* Path;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -26,7 +26,10 @@
vtkStandardNewMacro(vtkGeoGlobeSource);
//----------------------------------------------------------------------------
vtkGeoGlobeSource::vtkGeoGlobeSource() = default;
vtkGeoGlobeSource::vtkGeoGlobeSource()
{
VTK_LEGACY_BODY(vtkGeoGlobeSource::vtkGeoGlobeSource, "VTK 8.2");
}
//----------------------------------------------------------------------------
vtkGeoGlobeSource::~vtkGeoGlobeSource() = default;
......
......@@ -34,6 +34,7 @@
class vtkGeoTerrainNode;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoGlobeSource : public vtkGeoSource
{
public:
......@@ -60,4 +61,5 @@ private:
void operator=(const vtkGeoGlobeSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -69,6 +69,7 @@ double vtkGeoGraticule::LongitudeLevelTics[12] =
vtkGeoGraticule::vtkGeoGraticule()
{
VTK_LEGACY_BODY(vtkGeoGraticule::vtkGeoGraticule, "VTK 8.2");
this->SetNumberOfInputPorts( 0 );
this->LatitudeLevel = 2;
this->LongitudeLevel = 1;
......
......@@ -39,6 +39,7 @@
class vtkPolyData;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoGraticule : public vtkPolyDataAlgorithm
{
public:
......@@ -140,4 +141,5 @@ private:
void operator = ( const vtkGeoGraticule& ) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif // vtkGeoGraticule_h
......@@ -30,6 +30,7 @@ vtkStandardNewMacro(vtkGeoImageNode);
//----------------------------------------------------------------------------
vtkGeoImageNode::vtkGeoImageNode()
{
VTK_LEGACY_BODY(vtkGeoImageNode::vtkGeoImageNode, "VTK 8.2");
this->Image = vtkSmartPointer<vtkImageData>::New();
this->Texture = vtkSmartPointer<vtkTexture>::New();
}
......
......@@ -40,6 +40,7 @@
class vtkPolyData;
class vtkTexture;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoImageNode : public vtkGeoTreeNode
{
public:
......@@ -119,4 +120,5 @@ private:
void operator=(const vtkGeoImageNode&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -68,6 +68,7 @@ namespace
//----------------------------------------------------------------------------
vtkGeoInteractorStyle::vtkGeoInteractorStyle()
{
VTK_LEGACY_BODY(vtkGeoInteractorStyle::vtkGeoInteractorStyle, "VTK 8.2");
vtkEventCommand* rc = new vtkEventCommand(this);
this->EventCommand = rc;
rc->UnRegister(nullptr);
......
......@@ -43,6 +43,7 @@ class vtkCompassWidget;
class vtkGeoCamera;
class vtkUnsignedCharArray;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoInteractorStyle :
public vtkInteractorStyleTrackballCamera
{
......@@ -167,4 +168,5 @@ private:
void operator=(const vtkGeoInteractorStyle&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -88,6 +88,7 @@ vtkCxxSetObjectMacro(vtkGeoProjectionSource, Transform, vtkAbstractTransform);
//----------------------------------------------------------------------------
vtkGeoProjectionSource::vtkGeoProjectionSource()
{
VTK_LEGACY_BODY(vtkGeoProjectionSource::vtkGeoProjectionSource, "VTK 8.2");
this->Projection=0;
this->Transform = nullptr;
this->MinCellsPerNode = 20;
......@@ -488,4 +489,3 @@ vtkAbstractTransform* vtkGeoProjectionSource::GetTransform()
{
return this->Transform;
}
......@@ -38,6 +38,7 @@ class vtkAbstractTransform;
class vtkGeoTerrainNode;
class vtkMutexLock;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoProjectionSource : public vtkGeoSource
{
public:
......@@ -91,4 +92,5 @@ private:
void operator=(const vtkGeoProjectionSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -32,7 +32,10 @@ vtkStandardNewMacro(vtkGeoRandomGraphSource);
// ----------------------------------------------------------------------
vtkGeoRandomGraphSource::vtkGeoRandomGraphSource() = default;
vtkGeoRandomGraphSource::vtkGeoRandomGraphSource()
{
VTK_LEGACY_BODY(vtkGeoRandomGraphSource::vtkGeoRandomGraphSource, "VTK 8.2");
}
// ----------------------------------------------------------------------
......@@ -76,4 +79,3 @@ int vtkGeoRandomGraphSource::RequestData(
return 1;
}
......@@ -43,6 +43,7 @@
class vtkGraph;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoRandomGraphSource : public vtkRandomGraphSource
{
public:
......@@ -64,5 +65,6 @@ private:
void operator=(const vtkGeoRandomGraphSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -40,6 +40,7 @@ vtkStandardNewMacro(vtkGeoSampleArcs);
vtkGeoSampleArcs::vtkGeoSampleArcs()
{
VTK_LEGACY_BODY(vtkGeoSampleArcs::vtkGeoSampleArcs, "VTK 8.2");
this->GlobeRadius = vtkGeoMath::EarthRadiusMeters();
this->MaximumDistanceMeters = 100000.0;
this->InputCoordinateSystem = RECTANGULAR;
......@@ -182,4 +183,3 @@ void vtkGeoSampleArcs::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "InputCoordinateSystem: " << this->InputCoordinateSystem << endl;
os << indent << "OutputCoordinateSystem: " << this->OutputCoordinateSystem << endl;
}
......@@ -35,6 +35,7 @@
#include "vtkGeovisCoreModule.h" // For export macro
#include "vtkPolyDataAlgorithm.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoSampleArcs : public vtkPolyDataAlgorithm
{
public:
......@@ -114,4 +115,5 @@ private:
void operator=(const vtkGeoSampleArcs&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -50,6 +50,7 @@ public:
vtkGeoSource::vtkGeoSource()
{
VTK_LEGACY_BODY(vtkGeoSource::vtkGeoSource, "VTK 8.2");
this->InputSet = vtkCollection::New();
this->InputSetLock = vtkMutexLock::New();
this->ProcessingSet = vtkCollection::New();
......@@ -247,4 +248,3 @@ void vtkGeoSource::WorkerThread()
}
}
}
......@@ -51,6 +51,7 @@ class vtkGeoTreeNode;
class vtkMultiThreader;
class vtkMutexLock;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoSource : public vtkObject
{
public:
......@@ -128,4 +129,5 @@ private:
void operator=(const vtkGeoSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif // vtkGeoSource_h
......@@ -31,6 +31,7 @@ vtkStandardNewMacro(vtkGeoSphereTransform);
vtkGeoSphereTransform::vtkGeoSphereTransform()
{
VTK_LEGACY_BODY(vtkGeoSphereTransform::vtkGeoSphereTransform, "VTK 8.2");
this->ToRectangular = true;
this->BaseAltitude = 0.0;
}
......@@ -109,4 +110,3 @@ vtkAbstractTransform* vtkGeoSphereTransform::MakeTransform()
vtkGeoSphereTransform* geoTrans = vtkGeoSphereTransform::New();
return geoTrans;
}
......@@ -37,6 +37,7 @@
class vtkGeoProjection;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoSphereTransform : public vtkAbstractTransform
{
public:
......@@ -107,4 +108,5 @@ private:
void operator = ( const vtkGeoSphereTransform& ) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif // vtkGeoSphereTransform_h
......@@ -64,6 +64,7 @@ vtkCxxSetObjectMacro(vtkGeoTerrain, GeoCamera, vtkGeoCamera);
//----------------------------------------------------------------------------
vtkGeoTerrain::vtkGeoTerrain()
{
VTK_LEGACY_BODY(vtkGeoTerrain::vtkGeoTerrain, "VTK 8.2");
this->GeoSource = nullptr;
this->Root = vtkGeoTerrainNode::New();
this->Origin[0] = 0.0;
......@@ -554,4 +555,3 @@ void vtkGeoTerrain::PrintTree(ostream & os, vtkIndent indent, vtkGeoTerrainNode*
this->PrintTree(os, indent.GetNextIndent(), parent->GetChild(i));
}
}
......@@ -45,6 +45,7 @@ class vtkGeoSource;
class vtkGeoTerrainNode;
class vtkRenderer;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoTerrain : public vtkObject
{
public:
......@@ -139,4 +140,5 @@ private:
void operator=(const vtkGeoTerrain&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -30,6 +30,7 @@ vtkStandardNewMacro(vtkGeoTerrain2D);
//----------------------------------------------------------------------------
vtkGeoTerrain2D::vtkGeoTerrain2D()
{
VTK_LEGACY_BODY(vtkGeoTerrain2D::vtkGeoTerrain2D, "VTK 8.2");
this->LocationTolerance = 50.0;
this->TextureTolerance = 1.0;
this->CameraBounds[0] = 0;
......@@ -107,4 +108,3 @@ vtkAbstractTransform* vtkGeoTerrain2D::GetTransform()
}
return nullptr;
}
......@@ -44,6 +44,7 @@ class vtkGeoSource;
class vtkGeoTerrainNode;
class vtkRenderer;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoTerrain2D : public vtkGeoTerrain
{
public:
......@@ -106,4 +107,5 @@ private:
void operator=(const vtkGeoTerrain2D&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -32,6 +32,7 @@ vtkStandardNewMacro(vtkGeoTerrainNode);
//----------------------------------------------------------------------------
vtkGeoTerrainNode::vtkGeoTerrainNode()
{
VTK_LEGACY_BODY(vtkGeoTerrainNode::vtkGeoTerrainNode, "VTK 8.2");
this->Model = vtkSmartPointer<vtkPolyData>::New();
this->BoundingSphereRadius = 0.0;
......
......@@ -34,6 +34,7 @@
class vtkPolyData;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoTerrainNode : public vtkGeoTreeNode
{
public:
......@@ -162,4 +163,5 @@ private:
void operator=(const vtkGeoTerrainNode&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -27,6 +27,7 @@ vtkStandardNewMacro(vtkGeoTreeNode);
//----------------------------------------------------------------------------
vtkGeoTreeNode::vtkGeoTreeNode()
{
VTK_LEGACY_BODY(vtkGeoTreeNode::vtkGeoTreeNode, "VTK 8.2");
this->Level = 0;
this->Parent = nullptr;
this->Older = nullptr;
......
......@@ -43,6 +43,7 @@
class vtkPolyData;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoTreeNode : public vtkObject
{
public:
......@@ -194,4 +195,5 @@ private:
void operator=(const vtkGeoTreeNode&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -28,6 +28,7 @@ vtkStandardNewMacro(vtkGeoTreeNodeCache);
//----------------------------------------------------------------------------
vtkGeoTreeNodeCache::vtkGeoTreeNodeCache()
{
VTK_LEGACY_BODY(vtkGeoTreeNodeCache::vtkGeoTreeNodeCache, "VTK 8.2");
this->Oldest = nullptr;
this->Newest = nullptr;
this->Size = 0;
......
......@@ -37,6 +37,7 @@
class vtkGeoTreeNode;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGeoTreeNodeCache : public vtkObject
{
public:
......@@ -110,4 +111,5 @@ private:
void operator=(const vtkGeoTreeNodeCache&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
......@@ -44,6 +44,7 @@ vtkStandardNewMacro(vtkGlobeSource);
//----------------------------------------------------------------------------
vtkGlobeSource::vtkGlobeSource()
{
VTK_LEGACY_BODY(vtkGlobeSource::vtkGlobeSource, "VTK 8.2");
this->Origin[0] = this->Origin[1] = this->Origin[2] = 0.0;
this->Radius = vtkGeoMath::EarthRadiusMeters();
this->AutoCalculateCurtainHeight = true;
......
......@@ -44,6 +44,7 @@ class vtkCellArray;
class vtkFloatArray;
#if !defined(VTK_LEGACY_REMOVE)
class VTKGEOVISCORE_EXPORT vtkGlobeSource : public vtkPolyDataAlgorithm
{
public:
......@@ -181,4 +182,5 @@ private:
void operator=(const vtkGlobeSource&) = delete;
};
#endif //VTK_LEGACY_REMOVE
#endif
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