ENH: new geovis kit

CMakeLists.txt

@@ -250,6 +250,8 @@ VTK_DEPENDENT_OPTION(VTK_USE_INFOVIS "Build the vtkInfovis kit.  Needed for perf
 
 VTK_DEPENDENT_OPTION(VTK_USE_VIEWS "Build the vtkViews kit.  Needed for creating packaged and linked views." ON "VTK_USE_INFOVIS" OFF)
 
+VTK_DEPENDENT_OPTION(VTK_USE_GEOVIS "Build the vtkGeovis kit.  Needed for performing geographic visualization." ON "VTK_USE_RENDERING" OFF)
+
 # Determine Shading Support
 VTK_DEPENDENT_OPTION(VTK_USE_CG_SHADERS "Build pixel and vertex shader support for Cg." OFF
                      "VTK_USE_RENDERING" OFF)
@@ -309,6 +311,10 @@ IF(VTK_USE_INFOVIS)
   SET(VTK_KITS ${VTK_KITS} INFOVIS)
 ENDIF(VTK_USE_INFOVIS)
 
+IF(VTK_USE_GEOVIS)
+  SET(VTK_KITS ${VTK_KITS} GEOVIS)
+ENDIF(VTK_USE_GEOVIS)
+
 IF(VTK_USE_VIEWS)
   SET(VTK_KITS ${VTK_KITS} VIEWS)
 ENDIF(VTK_USE_VIEWS)
@@ -985,6 +991,9 @@ ENDIF(VTK_USE_PARALLEL)
 IF(VTK_USE_INFOVIS)
   ADD_SUBDIRECTORY(Infovis)
 ENDIF(VTK_USE_INFOVIS)
+IF(VTK_USE_GEOVIS)
+  ADD_SUBDIRECTORY(Geovis)
+ENDIF(VTK_USE_GEOVIS)
 IF(VTK_USE_VIEWS)
   ADD_SUBDIRECTORY(Views)
 ENDIF(VTK_USE_VIEWS)
@@ -1026,6 +1035,9 @@ IF(BUILD_TESTING)
   IF(VTK_USE_INFOVIS)
     ADD_SUBDIRECTORY(Infovis/Testing)
   ENDIF(VTK_USE_INFOVIS)
+  IF(VTK_USE_GEOVIS)
+    ADD_SUBDIRECTORY(Geovis/Testing)
+  ENDIF(VTK_USE_GEOVIS)
   IF(VTK_USE_VIEWS)
     ADD_SUBDIRECTORY(Views/Testing)
   ENDIF(VTK_USE_VIEWS)
@@ -1065,6 +1077,9 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
   IF(VTK_USE_INFOVIS)
     SET(__inst_files ${__inst_files} ${VTK_BINARY_DIR}/vtkInfovisInstantiator.h)
   ENDIF(VTK_USE_INFOVIS)
+  IF(VTK_USE_GEOVIS)
+    SET(__inst_files ${__inst_files} ${VTK_BINARY_DIR}/vtkGeovisInstantiator.h)
+  ENDIF(VTK_USE_GEOVIS)
   IF(VTK_USE_VIEWS)
     SET(__inst_files ${__inst_files} ${VTK_BINARY_DIR}/vtkViewsInstantiator.h)
   ENDIF(VTK_USE_VIEWS)

Geovis/CMakeLists.txt

+SET(KIT Geovis)
+SET(UKIT GEOVIS)
+SET(KIT_TCL_LIBS vtkWidgetsTCL)
+SET(KIT_PYTHON_LIBS vtkWidgetsPythonD)
+SET(KIT_JAVA_LIBS vtkWidgetsJava)
+SET(KIT_LIBS vtkWidgets ${VTK_LIBXML2_LIBRARIES})
+
+SET( Kit_SRCS
+  vtkGeoMath.cxx
+)
+
+#SET_SOURCE_FILES_PROPERTIES(
+#vtkUnivariateStatisticsAlgorithm.cxx
+#ABSTRACT
+#)
+
+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)
+
+#-----------------------------------------------------------------------------
+# Include CMake code common to all kits.
+INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
+#-----------------------------------------------------------------------------

