Commit 1630eee7 authored by Yuanxin Liu's avatar Yuanxin Liu Committed by Code Review
Browse files

Merge topic 'create_tracer_modules' into master

e8ecdf97 ENH: Add Filters/Tracers and Filters/ParallelTracers
parents 75e304f0 e8ecdf97
......@@ -90,10 +90,6 @@ set(Module_SRCS
vtkMarchingContourFilter.cxx
# Depend upon FiltersSources
#vtkStreamTracer.cxx # Needs vtkModifiedBSPTree
#vtkModifiedBSPTree.cxx # Needs vtkCubeSource.h
#vtkCellLocatorInterpolatedVelocityField.cxx # Needs vtkModifiedBSPTree
#vtkOutlineCornerFilter.cxx # Needs vtkOutlineCornerSource
# Depend upon IO/Image
......
......@@ -4,7 +4,6 @@ set(MyTests
BoxClipTetrahedra.cxx
BoxClipTriangulate.cxx
BoxClipTriangulateAndInterpolate.cxx
# TestBSPTree.cxx # todo (unsatistfied deps)
TestBooleanOperationPolyDataFilter.cxx
TestBooleanOperationPolyDataFilter2.cxx
TestDensifyPolyData.cxx
......
......@@ -8,10 +8,8 @@ set(Module_SRCS
vtkCachingInterpolatedVelocityField.cxx
vtkCutMaterial.cxx
vtkDistributedDataFilter.cxx
# vtkDistributedStreamTracer.cxx # needs vtkStreamTracer
vtkDuplicatePolyData.cxx
vtkExtractCTHPart.cxx
# vtkExtractPiece.cxx # needs vtkImageClip
vtkExtractPolyDataPiece.cxx
vtkExtractUnstructuredGridPiece.cxx
vtkExtractUserDefinedPiece.cxx
......@@ -33,12 +31,10 @@ set(Module_SRCS
vtkPReflectionFilter.cxx
vtkProcessIdScalars.cxx
vtkPSphereSource.cxx
# vtkPStreamTracer.cxx # needs vtkStreamTracer
vtkPTableToStructuredGrid.cxx
vtkRectilinearGridOutlineFilter.cxx
# vtkTemporalFractal.cxx # needs vtkImageMandelbrotSource
vtkTemporalInterpolatedVelocityField.cxx
# vtkTemporalStreamTracer.cxx # needs vtkStreamTracer
# vtkTransmitImageDataPiece.cxx # needs vtkImageClip
vtkTransmitPolyDataPiece.cxx
vtkTransmitRectilinearGridPiece.cxx
......
set(Module_SRCS
vtkTemporalStreamTracer.cxx
vtkPStreamTracer.cxx
vtkDistributedStreamTracer.cxx
)
set_source_files_properties(
vtkPStreamTracer
vtkDistributedStreamTracer
WRAP_EXCLUDE
)
vtk_module_library(vtkFiltersParallelTracers ${Module_SRCS})
vtk_module(vtkFiltersParallelTracers
DEPENDS
vtkFiltersTracers
vtkParallelCore
vtkFiltersParallel
TEST_DEPENDS
vtkRenderingParallel
)
......@@ -25,10 +25,10 @@
#ifndef __vtkDistributedStreamTracer_h
#define __vtkDistributedStreamTracer_h
#include "vtkFiltersParallelModule.h" // For export macro
#include "vtkFiltersParallelTracersModule.h" // For export macro
#include "vtkPStreamTracer.h"
class VTKFILTERSPARALLEL_EXPORT vtkDistributedStreamTracer : public vtkPStreamTracer
class VTKFILTERSPARALLELTRACERS_EXPORT vtkDistributedStreamTracer : public vtkPStreamTracer
{
public:
vtkTypeMacro(vtkDistributedStreamTracer,vtkPStreamTracer);
......@@ -71,5 +71,3 @@ private:
#endif
......@@ -24,7 +24,7 @@
#ifndef __vtkPStreamTracer_h
#define __vtkPStreamTracer_h
#include "vtkFiltersParallelModule.h" // For export macro
#include "vtkFiltersParallelTracersModule.h" // For export macro
#include "vtkStreamTracer.h"
#include "vtkSmartPointer.h" // This is a leaf node. No need to use PIMPL to avoid compile time penalty.
......@@ -33,7 +33,7 @@
class vtkAbstractInterpolatedVelocityField;
class vtkMultiProcessController;
class VTKFILTERSPARALLEL_EXPORT vtkPStreamTracer : public vtkStreamTracer
class VTKFILTERSPARALLELTRACERS_EXPORT vtkPStreamTracer : public vtkStreamTracer
{
public:
vtkTypeMacro(vtkPStreamTracer,vtkStreamTracer);
......@@ -92,5 +92,3 @@ private:
#endif
......@@ -24,7 +24,7 @@
#ifndef __vtkTemporalStreamTracer_h
#define __vtkTemporalStreamTracer_h
#include "vtkFiltersParallelModule.h" // For export macro
#include "vtkFiltersParallelTracersModule.h" // For export macro
#include "vtkSmartPointer.h" // For protected ivars.
#include "vtkStreamTracer.h"
......@@ -83,7 +83,7 @@ namespace vtkTemporalStreamTracerNamespace
};
//ETX
class VTKFILTERSPARALLEL_EXPORT vtkTemporalStreamTracer : public vtkStreamTracer
class VTKFILTERSPARALLELTRACERS_EXPORT vtkTemporalStreamTracer : public vtkStreamTracer
{
public:
......@@ -443,5 +443,3 @@ private:
#endif
set(Module_SRCS
vtkStreamTracer.cxx
vtkModifiedBSPTree.cxx
vtkCellLocatorInterpolatedVelocityField.cxx
)
vtk_module_library(vtkFiltersTracers ${Module_SRCS})
set(MyTests
TestBSPTree.cxx
)
include(${VTK_SOURCE_DIR}/Testing/Rendering/vtkTestingObjectFactory.cmake)
vtk_module_test_executable(${vtk-module}CxxTests ${Tests})
set(TestsToRun ${Tests})
list(REMOVE_ITEM TestsToRun CxxTests.cxx)
# Add all the executables
foreach (test ${TestsToRun})
get_filename_component(TName ${test} NAME_WE)
if(VTK_DATA_ROOT)
add_test(NAME ${vtk-module}Cxx-${TName}
COMMAND ${vtk-module}CxxTests ${TName}
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Graphics/${TName}.png)
else()
add_test(NAME ${vtk-module}Cxx-${TName}
COMMAND ${vtk-module}CxxTests ${TName}
-T ${VTK_BINARY_DIR}/Testing/Temporary
)
endif()
endforeach()
vtk_module(vtkFiltersTracers
DEPENDS
vtkCommonExecutionModel
vtkFiltersGeneral
vtkFiltersSources
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRenderingOpenGL
)
......@@ -140,7 +140,7 @@
#ifndef _vtkModifiedBSPTree_h
#define _vtkModifiedBSPTree_h
#include "vtkFiltersGeneralModule.h" // For export macro
#include "vtkFiltersTracersModule.h" // For export macro
#include "vtkAbstractCellLocator.h"
#include "vtkSmartPointer.h" // required because it is nice
......@@ -152,7 +152,7 @@ class vtkIdList;
class vtkIdListCollection;
//ETX
class VTKFILTERSGENERAL_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLocator {
class VTKFILTERSTRACERS_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLocator {
public:
// Description:
// Standard Type-Macro
......@@ -340,9 +340,9 @@ class BSPNode {
friend class vtkModifiedBSPTree;
friend class vtkParticleBoxTree;
public:
static bool VTKFILTERSGENERAL_EXPORT RayMinMaxT(
static bool VTKFILTERSTRACERS_EXPORT RayMinMaxT(
const double bounds[6], const double origin[3], const double dir[3], double &rTmin, double &rTmax);
static int VTKFILTERSGENERAL_EXPORT getDominantAxis(const double dir[3]);
static int VTKFILTERSTRACERS_EXPORT getDominantAxis(const double dir[3]);
};
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
......
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