Commit dbfd4b64 authored by Will Schroeder's avatar Will Schroeder

ENH:Added VTK/Widgets directory; moved widgets from Hybrid/;removed...

ENH:Added VTK/Widgets directory; moved widgets from Hybrid/;removed VTK_USE_HYBRID,VOLUMERENDERING CMake variables
parent fb6d6ab0
......@@ -98,11 +98,7 @@ MARK_AS_ADVANCED(VTK_LEGACY_REMOVE VTK_LEGACY_SILENT)
#-----------------------------------------------------------------------------
# Determine the set of VTK kits that should be built.
OPTION(VTK_USE_RENDERING "Build the vtkRendering kit. Needed for displaying data." ON)
VTK_DEPENDENT_OPTION(VTK_USE_VOLUMERENDERING "Build the vtkVolumeRendering kit." OFF
"VTK_USE_RENDERING" OFF)
VTK_DEPENDENT_OPTION(VTK_USE_HYBRID "Build the vtkHybrid kit." OFF
"VTK_USE_RENDERING" OFF)
OPTION(VTK_USE_RENDERING "Build the vtkRendering kit. Needed for displaying data or using widgets." ON)
VTK_DEPENDENT_OPTION(VTK_USE_PARALLEL "Build the vtkParallel kit." OFF
"VTK_USE_RENDERING" OFF)
......@@ -114,13 +110,10 @@ MARK_AS_ADVANCED(VTK_USE_GUISUPPORT)
SET(VTK_KITS COMMON FILTERING IO GRAPHICS GENERIC_FILTERING IMAGING)
IF(VTK_USE_RENDERING)
SET(VTK_KITS ${VTK_KITS} RENDERING)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_VOLUMERENDERING)
SET(VTK_KITS ${VTK_KITS} VOLUMERENDERING)
ENDIF(VTK_USE_VOLUMERENDERING)
IF(VTK_USE_HYBRID)
SET(VTK_KITS ${VTK_KITS} HYBRID)
ENDIF(VTK_USE_HYBRID)
SET(VTK_KITS ${VTK_KITS} WIDGETS)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_PARALLEL)
SET(VTK_KITS ${VTK_KITS} PARALLEL)
ENDIF(VTK_USE_PARALLEL)
......@@ -555,7 +548,6 @@ IF(VTK_WRAP_JAVA)
SET(VTK_LANGUAGES ${VTK_LANGUAGES} JAVA)
ENDIF(VTK_WRAP_JAVA)
#-----------------------------------------------------------------------------
# Select a streams library.
INCLUDE(${VTK_SOURCE_DIR}/CMake/vtkSelectStreamsLibrary.cmake)
......@@ -675,13 +667,10 @@ SUBDIRS(Wrapping Utilities)
SUBDIRS(Common Filtering Imaging Graphics GenericFiltering IO)
IF(VTK_USE_RENDERING)
SUBDIRS(Rendering)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_VOLUMERENDERING)
SUBDIRS(VolumeRendering)
ENDIF(VTK_USE_VOLUMERENDERING)
IF(VTK_USE_HYBRID)
SUBDIRS(Hybrid)
ENDIF(VTK_USE_HYBRID)
SUBDIRS(Widgets)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_PARALLEL)
SUBDIRS(Parallel)
ENDIF(VTK_USE_PARALLEL)
......@@ -707,13 +696,10 @@ IF(BUILD_TESTING)
IO/Testing)
IF(VTK_USE_RENDERING)
SUBDIRS(Rendering/Testing)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_VOLUMERENDERING)
SUBDIRS(VolumeRendering/Testing)
ENDIF(VTK_USE_VOLUMERENDERING)
IF(VTK_USE_HYBRID)
SUBDIRS(Hybrid/Testing)
ENDIF(VTK_USE_HYBRID)
SUBDIRS(Widgets/Testing)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_PARALLEL)
SUBDIRS(Parallel/Testing)
ENDIF(VTK_USE_PARALLEL)
......@@ -765,10 +751,10 @@ VTK_DEPENDENT_OPTION(VTK_USE_MPI
"VTK_USE_PARALLEL" OFF)
VTK_DEPENDENT_OPTION(VTK_USE_MATROX_IMAGING
"Use Matrox Imaging Library for video input." OFF
"VTK_USE_HYBRID;WIN32" OFF)
"VTK_USE_RENDERING;WIN32" OFF)
VTK_DEPENDENT_OPTION(VTK_USE_VIDEO_FOR_WINDOWS
"Use Video for Windows for video input." OFF
"VTK_USE_HYBRID;WIN32" OFF)
"VTK_USE_RENDERING;WIN32" OFF)
VTK_DEPENDENT_OPTION(VTK_USE_GL2PS "Build VTK with gl2ps support." OFF
"VTK_USE_RENDERING" ON)
......@@ -1147,13 +1133,10 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
vtkGenericFilteringInstantiator)
IF(VTK_USE_RENDERING)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkRenderingInstantiator)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_VOLUMERENDERING)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkVolumeRenderingInstantiator)
ENDIF(VTK_USE_VOLUMERENDERING)
IF(VTK_USE_HYBRID)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkHybridInstantiator)
ENDIF(VTK_USE_HYBRID)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkWidgetsInstantiator)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_PARALLEL)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h vtkParallelInstantiator)
ENDIF(VTK_USE_PARALLEL)
......
......@@ -155,6 +155,12 @@ Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it;
#define VTK_HYBRID_EXPORT __declspec( dllimport )
#endif
#if defined(vtkWidgets_EXPORTS)
#define VTK_WIDGETS_EXPORT __declspec( dllexport )
#else
#define VTK_WIDGETS_EXPORT __declspec( dllimport )
#endif
#if defined(vtkParallel_EXPORTS)
#define VTK_PARALLEL_EXPORT __declspec( dllexport )
#else
......@@ -171,6 +177,7 @@ Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it;
#define VTK_RENDERING_EXPORT
#define VTK_VOLUMERENDERING_EXPORT
#define VTK_HYBRID_EXPORT
#define VTK_WIDGETS_EXPORT
#define VTK_PARALLEL_EXPORT
#define VTK_EXPORT
#endif
......
......@@ -15,16 +15,15 @@ SET (Unsorted_SRCS
ADD_LIBRARY (vtkmyUnsorted ${Unsorted_SRCS})
TARGET_LINK_LIBRARIES(vtkmyUnsorted vtkmyImaging vtkGraphics vtkIO)
IF (VTK_USE_HYBRID)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkHybrid)
ENDIF (VTK_USE_HYBRID)
IF (VTK_USE_PARALLEL)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkParallel)
ENDIF (VTK_USE_PARALLEL)
IF (VTK_USE_RENDERING)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkRendering)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkVolumeRendering)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkHybrid)
TARGET_LINK_LIBRARIES (vtkmyUnsorted vtkWidgets)
ENDIF (VTK_USE_RENDERING)
# Create the vtkmyUnsorted Tcl library.
......
......@@ -88,10 +88,10 @@ IF(VTK_BINARY_DIR)
)
IF(VTK_USE_RENDERING)
ADD_DEPENDENCIES(VTKExamplesTarget vtkRendering)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_HYBRID)
ADD_DEPENDENCIES(VTKExamplesTarget vtkVolumeRendering)
ADD_DEPENDENCIES(VTKExamplesTarget vtkHybrid)
ENDIF(VTK_USE_HYBRID)
ADD_DEPENDENCIES(VTKExamplesTarget vtkWidgets)
ENDIF(VTK_USE_RENDERING)
IF(VTK_USE_PARALLEL)
ADD_DEPENDENCIES(VTKExamplesTarget vtkParallel)
ENDIF(VTK_USE_PARALLEL)
......@@ -121,12 +121,9 @@ ELSE(VTK_BINARY_DIR)
Tutorial/Step3/Cxx
Tutorial/Step4/Cxx
Tutorial/Step5/Cxx
Tutorial/Step6/Cxx
)
IF(VTK_USE_HYBRID)
SUBDIRS(Tutorial/Step6/Cxx)
ENDIF(VTK_USE_HYBRID)
IF(VTK_USE_PARALLEL)
SUBDIRS(ParallelProcessing)
ENDIF(VTK_USE_PARALLEL)
......
......@@ -11,13 +11,13 @@ IF (CMAKE_USE_WIN32_THREADS)
ENDIF (CMAKE_USE_WIN32_THREADS)
IF (VTK_HAS_THREADS OR VTK_USE_MPI)
IF (VTK_USE_HYBRID)
IF (VTK_USE_RENDERING)
ADD_EXECUTABLE(ParallelIso ParallelIso.cxx)
TARGET_LINK_LIBRARIES(ParallelIso vtkParallel vtkHybrid)
IF(APPLE)
TARGET_LINK_LIBRARIES(ParallelIso "-framework Carbon")
ENDIF(APPLE)
ENDIF (VTK_USE_HYBRID)
ENDIF (VTK_USE_RENDERING)
SET(TaskPara_SRCS TaskParallelism.cxx task1.cxx task2.cxx)
SET(TaskParaPorts_SRCS TaskParallelismWithPorts.cxx task3.cxx task4.cxx)
......
PROJECT (Step6)
FIND_PACKAGE(VTK REQUIRED)
IF(NOT VTK_USE_HYBRID)
MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_HYBRID.")
ENDIF(NOT VTK_USE_HYBRID)
IF(NOT VTK_USE_RENDERING)
MESSAGE(FATAL_ERROR "Example ${PROJECT_NAME} requires VTK_USE_RENDERING.")
ENDIF(NOT VTK_USE_RENDERING)
INCLUDE(${VTK_USE_FILE})
ADD_EXECUTABLE(Cone6 Cone6.cxx)
......
......@@ -128,6 +128,7 @@ IF (VTK_USE_RENDERING)
extractRectGrid
extractUGrid
extractVectors
extrudeCopyCD
fieldToPolyData
fieldToRGrid
fieldToSGrid
......@@ -193,16 +194,6 @@ IF (VTK_USE_RENDERING)
-A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
ENDFOREACH ( tfile )
IF(VTK_USE_HYBRID)
ADD_TEST(extrudeCopyCD-image ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
${VTK_SOURCE_DIR}/Graphics/Testing/Tcl/extrudeCopyCD.tcl
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Graphics/extrudeCopyCD.png
-A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
ENDIF(VTK_USE_HYBRID)
#
# If we do not have the data, still run the tests that we can
#
......
......@@ -21,11 +21,9 @@ ENDIF (WIN32)
SET ( Kit_SRCS
vtk3DSImporter.cxx
vtk3DWidget.cxx
vtkArcPlotter.cxx
vtkAnnotatedCubeActor.cxx
vtkAxesActor.cxx
vtkBoxWidget.cxx
vtkCaptionActor2D.cxx
vtkCornerAnnotation.cxx
vtkCubeAxesActor2D.cxx
......@@ -35,20 +33,12 @@ vtkExtractCTHPart.cxx
vtkFacetReader.cxx
vtkGreedyTerrainDecimation.cxx
vtkGridTransform.cxx
vtkImagePlaneWidget.cxx
vtkImageToPolyDataFilter.cxx
vtkImageTracerWidget.cxx
vtkImplicitModeller.cxx
vtkImplicitPlaneWidget.cxx
vtkIterativeClosestPointTransform.cxx
vtkLandmarkTransform.cxx
vtkLegendBoxActor.cxx
vtkLineWidget.cxx
vtkOrientationMarkerWidget.cxx
vtkPCAAnalysisFilter.cxx
vtkPlaneWidget.cxx
vtkPointWidget.cxx
vtkPolyDataSourceWidget.cxx
vtkPolyDataToImageStencil.cxx
vtkProcrustesAlignmentFilter.cxx
vtkProjectedTerrainPath.cxx
......@@ -56,9 +46,6 @@ vtkRIBExporter.cxx
vtkRIBLight.cxx
vtkRIBProperty.cxx
vtkRenderLargeImage.cxx
vtkScalarBarWidget.cxx
vtkSphereWidget.cxx
vtkSplineWidget.cxx
vtkThinPlateSplineTransform.cxx
vtkTransformToGrid.cxx
vtkVRMLImporter.cxx
......@@ -66,13 +53,6 @@ vtkVectorText.cxx
vtkVideoSource.cxx
vtkWeightedTransformFilter.cxx
vtkXYPlotActor.cxx
vtkXYPlotWidget.cxx
)
SET_SOURCE_FILES_PROPERTIES(
vtk3DWidget
vtkPolyDataSourceWidget
ABSTRACT
)
IF (WIN32)
......
SET(KIT Hybrid)
# add tests that do not require data
SET(MyTests
BoxWidget.cxx
TestImplicitPlaneWidget.cxx
TestOrientationMarkerWidget.cxx
)
IF (VTK_DATA_ROOT)
# add tests that require data
SET(MyTests ${MyTests}
ImagePlaneWidget.cxx
TestSplineWidget.cxx
TestScalarBarWidget.cxx
TestLineWidget.cxx
TestPlaneWidget.cxx
TestPointWidget.cxx
TestImageTracerWidget.cxx
)
ENDIF (VTK_DATA_ROOT)
# remove some tests if there is no display
IF(NOT VTK_USE_DISPLAY)
REMOVE(MyTests
BoxWidget.cxx
TestImplicitPlaneWidget.cxx
TestOrientationMarkerWidget.cxx
)
ENDIF(NOT VTK_USE_DISPLAY)
......
......@@ -35,7 +35,6 @@ IF (VTK_USE_RENDERING)
TestGridWarpNearest
TestICPTransform
TestImageStencilWithPolydata
TestInteractorEventRecorder
TestPCA
TestProcrustes
TestProjectedTerrainPath
......
......@@ -2,10 +2,10 @@ ADD_EXECUTABLE(SocketServer SocketServer.cxx)
ADD_EXECUTABLE(SocketClient SocketClient.cxx)
IF (VTK_HAS_THREADS OR VTK_USE_MPI)
IF (VTK_USE_HYBRID)
IF (VTK_USE_RENDERING)
ADD_EXECUTABLE(ParallelIsoTest ParallelIso.cxx)
TARGET_LINK_LIBRARIES(ParallelIsoTest vtkParallel vtkHybrid)
ENDIF (VTK_USE_HYBRID)
TARGET_LINK_LIBRARIES(ParallelIsoTest vtkVolumeRendering vtkParallel vtkHybrid vtkWidgets)
ENDIF (VTK_USE_RENDERING)
ADD_EXECUTABLE(GenericCommunicator GenericCommunicator.cxx)
TARGET_LINK_LIBRARIES(GenericCommunicator vtkParallel)
......@@ -35,7 +35,7 @@ ENDIF (VTK_USE_MPI)
#
IF (VTK_DATA_ROOT)
IF (VTK_USE_HYBRID)
IF (VTK_USE_RENDERING)
IF (VTK_HAS_THREADS)
ADD_TEST(ThreadedCommunicator-image
${CXX_TEST_PATH}/ThreadedCommunicator
......@@ -95,7 +95,7 @@ IF (VTK_DATA_ROOT)
-V Baseline/Parallel/GenericCommunicator.cxx.png)
ENDIF (VTK_HAS_THREADS AND VTK_USE_DISPLAY)
ENDIF (VTK_USE_MPI)
ENDIF (VTK_USE_HYBRID)
ENDIF (VTK_USE_RENDERING)
IF (VTK_USE_MPI)
IF (VTK_MPIRUN_EXE)
......@@ -115,7 +115,7 @@ IF (VTK_DATA_ROOT)
# If we do not have the data, still run the tests that we can
#
ELSE (VTK_DATA_ROOT)
IF (VTK_USE_HYBRID)
IF (VTK_USE_RENDERING)
IF (VTK_HAS_THREADS AND VTK_USE_DISPLAY)
ADD_TEST(ThreadedCommunicator ${CXX_TEST_PATH}/ThreadedCommunicator)
ENDIF (VTK_HAS_THREADS AND VTK_USE_DISPLAY)
......@@ -132,7 +132,7 @@ ELSE (VTK_DATA_ROOT)
ADD_TEST(TestCommunicator ${CXX_TEST_PATH}/GenericCommunicator)
ENDIF (VTK_HAS_THREADS AND VTK_USE_DISPLAY)
ENDIF (VTK_USE_MPI)
ENDIF (VTK_USE_HYBRID)
ENDIF (VTK_USE_RENDERING)
ENDIF (VTK_DATA_ROOT)
# For now this test is only available on Unix because
......
# if we are using the display add the tests
IF (VTK_USE_VOLUMERENDERING AND VTK_USE_DISPLAY)
IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
SET(KIT VolumeRendering)
# add tests that do not require data
SET(MyTests)
......@@ -39,4 +39,4 @@ IF (VTK_USE_VOLUMERENDERING AND VTK_USE_DISPLAY)
ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
ENDIF (VTK_DATA_ROOT)
ENDFOREACH (test)
ENDIF (VTK_USE_VOLUMERENDERING AND VTK_USE_DISPLAY)
ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
IF (VTK_USE_RENDERING AND VTK_USE_VOLUMERENDERING)
IF (VTK_USE_RENDERING)
#
# Add tests, with the data
......@@ -54,7 +54,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_VOLUMERENDERING)
ELSE (VTK_DATA_ROOT)
ENDIF (VTK_DATA_ROOT)
ENDIF (VTK_USE_RENDERING AND VTK_USE_VOLUMERENDERING)
ENDIF (VTK_USE_RENDERING)
ADD_TEST(PrintSelf-VolumeRendering ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
......
SET(KIT Widgets)
SET(UKIT WIDGETS)
SET(KIT_TCL_LIBS vtkRenderingTCL vtkHybridTCL)
IF(APPLE)
SET(KIT_PYTHON_LIBS vtkRenderingPythonD vtkHybridPythonD)
ELSE(APPLE)
SET(KIT_PYTHON_LIBS vtkRenderingPython vtkHybridPython)
ENDIF(APPLE)
SET(KIT_JAVA_LIBS vtkRenderingJava vtkHybridJava)
SET(KIT_LIBS vtkRendering vtkHybrid)
SET ( Kit_SRCS
vtk3DWidget.cxx
vtkBoxWidget.cxx
vtkImagePlaneWidget.cxx
vtkImageTracerWidget.cxx
vtkImplicitPlaneWidget.cxx
vtkLineWidget.cxx
vtkOrientationMarkerWidget.cxx
vtkPlaneWidget.cxx
vtkPointWidget.cxx
vtkPolyDataSourceWidget.cxx
vtkScalarBarWidget.cxx
vtkSphereWidget.cxx
vtkSplineWidget.cxx
vtkXYPlotWidget.cxx
)
SET_SOURCE_FILES_PROPERTIES(
vtk3DWidget
vtkPolyDataSourceWidget
ABSTRACT
)
SET(Kit_EXTRA_SRCS)
SET(Kit_EXTRA_CMDS)
SET(Kit_TCL_EXTRA_SRCS)
SET(Kit_PYTHON_EXTRA_SRCS)
SET(Kit_JAVA_EXTRA_SRCS)
# -----------------------------------------------------------------
# Start of common section
# Setup vtkInstantiator registration for this library's classes.
VTK_MAKE_INSTANTIATOR3(vtk${KIT}Instantiator KitInstantiator_SRCS
"${Kit_SRCS}"
VTK_${UKIT}_EXPORT
${VTK_BINARY_DIR} "")
ADD_LIBRARY(vtk${KIT} ${Kit_SRCS} ${Kit_EXTRA_SRCS} ${KitInstantiator_SRCS})
# Allow the user to customize their build with some local options
#
SET(LOCALUSERMACRODEFINED 0)
INCLUDE (${VTK_BINARY_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
INCLUDE (${VTK_SOURCE_DIR}/${KIT}/LocalUserOptions.cmake OPTIONAL)
# if we are wrapping into Tcl then add the library and extra
# source files
#
IF (VTK_WRAP_TCL)
VTK_WRAP_TCL3(vtk${KIT}TCL KitTCL_SRCS
"${Kit_SRCS}"
"${Kit_TCL_EXTRA_CMDS}")
ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}TCL)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_TCL)
# if we are wrapping into Python then add the library and extra
# source files
#
IF (VTK_WRAP_PYTHON)
VTK_WRAP_PYTHON3(vtk${KIT}Python KitPython_SRCS "${Kit_SRCS}")
IF (APPLE)
ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
ADD_LIBRARY(vtk${KIT}Python MODULE vtk${KIT}PythonInit.cxx)
TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS}
${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}PythonD)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ELSE (APPLE)
ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
ENDIF(APPLE)
IF(WIN32)
TARGET_LINK_LIBRARIES (vtk${KIT}Python ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32)
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Python)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_PYTHON)
# if we are wrapping into Java then add the library and extra
# source files
#
IF (VTK_WRAP_JAVA)
VTK_WRAP_JAVA3(vtk${KIT}Java KitJava_SRCS "${Kit_SRCS}")
ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT}Java)
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
ENDIF (VTK_WRAP_JAVA)
TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
IF(NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL_TARGETS(${VTK_INSTALL_LIB_DIR} vtk${KIT})
ENDIF(NOT VTK_INSTALL_NO_LIBRARIES)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR} .h ${Kit_SRCS})
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
VTK_EXPORT_KIT("${KIT}" "${UKIT}" "${Kit_SRCS}")
# If the user defined a custom macro, execute it now and pass in all the srcs
#
IF(LOCALUSERMACRODEFINED)
LocalUserOptionsMacro( "${Kit_SRCS}" "${Kit_EXTRA_SRCS}"
"${KitTCL_SRCS}" "${Kit_TCL_EXTRA_SRCS}"
"${KitJava_SRCS}" "${Kit_JAVA_EXTRA_SRCS}"
"${KitPython_SRCS}" "${Kit_PYTHON_EXTRA_SRCS}")
ENDIF(LOCALUSERMACRODEFINED)
# End of common section
# -----------------------------------------------------------------
xSUBDIRS(Cxx)
IF (VTK_WRAP_TCL)
# SUBDIRS(Tcl)
ENDIF (VTK_WRAP_TCL)
IF (VTK_WRAP_PYTHON)
# SUBDIRS(Python)
ENDIF (VTK_WRAP_PYTHON)
IF(PYTHON_EXECUTABLE)
ADD_TEST(HeaderTesting-Widgets ${PYTHON_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/HeaderTesting.py
"${VTK_SOURCE_DIR}/Widgets"
)
ENDIF(PYTHON_EXECUTABLE)
SET(KIT Widgets)
# add tests that do not require data
SET(MyTests
BoxWidget.cxx
TestImplicitPlaneWidget.cxx
TestOrientationMarkerWidget.cxx
)
IF (VTK_DATA_ROOT)
# add tests that require data
SET(MyTests ${MyTests}
ImagePlaneWidget.cxx
TestSplineWidget.cxx
TestScalarBarWidget.cxx
TestLineWidget.cxx
TestPlaneWidget.cxx
TestPointWidget.cxx
TestImageTracerWidget.cxx
)
ENDIF (VTK_DATA_ROOT)
# remove some tests if there is no display
IF(NOT VTK_USE_DISPLAY)
REMOVE(MyTests
BoxWidget.cxx
TestImplicitPlaneWidget.cxx
TestOrientationMarkerWidget.cxx
)
ENDIF(NOT VTK_USE_DISPLAY)
CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
EXTRA_INCLUDE vtkSuppressCrtDbgWarning.h
FUNCTION vtkSuppressCrtDbgWarning)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkWidgets)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
FOREACH (test ${TestsToRun})
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
IF (VTK_DATA_ROOT)
ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
-D ${VTK_DATA_ROOT}
-V Baseline/${KIT}/${TName}.png)
ELSE (VTK_DATA_ROOT)
ADD_TEST(${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName})
ENDIF (VTK_DATA_ROOT)
ENDFOREACH (test)
IF (VTK_USE_RENDERING)
#
# Add tests, with the data
#
IF (VTK_DATA_ROOT)
FOREACH ( tfile
TestInteractorEventRecorder
)
ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
${VTK_SOURCE_DIR}/Widgets/Testing/Tcl/${tfile}.tcl
-D ${VTK_DATA_ROOT}
-V Baseline/Widgets/${tfile}.png
-A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
ENDFOREACH( tfile )
#
# If we do not have the data, still run the tests that we can
#
ELSE (VTK_DATA_ROOT)
FOREACH ( tfile
)
ADD_TEST(${tfile}-image ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
${VTK_SOURCE_DIR}/Widgets/Testing/Tcl/${tfile}.tcl
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Widgets/${tfile}.png
-A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
ENDFOREACH( tfile )
ENDIF (VTK_DATA_ROOT)
ENDIF (VTK_USE_RENDERING)
ADD_TEST(PrintSelf-Widgets ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
${VTK_SOURCE_DIR}/Widgets)
ADD_TEST(TestSetObjectMacro-Widgets ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
"${VTK_SOURCE_DIR}/Widgets/vtk\\\\*.h"
"vtkSetObjectMacro")
......@@ -22,7 +22,7 @@
#include "vtkRenderer.h"
#include "vtkRenderWindow.h"
vtkCxxRevisionMacro(vtk3DWidget, "1.20");
vtkCxxRevisionMacro(vtk3DWidget, "1.1");
vtkCxxSetObjectMacro(vtk3DWidget,Prop3D,vtkProp3D);
vtkCxxSetObjectMacro(vtk3DWidget,Input,vtkDataSet);
......
......@@ -58,7 +58,7 @@
class vtkDataSet;
class vtkProp3D;
class VTK_HYBRID_EXPORT vtk3DWidget : public vtkInteractorObserver
class VTK_WIDGETS_EXPORT vtk3DWidget : public vtkInteractorObserver
{
public:
vtkTypeRevisionMacro(vtk3DWidget,vtkInteractorObserver);
......
......@@ -34,7 +34,7 @@
#include "vtkSphereSource.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkBoxWidget, "1.49");
vtkCxxRevisionMacro(vtkBoxWidget, "1.1");
vtkStandardNewMacro(vtkBoxWidget);
vtkBoxWidget::vtkBoxWidget()
......
......@@ -89,7 +89,7 @@ class vtkProperty;
class vtkSphereSource;
class vtkTransform;
class VTK_HYBRID_EXPORT vtkBoxWidget : public vtk3DWidget
class VTK_WIDGETS_EXPORT vtkBoxWidget : public vtk3DWidget
{
public:
// Description:
......
......@@ -41,7 +41,7 @@
#include "vtkTextureMapToPlane.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkImagePlaneWidget, "1.93");
vtkCxxRevisionMacro(vtkImagePlaneWidget, "1.1");
vtkStandardNewMacro(vtkImagePlaneWidget);
vtkCxxSetObjectMacro(vtkImagePlaneWidget, PlaneProperty, vtkProperty);
......
......@@ -121,7 +121,7 @@ class vtkTransform;
#define VTK_LINEAR_RESLICE 1
#define VTK_CUBIC_RESLICE 2
class VTK_HYBRID_EXPORT vtkImagePlaneWidget : public vtkPolyDataSourceWidget
class VTK_WIDGETS_EXPORT vtkImagePlaneWidget : public vtkPolyDataSourceWidget
{
public:
// Description:
......