Geovis/Testing/Cxx/CMakeLists.txt

+# if we have rendering add the following tests
+IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
+  SET(KIT Geovis)
+  # add tests that do not require data
+  SET(MyTests  
+    TestVariant
+    )
+  IF (VTK_DATA_ROOT)
+    # add tests that require data
+    SET(MyTests ${MyTests}
+      TestChacoGraphReader
+      )
+  ENDIF (VTK_DATA_ROOT)
+
+  CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
+                         EXTRA_INCLUDE vtkTestDriver.h)
+  ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
+  TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkGeovis vtkRendering vtkIO)
+  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(Geovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}
+          -D ${VTK_DATA_ROOT}
+          -T ${VTK_BINARY_DIR}/Testing/Temporary
+          -V Baseline/${KIT}/${TName}.png)
+    ELSE (VTK_DATA_ROOT)
+      ADD_TEST(Geovis-${TName} ${CXX_TEST_PATH}/${KIT}CxxTests ${TName}) 
+    ENDIF (VTK_DATA_ROOT)
+  ENDFOREACH (test) 
+ENDIF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)

Geovis/vtkGeoMath.cxx

+/*=============================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkGeoMath.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=============================================================================*/
+#include "vtkObjectFactory.h"
+#include "vtkGeoMath.h"
+#include "vtkMath.h"
+
+vtkCxxRevisionMacro(vtkGeoMath, "1.1");
+vtkStandardNewMacro(vtkGeoMath);
+
+
+//----------------------------------------------------------------------------
+vtkGeoMath::vtkGeoMath() 
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkGeoMath::~vtkGeoMath() 
+{  
+}
+
+//-----------------------------------------------------------------------------
+void vtkGeoMath::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os,indent);
+}
+
+
+//-----------------------------------------------------------------------------
+double vtkGeoMath::DistanceSquared(double pt0[3], double pt1[3])
+{
+  double tmp;
+  double d2;
+  
+  tmp = pt1[0] - pt0[0];
+  d2 = tmp * tmp;
+  tmp = pt1[1] - pt0[1];
+  d2 += tmp * tmp;
+  tmp = pt1[2] - pt0[2];
+  d2 += tmp * tmp;
+  
+  return d2;
+}
+
+//-----------------------------------------------------------------------------
+void vtkGeoMath::LongLatAltToRect(double longLatAlt[3], double rect[3])
+{
+  double theta = longLatAlt[0] * vtkMath::DegreesToRadians();
+  double phi = longLatAlt[1] * vtkMath::DegreesToRadians();
+  double cosPhi = cos(phi);
+  double radius = vtkGeoMath::EarthRadiusMeters()+ longLatAlt[2];
+
+  rect[2] = sin(phi) * radius;
+  rect[1] = cos(theta) * cosPhi * radius;
+  rect[0] = -sin(theta) * cosPhi * radius;
+}
+

Geovis/vtkGeoMath.h

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkGeoMath.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+/*-------------------------------------------------------------------------
+  Copyright 2008 Sandia Corporation.
+  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+  the U.S. Government retains certain rights in this software.
+-------------------------------------------------------------------------*/
+
+// .NAME vtkGeoMath - 
+// .SECTION Description I wanted to hide the normal vtkCamera API
+
+// .SECTION See Also
+   
+#ifndef __vtkGeoMath_h
+#define __vtkGeoMath_h
+
+#include "vtkObject.h"
+#include "vtkSmartPointer.h"
+
+class VTK_GEOVIS_EXPORT vtkGeoMath : public vtkObject
+{
+public:
+  static vtkGeoMath *New();
+  vtkTypeRevisionMacro(vtkGeoMath, vtkObject);
+  void PrintSelf(ostream& os, vtkIndent indent);
+  
+  static float EarthRadiusMeters() {return 6356750.0f;};
+
+  static double DistanceSquared(double pt0[3], double pt1[3]);
+  // Having altitude realtive to sea level causes issues....
+  static void   LongLatAltToRect(double lla[3], double rect[3]);
+  
+protected:
+  vtkGeoMath();
+  ~vtkGeoMath();
+
+private:
+  vtkGeoMath(const vtkGeoMath&);  // Not implemented.
+  void operator=(const vtkGeoMath&);  // Not implemented.
+};
+
+#endif

