Commit 87cdba1b authored by David Gobbi's avatar David Gobbi
Browse files

ENH: Wrap the chemistry kit, do all CMake-related additions.

Change-Id: I755286dda63769566962bf2532b84b5c36cd77ce
parent 5040267c
INCLUDE(vtkDependentOption)
SET(KIT Chemistry)
SET(UKIT CHEMISTRY)
SET(KIT_LIBS vtkRendering vtkFiltering vtkVolumeRendering)
SET(KIT_TCL_LIBS vtkFilteringTCL vtkRenderingTCL vtkVolumeRenderingTCL)
SET(KIT_PYTHON_LIBS vtkFilteringPythonD vtkRenderingPythonD vtkVolumeRenderingPythonD)
SET(KIT_JAVA_LIBS vtkFilteringJava vtkRenderingJava vtkVolumeRenderingJava)
SET(KIT_INTERFACE_LIBRARIES vtkFiltering vtkRendering vtkVolumeRendering)
SET(Kit_SRCS
vtkAbstractElectronicData.cxx
......@@ -26,11 +27,14 @@ SET_SOURCE_FILES_PROPERTIES(
ABSTRACT
)
SET_SOURCE_FILES_PROPERTIES(
vtkAbstractElectronicData.cxx
vtkMoleculeToPolyDataFilter.cxx
WRAP_EXCLUDE
)
SET(Kit_EXTRA_SRCS)
SET(Kit_EXTRA_CMDS)
SET(Kit_TCL_EXTRA_SRCS)
SET(Kit_PYTHON_EXTRA_SRCS)
SET(Kit_JAVA_EXTRA_SRCS)
SET(KIT_TCL_DEPS)
SET(KIT_PYTHON_DEPS)
SET(KIT_JAVA_DEPS)
# OpenQube setup
FIND_PACKAGE(OpenQube QUIET)
......
......@@ -33,6 +33,7 @@ my %default =
(
codematch => "\w(?:->|\.)InvokeEvent\s*\(\s*(vtkCommand::\w+)[\s,]",
dirs => ["../../Charts",
"../../Chemistry",
"../../Common",
"../../Filtering",
"../../GenericFiltering",
......
......@@ -107,9 +107,10 @@ $PROGNAME =~ s/^.*[\\\/]//;
# -------------------------------------------------------------------------
# Defaults (add options as you want: "verbose" => 1 for default verbose mode)
my %default =
my %default =
(
dirs => ["../../Charts",
"../../Chemistry",
"../../Common",
"../../Filtering",
"../../GenericFiltering",
......
......@@ -62,6 +62,7 @@ my %default =
(
limit => 10,
dirs => ["../../Charts",
"../../Chemistry",
"../../Common",
"../../Filtering",
"../../GenericFiltering",
......
......@@ -179,6 +179,7 @@ if test "x$PERL_PROG" != "xNOTFOUND" ; then
--to "$INTERMEDIATE_DOX_DIR" \
--relativeto "$SOURCE_DIR/$REL_PATH_TO_TOP" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Charts" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Chemistry" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Common" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Filtering" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/GenericFiltering" \
......@@ -217,6 +218,7 @@ if test "x$PERL_PROG" != "xNOTFOUND" ; then
--unique "v" \
--relativeto "$SOURCE_DIR/$REL_PATH_TO_TOP" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Charts" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Chemistry" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Common" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Filtering" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/GenericFiltering" \
......@@ -246,6 +248,7 @@ if test "x$PERL_PROG" != "xNOTFOUND" ; then
--store "doc_""$PROJECT_NAME""_index.dox" \
--to "$INTERMEDIATE_DOX_DIR" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Charts" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Chemistry" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Common" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/Filtering" \
"$SOURCE_DIR/$REL_PATH_TO_TOP/GenericFiltering" \
......
......@@ -42,6 +42,7 @@ OUTPUT_DIRECTORY = "@VTK_BINARY_DIR@/Utilities/Doxygen/doc"
INPUT = \
"@VTK_BINARY_DIR@/Utilities/Doxygen/dox/Charts" \
"@VTK_BINARY_DIR@/Utilities/Doxygen/dox/Chemistry" \
"@VTK_BINARY_DIR@/Utilities/Doxygen/dox/Common" \
"@VTK_BINARY_DIR@/Utilities/Doxygen/dox/Filtering" \
"@VTK_BINARY_DIR@/Utilities/Doxygen/dox/GenericFiltering" \
......
......@@ -80,6 +80,7 @@ SET(VTK_USE_QT "@VTK_USE_QT@")
SET(VTK_USE_CARBON "@VTK_USE_CARBON@")
SET(VTK_USE_CG_SHADERS "@VTK_USE_CG_SHADERS@")
SET(VTK_USE_CHARTS "@VTK_USE_CHARTS@")
SET(VTK_USE_CHEMISTRY "@VTK_USE_CHEMISTRY@")
SET(VTK_USE_COCOA "@VTK_USE_COCOA@")
SET(VTK_USE_GEOVIS "@VTK_USE_GEOVIS@")
SET(VTK_USE_GL2PS "@VTK_USE_GL2PS@")
......
......@@ -163,6 +163,9 @@ IF(BORLAND)
IF(VTK_USE_CHARTS)
SET(KITS ${KITS} Charts)
ENDIF(VTK_USE_CHARTS)
IF(VTK_USE_CHEMISTRY)
SET(KITS ${KITS} Chemistry)
ENDIF(VTK_USE_CHEMISTRY)
IF (VTK_USE_GEOVIS)
SET(KITS ${KITS} Geovis)
ENDIF(VTK_USE_GEOVIS)
......@@ -222,6 +225,14 @@ IF(VTK_USE_CHARTS)
)
ENDIF(VTK_USE_CHARTS)
IF(VTK_USE_CHEMISTRY)
SET(VTKPYTHON_LINK_LIBS ${VTKPYTHON_LINK_LIBS} vtkChemistry)
SET(vtkpython_pyc_depends
${vtkpython_pyc_depends}
vtkChemistryPython
)
ENDIF(VTK_USE_CHEMISTRY)
IF (VTK_USE_GEOVIS)
SET(VTKPYTHON_LINK_LIBS ${VTKPYTHON_LINK_LIBS} vtkGeovis)
SET(vtkpython_pyc_depends
......@@ -380,6 +391,7 @@ IF(PYTHON_EXECUTABLE)
vtk/__init__
vtk/common
vtk/charts
vtk/chemistry
vtk/filtering
vtk/genericfiltering
vtk/geovis
......
......@@ -62,6 +62,8 @@ if vtk_use_parallel:
vtk_kit_names.extend(['Parallel'])
if vtk_use_charts:
vtk_kit_names.extend(['Charts'])
if vtk_use_chemistry:
vtk_kit_names.extend(['Chemistry'])
if vtk_use_geovis:
vtk_kit_names.extend(['Geovis'])
if vtk_use_infovis:
......
......@@ -87,6 +87,12 @@ try:
except ImportError, exc:
__helper.refine_import_err('charts', 'vtkChartsPython', exc)
try:
from vtkChemistryPython import *
kits.append('chemistry')
except ImportError, exc:
__helper.refine_import_err('chemistry', 'vtkChemistryPython', exc)
try:
from vtkGeovisPython import *
kits.append('geovis')
......
""" This module loads all the classes from the VTK Chemistry library into
its namespace. This is an optional module."""
from vtkChemistryPython import *
......@@ -57,6 +57,10 @@
#include "vtkChartsInstantiator.h"
#endif
#ifdef VTK_USE_CHEMISTRY
#include "vtkChemistryInstantiator.h"
#endif
#ifdef VTK_USE_GEOVIS
#include "vtkGeovisInstantiator.h"
#endif
......
Supports Markdown
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