projects/apple/paraview.bundle.cmake

@@ -9,7 +9,9 @@ set(paraview_spdx_path "${paraview_appname}/Contents/Resources")
 include(paraview.bundle.common)
 
 if (NOT paraview_has_gui)
-  message(FATAL_ERROR "Creating the Apple package without the GUI is not supported.")
+  message(FATAL_ERROR
+    "Creating the Apple package without the GUI is not supported. Please "
+    "reconfigure and build with `-DENABLE_qt5=ON`")
 endif ()
 
 set(paraview_plugin_paths)
@@ -219,3 +221,10 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
 endforeach ()
 
 paraview_install_extra_data()
+
+if (proj_enabled)
+  install(
+    FILES       "${superbuild_install_location}/share/proj/proj.db"
+    DESTINATION "${paraview_appname}/Contents/Resources"
+    COMPONENT   superbuild)
+endif ()

projects/paraview.cmake

@@ -236,6 +236,7 @@ superbuild_add_project(paraview
     -DPARAVIEW_ENABLE_GDAL:BOOL=${gdal_enabled}
     -DPARAVIEW_ENABLE_PDAL:BOOL=${pdal_enabled}
     -DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
+    -DPARAVIEW_ENABLE_GEOVIS:BOOL=${proj_enabled}
     -DPARAVIEW_ENABLE_LOOKINGGLASS:BOOL=${lookingglass_enabled}
     -DPARAVIEW_ENABLE_MOTIONFX:BOOL=${PARAVIEW_ENABLE_MOTIONFX}
     -DPARAVIEW_ENABLE_OCCT:BOOL=${occt_enabled}

projects/ttk.cmake

@@ -165,7 +165,7 @@ endif ()
 # TODO: enable embree, for now
 # there is a missing embree3/rtcore.h (windows)
 superbuild_add_project(ttk
-  DEPENDS paraview boost cxx11
+    DEPENDS paraview boost cxx11
   DEPENDS_OPTIONAL eigen numpy openmp python3 scipy zfp zlib
   LICENSE_FILES
     LICENSE
@@ -188,6 +188,8 @@ superbuild_add_project(ttk
     -DTTK_ENABLE_SCIKIT_LEARN:BOOL=OFF
     -DTTK_ENABLE_ZFP:BOOL=${zfp_enabled}
 
+    -DTTK_MODULE_WRAP_PYTHON:BOOL=${python3_enabled}
+
     -DTTK_WHITELIST_MODE:BOOL=TRUE
     ${ttk_module_settings}
   )

projects/unix/paraview.bundle.unix.cmake

@@ -314,3 +314,10 @@ foreach (paraview_plugin IN LISTS paraview_plugins)
 endforeach ()
 
 paraview_install_extra_data()
+
+if (proj_enabled)
+  install(
+    FILES       "${superbuild_install_location}/share/proj/proj.db"
+    DESTINATION "share/proj"
+    COMPONENT   superbuild)
+endif ()

projects/win32/paraview.bundle.cmake

@@ -247,3 +247,10 @@ if (qt5_enabled)
 endif ()
 
 paraview_install_extra_data()
+
+if (proj_enabled)
+  install(
+    FILES       "${superbuild_install_location}/share/proj/proj.db"
+    DESTINATION "share/proj"
+    COMPONENT   superbuild)
+endif ()

superbuild @ 253cac13

-Subproject commit d78346b129600bfc818e9efdc82e6ece688edb0a
+Subproject commit 253cac1324bf083e26afeebd449bf7de9efc4be0

tests/paraview.test.cmake

@@ -139,6 +139,14 @@ if (openpmd_enabled)
   paraview_add_python_test("import-openpmd" "import_openpmd")
 endif ()
 
+if (proj_enabled AND numpy_enabled)
+  paraview_add_python_test("import-vtkGeoVis" "import_vtkGeoVis")
+endif ()
+
+if (ttk_enabled)
+  paraview_add_python_test("import-ttk" "import_ttk")
+endif ()
+
 # Test to load various data files to ensure reader support.
 if (silo_enabled)
   paraview_add_ui_test("data-csg.silo" "TestData-cs_silo"
@@ -163,6 +171,11 @@ if (ospray_enabled)
     "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/OSPRay.png")
 endif ()
 
+if (ttk_enabled)
+  paraview_add_ui_test("ttk" "TestTTK"
+    "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/TTK.png")
+endif ()
+
 paraview_add_test("version-server" "${pvserver_exe}"
   "--version")
 paraview_add_test("version-client" "${paraview_exe}"

tests/python/import_ttk.py

+from paraview.simple import LoadPlugin
+LoadPlugin("TopologyToolKit", ns=globals)
+
+from paraview.simple import TTKIcosphere
+TTKIcosphere()

tests/python/import_vtkGeoVis.py

+import vtk
+import numpy as np
+from vtkmodules.vtkGeovisCore import vtkGeoProjection, vtkGeoTransform
+
+def mklatloncurvilineargrid():
+	latrange = (-75.0, 75.0)
+	latstep = 1
+	lonrange = (-180.0,180.0)
+	lonstep = 2
+	points = vtk.vtkPoints()
+	dataset = vtk.vtkStructuredGrid()
+	data = vtk.vtkFloatArray()
+	data.SetName("vertical stripes")
+
+	latitudes = np.arange(latrange[0],latrange[1],latstep).tolist()
+
+	longitudes = np.arange(lonrange[0], lonrange[1],lonstep).tolist()
+
+	# Make the Point List for the Curvilinear Grid
+	# Also make a scalar field pattern:vertical lines every 10 degrees
+	# longitude
+	point_count = 0
+	for lat in latitudes:
+		for lon in longitudes:
+			points.InsertPoint(point_count, lon, lat, 0.0)
+			data.InsertNextValue( int(lon/10) % 2 )
+			point_count += 1
+
+	dataset.SetDimensions(len(longitudes),len(latitudes),1)
+	dataset.SetPoints(points)
+	dataset.GetPointData().AddArray(data)
+
+	return dataset
+
+
+def ConvertLatLonToRobinson(lonlatdataset):
+	LATLonString = ""
+	RobinsonString = "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
+	LonLatString = "+proj=lonlat +ellps=WGS84"
+	LonLatString = ""
+	transform = vtkGeoTransform()
+	source_projection = vtkGeoProjection()
+	destination_projection = vtkGeoProjection()
+	destination_projection.SetPROJ4String(RobinsonString)
+	source_projection.SetPROJ4String(LonLatString)
+	#transform.SetSourceProjection(source_projection)
+	transform.SetDestinationProjection(destination_projection)
+	newPoints = vtk.vtkPoints()
+	transform.TransformPoints(lonlatdataset.GetPoints(),newPoints)
+	robinson_dataset = vtk.vtkStructuredGrid()
+	dims=[0,0,0]
+	print (lonlatdataset.GetDimensions(dims))
+	robinson_dataset.SetDimensions(dims)
+	robinson_dataset.SetPoints(newPoints)
+	robinson_dataset.GetPointData().AddArray(lonlatdataset.GetPointData().GetArray(0))
+	return robinson_dataset
+
+
+mygrid = mklatloncurvilineargrid()
+print(mygrid)
+robgrid = ConvertLatLonToRobinson(mygrid)
+print(robgrid)

tests/xml/TestTTK.xml

+<?xml version="1.0" ?>
+<pqevents>
+  <!-- Load TTK manually -->
+  <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
+  <pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionManage_Plugins" />
+  <pqevent object="pqClientMainWindow/PluginManagerDialog/splitter/localGroup/localPlugins" command="setCurrent" arguments="TopologyToolKit" />
+  <pqevent object="pqClientMainWindow/PluginManagerDialog/splitter/localGroup/loadSelected_Local" command="activate" arguments="" />
+  <pqevent object="pqClientMainWindow/PluginManagerDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
+
+  <!-- Call a TTK source -->
+  <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
+  <pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="&amp;Alphabetical" />
+  <pqevent object="pqClientMainWindow/menubar/menuSources/Alphabetical" command="activate" arguments="ttkIcosphere" />
+  <pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/Accept" command="activate" arguments="" />
+
+  <pqevent object="pqClientMainWindow/axesToolbar/actionShowCenterAxes" command="set_boolean" arguments="false" />
+  <pqevent object="pqClientMainWindow/axesToolbar/actionShowOrientationAxes" command="set_boolean" arguments="false" />
+</pqevents>

versions.cmake

@@ -245,9 +245,9 @@ superbuild_set_revision(zeromq
   URL_MD5 "c897d4005a3f0b8276b00b7921412379")
 
 superbuild_set_selectable_source(adios2
-  SELECT v2.8.3 DEFAULT
-    URL     "https://www.paraview.org/files/dependencies/adios-v2.8.3.tar.gz"
-    URL_MD5 "80a36713332517b4ff0c927dedc0a662"
+  SELECT v2.9.1 DEFAULT
+    URL     "https://www.paraview.org/files/dependencies/adios-v2.9.1.tar.gz"
+    URL_MD5 "716ea25b2eca18eb7d35df68856d4640"
   SELECT git CUSTOMIZABLE
     GIT_REPOSITORY "https://github.com/ornladios/ADIOS2.git"
     GIT_TAG        "origin/master")
@@ -297,8 +297,8 @@ superbuild_set_revision(launchers
   SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/launchers")
 
 superbuild_set_revision(openpmd
-  URL     "https://www.paraview.org/files/dependencies/openPMD-api-0.14.3.tar.gz"
-  URL_MD5 "1b840b111b24c3bad5e22a0405492613")
+  URL     "https://www.paraview.org/files/dependencies/openPMD-api-0.15.2.tar.gz"
+  URL_MD5 "31f85620215b9bc86b70b1ad96ba4588")
 
 superbuild_set_revision(pythonpkgconfig
   URL     "https://www.paraview.org/files/dependencies/pkgconfig-1.5.5.tar.gz"