VTKConfig.cmake.in

@@ -85,6 +85,7 @@ SET(VTK_USE_BOOST "@VTK_USE_BOOST@")
 SET(VTK_USE_CARBON "@VTK_USE_CARBON@")
 SET(VTK_USE_CG_SHADERS "@VTK_USE_CG_SHADERS@")
 SET(VTK_USE_COCOA "@VTK_USE_COCOA@")
+SET(VTK_USE_GEOVIS "@VTK_USE_GEOVIS@")
 SET(VTK_USE_GL2PS "@VTK_USE_GL2PS@")
 SET(VTK_USE_GLSL_SHADERS "@VTK_USE_GLSL_SHADERS@")
 SET(VTK_USE_GUISUPPORT "@VTK_USE_GUISUPPORT@")

Wrapping/Java/CMakeLists.txt

@@ -17,6 +17,9 @@ IF(JAVA_COMPILE)
   IF (VTK_USE_PARALLEL)
     INCLUDE(${VTK_BINARY_DIR}/Parallel/JavaDependencies.cmake OPTIONAL)
   ENDIF(VTK_USE_PARALLEL)
+  IF (VTK_USE_GEOVIS)
+    INCLUDE(${VTK_BINARY_DIR}/Geovis/JavaDependencies.cmake OPTIONAL)
+  ENDIF(VTK_USE_GEOVIS)
   IF (VTK_USE_INFOVIS)
     INCLUDE(${VTK_BINARY_DIR}/Infovis/JavaDependencies.cmake OPTIONAL)
   ENDIF(VTK_USE_INFOVIS)
@@ -51,6 +54,9 @@ IF(JAVA_COMPILE)
     IF (VTK_USE_PARALLEL)
       SET(KITS ${KITS} Parallel)
     ENDIF(VTK_USE_PARALLEL)
+    IF (VTK_USE_GEOVIS)
+      SET(KITS ${KITS} Geovis)
+    ENDIF(VTK_USE_GEOVIS)
     IF (VTK_USE_INFOVIS)
       SET(KITS ${KITS} Infovis)
     ENDIF(VTK_USE_INFOVIS)
@@ -174,6 +180,9 @@ IF(JAVA_COMPILE)
     IF(VTK_USE_PARALLEL)
       ADD_DEPENDENCIES(VTKJavaParallel VTKJavaRendering)
     ENDIF(VTK_USE_PARALLEL)
+    IF(VTK_USE_GEOVIS)
+      ADD_DEPENDENCIES(VTKJavaGeovis VTKJavaWidgets)
+    ENDIF(VTK_USE_GEOVIS)
     IF(VTK_USE_INFOVIS)
       ADD_DEPENDENCIES(VTKJavaInfovis VTKJavaWidgets)
     ENDIF(VTK_USE_INFOVIS)

Wrapping/Python/CMakeLists.txt

@@ -72,6 +72,9 @@ IF(BORLAND)
   IF (VTK_USE_PARALLEL)
     SET(KITS ${KITS} Parallel)
   ENDIF(VTK_USE_PARALLEL)
+  IF (VTK_USE_GEOVIS)
+    SET(KITS ${KITS} Geovis)
+  ENDIF(VTK_USE_GEOVIS)
   IF (VTK_USE_INFOVIS)
     SET(KITS ${KITS} Infovis)
   ENDIF(VTK_USE_INFOVIS)
@@ -117,6 +120,14 @@ IF (VTK_USE_PARALLEL)
       )
 ENDIF (VTK_USE_PARALLEL)
 
+IF (VTK_USE_GEOVIS)
+  SET(VTKPYTHON_LINK_LIBS ${VTKPYTHON_LINK_LIBS} vtkGeovis)
+  SET(vtkpython_pyc_depends
+      ${vtkpython_pyc_depends}
+      vtkGeovisPython
+      )
+ENDIF (VTK_USE_GEOVIS)
+
 IF (VTK_USE_INFOVIS)
   SET(VTKPYTHON_LINK_LIBS ${VTKPYTHON_LINK_LIBS} vtkInfovis)
   SET(vtkpython_pyc_depends
@@ -205,6 +216,7 @@ IF(PYTHON_EXECUTABLE)
     vtk/common
     vtk/filtering
     vtk/genericfiltering
+    vtk/geovis
     vtk/graphics
     vtk/hybrid
     vtk/imaging
@@ -442,6 +454,11 @@ IF(VTK_USE_PARALLEL)
 ELSE(VTK_USE_PARALLEL)
   SET(VTK_PYTHON_USE_PARALLEL 0)
 ENDIF(VTK_USE_PARALLEL)
+IF(VTK_USE_GEOVIS)
+  SET(VTK_PYTHON_USE_GEOVIS 1)
+ELSE(VTK_USE_GEOVIS)
+  SET(VTK_PYTHON_USE_GEOVIS 0)
+ENDIF(VTK_USE_GEOVIS)
 IF(VTK_USE_INFOVIS)
   SET(VTK_PYTHON_USE_INFOVIS 1)
 ELSE(VTK_USE_INFOVIS)

Wrapping/Python/setup.py.in

@@ -35,6 +35,7 @@ vtk_lib_dir = "@LIBRARY_OUTPUT_PATH@"
 vtk_bin_dir = "@EXECUTABLE_OUTPUT_PATH@"
 vtk_use_rendering = @VTK_PYTHON_USE_RENDERING@
 vtk_use_parallel = @VTK_PYTHON_USE_PARALLEL@
+vtk_use_geovis = @VTK_PYTHON_USE_GEOVIS@
 vtk_use_infovis = @VTK_PYTHON_USE_INFOVIS@
 vtk_use_views = @VTK_PYTHON_USE_VIEWS@
 vtk_use_mpi = @VTK_PYTHON_USE_MPI@
@@ -53,6 +54,8 @@ if vtk_use_rendering:
     vtk_kit_names.extend(['Rendering', 'VolumeRendering', 'Hybrid', 'Widgets'])
 if vtk_use_parallel:
     vtk_kit_names.extend(['Parallel'])
+if vtk_use_geovis:
+    vtk_kit_names.extend(['Geovis'])
 if vtk_use_infovis:
     vtk_kit_names.extend(['Infovis'])
 if vtk_use_views:

Wrapping/Python/vtk/__init__.py

@@ -81,6 +81,12 @@ try:
 except ImportError, exc:
     __helper.refine_import_err('widgets', 'vtkWidgetsPython', exc)
 
+try:
+    from geovis import *
+    kits.append('geovis')
+except ImportError, exc:
+    __helper.refine_import_err('geovis', 'vtkGeovisPython', exc)
+
 try:
     from infovis import *
     kits.append('infovis')

Wrapping/Python/vtk/geovis.py

+""" This module loads all the classes from the VTK Geovis library into
+its namespace.  This is an optional module."""
+
+import os
+
+if os.name == 'posix':
+    from libvtkGeovisPython import *
+else:
+    from vtkGeovisPython import *

Wrapping/Python/vtkPythonAppInit.cxx

@@ -54,6 +54,10 @@
 #include "vtkParallelInstantiator.h"
 #endif
 
+#ifdef VTK_USE_GEOVIS
+#include "vtkGeovisInstantiator.h"
+#endif
+
 #ifdef VTK_USE_INFOVIS
 #include "vtkInfovisInstantiator.h"
 #endif

Wrapping/Tcl/CMakeLists.txt

@@ -83,6 +83,10 @@ IF (VTK_USE_PARALLEL)
   TARGET_LINK_LIBRARIES(vtk vtkParallelTCL)
 ENDIF (VTK_USE_PARALLEL)
 
+IF (VTK_USE_GEOVIS)
+  TARGET_LINK_LIBRARIES(vtk vtkGeovisTCL)
+ENDIF (VTK_USE_GEOVIS)
+
 IF (VTK_USE_INFOVIS)
   TARGET_LINK_LIBRARIES(vtk vtkInfovisTCL)
 ENDIF (VTK_USE_INFOVIS)
@@ -143,6 +147,10 @@ IF (VTK_USE_PARALLEL)
       TARGET_LINK_LIBRARIES(pvtk vtkVolumeRenderingTCL)
     ENDIF (VTK_USE_RENDERING)
 
+    IF (VTK_USE_GEOVIS)
+      TARGET_LINK_LIBRARIES(pvtk vtkGeovisTCL)
+    ENDIF (VTK_USE_GEOVIS)
+
     IF (VTK_USE_INFOVIS)
       TARGET_LINK_LIBRARIES(pvtk vtkInfovisTCL)
     ENDIF (VTK_USE_INFOVIS)
@@ -180,6 +188,7 @@ SET(VTK_TCL_VOLUMERENDERING_CONFIG "")
 SET(VTK_TCL_HYBRID_CONFIG "")
 SET(VTK_TCL_WIDGETS_CONFIG "")
 SET(VTK_TCL_PARALLEL_CONFIG "")
+SET(VTK_TCL_GEOVIS_CONFIG "")
 SET(VTK_TCL_INFOVIS_CONFIG "")
 SET(VTK_TCL_VIEWS_CONFIG "")
 
@@ -188,6 +197,11 @@ IF (VTK_USE_PARALLEL)
   SUBDIRS(vtkparallel)
 ENDIF (VTK_USE_PARALLEL)
 
+IF (VTK_USE_GEOVIS)
+  SET(VTK_TCL_GEOVIS_CONFIG "Geovis")
+  SUBDIRS(vtkgeovis)
+ENDIF (VTK_USE_GEOVIS)
+
 IF (VTK_USE_INFOVIS)
   SET(VTK_TCL_INFOVIS_CONFIG "Infovis")
   SUBDIRS(vtkinfovis)

Wrapping/Tcl/pkgIndex.tcl.in

@@ -24,8 +24,8 @@ package ifneeded vtkinit {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@} {
     foreach kit { base Common Filtering IO Imaging Graphics
                   @VTK_TCL_RENDERING_CONFIG@ @VTK_TCL_VOLUMERENDERING_CONFIG@
                   @VTK_TCL_HYBRID_CONFIG@ @VTK_TCL_WIDGETS_CONFIG@
-                  @VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_INFOVIS_CONFIG@ 
-                  @VTK_TCL_VIEWS_CONFIG@} {
+                  @VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_GEOVIS_CONFIG@ 
+                  @VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@} {
       lappend kits [string tolower "${kit}"]
     }
   }
@@ -35,8 +35,8 @@ package ifneeded vtkinit {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@} {
 foreach kit { Common Filtering IO Imaging Graphics
               @VTK_TCL_RENDERING_CONFIG@ @VTK_TCL_VOLUMERENDERING_CONFIG@
               @VTK_TCL_HYBRID_CONFIG@ @VTK_TCL_WIDGETS_CONFIG@
-              @VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_INFOVIS_CONFIG@ 
-              @VTK_TCL_VIEWS_CONFIG@} {
+              @VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_GEOVIS_CONFIG@ 
+              @VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@} {
   package ifneeded "vtk${kit}TCL" {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@} "
     package require -exact vtkinit {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@}
     ::vtk::init::load_library_package {vtk${kit}TCL} {@VTK_TCL_LIBRARY_DIR@}

Wrapping/Tcl/vtkTkAppInit.cxx

@@ -65,6 +65,10 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkParallelInstantiator.h"
 #endif
 
+#ifdef VTK_USE_GEOVIS
+#include "vtkGeovisInstantiator.h"
+#endif
+
 #ifdef VTK_USE_INFOVIS
 #include "vtkInfovisInstantiator.h"
 #endif
@@ -199,6 +203,10 @@ extern "C" int Vtkwidgetstcl_Init(Tcl_Interp *interp);
 extern "C" int Vtkparalleltcl_Init(Tcl_Interp *interp);
 #endif
 
+#ifdef VTK_USE_GEOVIS
+extern "C" int Vtkgeovistcl_Init(Tcl_Interp *interp);
+#endif
+
 #ifdef VTK_USE_INFOVIS
 extern "C" int Vtkinfovistcl_Init(Tcl_Interp *interp);
 #endif
@@ -300,6 +308,13 @@ int Tcl_AppInit(Tcl_Interp *interp)
     }
 #endif
  
+#ifdef VTK_USE_GEOVIS
+  if (Vtkgeovistcl_Init(interp) == TCL_ERROR)
+    {
+    return TCL_ERROR;
+    }
+#endif
+
 #ifdef VTK_USE_INFOVIS
   if (Vtkinfovistcl_Init(interp) == TCL_ERROR)
     {

Wrapping/Tcl/vtkgeovis.tcl

+package require -exact vtkwidgets 5.3
+
+if {[info commands ::vtk::init::require_package] != ""} {
+  if {[::vtk::init::require_package vtkGeovisTCL 5.3]} {
+    package provide vtkgeovis 5.3
+  }
+} else {
+  if {[info commands /* vtkGraphLayout */] != "" ||
+    [::vtk::load_component vtkGeovisTCL] == ""} {
+    package provide vtkgeovis 5.3
+  }
+}

Wrapping/Tcl/vtkgeovis/CMakeLists.txt

+IF(NOT VTK_INSTALL_NO_RUNTIME)
+  INSTALL(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkgeovis.tcl
+    DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkgeovis
+    COMPONENT RuntimeLibraries)
+ENDIF(NOT VTK_INSTALL_NO_RUNTIME)

Wrapping/Tcl/vtktcl.c

@@ -42,6 +42,10 @@ extern int Vtktkimageviewerwidget_Init(Tcl_Interp *interp);
 extern int Vtkparalleltcl_Init(Tcl_Interp *interp);
 #endif
 
+#ifdef VTK_USE_GEOVIS
+extern int Vtkgeovistcl_Init(Tcl_Interp *interp);
+#endif
+
 #ifdef VTK_USE_INFOVIS
 extern int Vtkinfovistcl_Init(Tcl_Interp *interp);
 #endif
@@ -103,6 +107,13 @@ int Vtktcl_Init(Tcl_Interp *interp)
     }
 #endif
 
+#ifdef VTK_USE_GEOVIS
+  if (Vtkgeovistcl_Init(interp) == TCL_ERROR) 
+    {
+    return TCL_ERROR;
+    }
+#endif
+
 #ifdef VTK_USE_INFOVIS
   if (Vtkinfovistcl_Init(interp) == TCL_ERROR) 
     {

vtkIncludeDirectories.cmake

@@ -107,6 +107,10 @@ IF(VTK_USE_INFOVIS)
   SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Infovis)
 ENDIF(VTK_USE_INFOVIS)
 
+IF(VTK_USE_GEOVIS)
+  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Geovis)
+ENDIF(VTK_USE_GEOVIS)
+
 IF(VTK_USE_VIEWS)
   SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE} ${VTK_SOURCE_DIR}/Views)
 ENDIF(VTK_USE_VIEWS)
@@ -217,6 +221,13 @@ IF(VTK_USE_INFOVIS)
     )
 ENDIF(VTK_USE_INFOVIS)
 
+# Geovis support
+IF(VTK_USE_GEOVIS)
+  SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}
+    ${VTK_SOURCE_DIR}/Geovis
+    )
+ENDIF(VTK_USE_GEOVIS)
+
 # Views support
 IF(VTK_USE_VIEWS)
   SET(VTK_INCLUDE_DIRS_SOURCE_TREE ${VTK_INCLUDE_DIRS_SOURCE_TREE}

vtkToolkits.h.in

@@ -21,6 +21,7 @@
 /* Selected VTK Toolkits                                                    */
 
 #cmakedefine VTK_USE_VIEWS
+#cmakedefine VTK_USE_GEOVIS
 #cmakedefine VTK_USE_INFOVIS
 #cmakedefine VTK_USE_PARALLEL
 #cmakedefine VTK_USE_RENDERING