Skip to content

Commit 3da03e3

Browse files
committed
ENH: Update VTKv9
List of changes: $ git shortlog db38b04..67087ee --no-merges Albert Ziegenhagel (3): find odbc: look for odbc32 library name find mysql: use 'mysql' path suffix when looking for 'mysql.h' improve find libharu Alexis Girault (8): Update README.md hyperlinks BUG: Update vtk.framework path to absolute path in VTKViewer ENH: Improve VTKViewer gesture handler ENH: Improve VTKViewer performance by limiting render calls UI: Hide status bar in VTKViewer UI: Update VTKViewer UI Add loading utilities in VTKViewer ENH: Add example data to VTKViewer Allison Vacanti (21): Write all information keys for inline XML formats. Add support for reading/writing bit arrays in IO/XML. Remove irrelevant comment. Expand IOXML test to test bit arrays and permute all writer options. Fix double free crash. Add vtkPermuteOptions testing utility. Use vtkPermuteOptions to simplify TestDataObjectXMLIO. Remove unnecessary `typename` token. Fully remove the deprecated vtkHyperOctree class. Initialize output in HTGSource. Reset per-level metadata in HTGSource before building. Keep external state constant during HTGSource execution. Remove unused texture binding. Add some more annotation points to vtkEDLShading. Teach EDLShading about viewports. Disable pointless comparison on relevant builds. Add RenderUtil function to annotate GL streams. Ensure viewport is correct when copying texture to FB. Retain renderer to recompute right rendered rectangle. Disable glDebugMessageInsert calls by default. Fix image reduction bug. Andrew Bauer (4): Fixing compiler warnings and an error Fixing issue with XMLPDataReader not reading abstract field data arrays Improving the vtkGradientFilter error message for a missing array. Making vtkCellArray::WritePointer() method set correct insert location Ben Boeckel (94): vtkModuleTop: write requirements.txt to the build tree Rendering/Matplotlib: indicate that matplotlib is required mpi4py: remove the import wslink: remove the import Twisted: remove the import constantly: remove the import hyperlink: remove the import incremental: remove the import txaio: remove the import AutobahnPython: remove the import ZopeInterface: remove the import SixPython: remove the import vtkRenderingFreeTypeFontConfig: exclude from python wrapping vtkFiltersReebGraph: use override where necessary vtkIOPostgreSQL: use override where necessary vtkFontConfigFreeTypeTools: use override where necessary vtkCocoaMacOSXSDKCompatibility: hide from language wrappers TestGLUTRenderWindow: handle deprecation of GLUT FindOpenSlide: find openslide the same way it is used TestPUnstructuredGridGhostCellsGenerator: use std::abs for floats vtkIOODBC: use override where necessary vtkTesting: move the skip code to vtkTesting vtkOpenSlideReader: use override vtkOpenGLImageGradient: use override vtkWrapHierarchy: define __VTK_WRAP_HIERARCHY__ vtkPythonAlgorithm: hide from non-Python languages vtkIOMySQL: use override where necessary vtkFFMPEGWriter: use override where necessary vtkSegYIOUtils: use unsigned short, not ushort vtkParallelTimer: use GetCurrentProcessId on Windows vtkFiltersParallel: force 2 processors for tests which expect it vtkFiltersParallelMPI: force 2 processors for tests which expect it vtkFiltersParallelMPI: force 2 processors for tests which expect it vtkParallelMPI: force 2 processors for tests which expect it vtkRenderingParallel: force 2 processors for tests which expect it vtkFiltersParallelGeometry: use 4 MPI processors for all C++ tests vtkXYZMolReader2: simplify includes vtkBlueObeliskDataParser: add the PrintSelf method vtkTemporalStreamTracer: remove use of VTK_USE_MPI vtkParallelMPI: remove VTK_USE_MPI define vtkAxisExtended: fix a copy-pasta description vtkmodules: use the vtkmodules Python package zlib: also import .gitattributes png: update the import file list lz4: update the import path list vtkDataCompressor: make SetCompressionLevel pure-virtual vtkIOAMR: fix some typos lzma: simplify the import a bit lzma: fix the shebang lzma: use lzma as the import name hdf5: trim down the HDF5 import hdf5: delete invalid import glew: add an import script glew: remove the old import FindEigen2: remove eigen: add an import script for eigen tiff: update the import file list jpeg: add an import script jpeg: remove old import eigen: add module metadata Filters/MomentInvariants: use vtkeigen vtkPCAStatistics: port from alglib to eigen alglib: remove from the repository gl2ps: add an import script gl2ps: remove old import netcdf: add an import script netcdf: remove the old import eigen: restrict to MPL2 code libharu: trim down the import expat: also import README.kitware.md lzma: handle static lzma properly hdf5: restore not finding imported targets exodusII: remove the old import exodus: add an import script jsoncpp: include the json directory cdash: ignore warnings from Eigen headers sqlite: update to use the new sqlite version properly mangled sqlite: add an update script sqlite: remove old import glew: add an option to support a system static library vtkMy: disable Python wrapping when built Windows static oggtheora: remove the old import ogg: add an import script ogg: add module metadata theora: add an import script theora: add module metadata vtkModuleMacros: fix export symbols for static kits WikiExamples: update for static build fixes TestGPURayCastDataTypes: avoid global static VTK objects mobile: bring superbuild flags to the top-level LSDyna: add ALE model data vtkXOpenGLRenderWindow: fix a memory leak vtkModuleMacrosPython: fix a typo hdf5: also include hdf5_hl in the library list Benjamin BENEY (2): ENH: Open url to load from outside of VTKViewer ENH: Add support of multiple files loading Benjamin Beney (1): Switch VTKViewer AppDelegate to swift Berk Geveci (3): Fixed memory leaks. Added support for reading/writing time from field data. Fixed bug introduced recently with field data / time changes. Bill Lorensen (3): ENH: Bump VTKExamples version Update WikiExamples.remote.cmake Update WikiExamples.remote.cmake Brad King (6): hdf5: Fix build-time tools to run under Emscripten vtkTestingMacros: Reference test executable targets directly Rendering/OpenGL2: Skip vtkProbeOpenGLVersion on Emscripten KWSys: Tell SystemTools::GetFilenameName to support Windows slashes vtkPWindBladeReader: Simplify variable offset computation KWSys: Backport build interface include directory fix to VTK 8.1 Chuck Atkins (1): Set default EGL device index from an environment variable Cory Quammen (2): Forward XMLFileName to the actual readers Mark the ExodusII reader as modified when XMLFileName changes Dan Lipsa (5): Duplicate point data to extruded points. Clear the priority queue between polylines. Replace baseline. Fix typo that made loop extraction not work on polylines. Fix duplicate point removal and documentation. David E. DeMarle (12): update for recent HTG API, vtk style and misc fixes Allow .vtm to hold .vhgs Fix Initialize in HyperTreeGrid. switch from char to bit array to compress files add a regression test plug a leak in the reader. loosen the tolerance on another hypertreegrid test Fix comp errors and warnings that the dashboards found. more style and cleanup per reviewer comments use std vector of strings instead of c array of strings standardize filename as htg per group agreement make some minor safety improvements David Gobbi (5): Sync vtkParse.y with vtkParse.tab.c 17190: parse braced initializer list in ctor. Remove unused member m_meth from vtkPythonOverloadHelper Add wrapper hint for GetParametricCoords. Remove vtksqlite headers from include path David Thompson (1): Allow flipped eigenvectors. Eigen Upstream (2): eigen 2018-01-29 (42bf761e) eigen 2018-01-31 (44f8430a) Expat Upstream (1): expat 2018-01-31 (88491aed) Fangjun Kuang (1): Fix typos. HDF Upstream (1): hdf5 2018-01-30 (b570219e) Jean-Christophe Fillion-Robin (1): cmake: Add hierarchy dependency to python target if it exists Joachim Pouderoux (2): Fix volume mapper based isosurfaces rendering with multicomponents arrays. GPUVolumeRayCastMapper shader was not update when "Shade" mode was switched. JsonCpp Upstream (1): jsoncpp 2018-01-23 (5dea330c) KWSys Upstream (4): KWSys 2018-01-19 (7495b13a) KWSys 2018-02-01 (04fcc449) KWSys 2018-02-20 (60a856f6) KWSys 2018-02-22 (73caabb8) Kamyar Ghandi (8): Fix Reading Beam TorsionResultant Fix Reading LSDyna SPH Material/Death Data Fix Reading LSDyna ALE Cell Data For 3D Solid Elements Support Reading LSDyna Cell Data For 2D ALE Shell Elements Simplify Code For Reading LSDyna Cell State Data Fix Calculation of PreStateSize. Clean up style issues. Fix type conversion warning. Ken Martin (18): rework the mtl file handling for obj/mtl files fix some dashboard warnings due to .c extension dataset mapper was not forwarding relative coincident parameters update documentation on the mapper regarding resolve coincident handle 1 pixel wide lines as tubes add support for sphere maps into vtkSkybox android seems to be missing stoi improve vtp exporter to handle composite datasets and repeating textures suppress note in eigen about shadowed var add some more missing eigen suppressions fix handling of large textures fix even more eigen warnings comparison was being done for the wrong case even more warnings really close now fix rare crashes when a mapper has no data provide support for existing multitexture calls fix a typo in the geometry shader tcoords fix a couple dashboard warnings and leaks Libharu Upstream (2): libharu 2018-01-31 (c87803c4) libharu 2018-02-06 (ed9fe694) Libpng Upstream (2): png 2018-01-24 (df748a32) png 2018-01-29 (c2469e8f) Mark Olesen (1): ENH: handle STL ASCII files with an empty solid (fixes #17221) Mathieu Westphal (1): Fix axes swapping computation in LPT Max Smolens (1): COMP: WIP: Fix inconsistent-missing-override warning Michael Migliore (4): Add culling for glyphs rendering Fix build error on iOS / OpenGL ES Fix culling shader on OSX Fix issue when the LOD geometry is only a point in 3D Glyphs Patricia K. Fasel (1): first working version of file format for HyperTreeGrid Philippe P. Pébaÿ (3): A new test re-creating old Octree case with HyperTreeGrid Including missing file Fixed a compilation warning Quincy Wofford (4): add liblzma from xz-utils v5.2.3 add VTK module support for liblzma add lzma compressor, compressionlevel set/get pull root CMakeLists from master branch Roxana Bujack (1): [FIX] bugfix: use grid instead if field Sankhesh Jhaveri (6): Automatically configure and add sanitizer blacklist flag Escape quotes around flags when generating HDF5 compile settings Export VTK targets as Android.mk to the Android NDK build system Fixed some memory leaks as detected by the leaks sanitizer Disable Android.mk export as it does not support LINK_ONLY Export VTK targets as Android.mk to the Android NDK build system Seacas Upstream (2): exodusII 2018-02-01 (aa620ee7) exodusII 2018-02-08 (efcb273b) Sean McBride (3): Updates for new cppcheck 1.82 Removed/Moved some kwsys includes Fixed a few operator= return values, made some =delete Sebastien Jourdain (6): WEB: Update protocols for better perf ENH: Add binary handling for geometry delivery ENH: Web Geometry Delivery to not send unused array WEB: Remove debug code Web: Better image streaming WEB: Clean ImageDelivery protocol Shawn Waldon (37): Handle simple filters with multiple output ports in composite pipeline Fix unused parameter warnings utf8: change branch to import so current module system is still used zlib: change branch to import so current module system is still used png: change branch to import so current module system is still used lz4: change branch to import so current module system is still used hdf5: update module for new HDF5 hdf5: change branch to import so current module system is still used vtkPNGReader: fix possible loss of data conversion warning glew: update for new glew version glew: change branch to import so current module system is still used tiff: change branch to import so current module system is still used jpeg: change branch to import so current module system is still used jpeg: Update vtk_jpeg.h.in for newer libjpeg jpeg: add .gitattributes file to import gl2ps: change branch to import so old module system is still used netcdf: backport changes from new module system for updated netcdf netcdf: change branch to import so old module system is still used libharu: update module CMake code to be more similar to new module system libharu: change branch to import so old module system is still used expat: backport header locations from new module system expat: change branch to import so old module system is still used exodusII: change branch to import so old module system is still used jsoncpp: remove logic from vtk_jsoncpp.h that was moved into jsoncpp jsoncpp: change branch to import so current module system is still used Readers: update to non-deprecated jsoncpp API exodusII: update cmake code for new imported version sqlite: change branch to import so old module system is still used IOSQL: exclude internal header from header test sqlite: add a find module and support for USE_SYSTEM_SQLITE3 IOMovie: update dependencies to reflect separate ogg and theora ogg: change branch to import so old module system is still used theora: change branch to import so old module system is still used IOMovie: update includes for separate vtkogg and vtktheora oggtheora: split and update cmake find module for oggtheora Link the GL2PS tests to OpenGL Update to new API for numpy 1.14 to avoid deprecation warnings Steve Pieper (1): BUG: WIP: fix vtkPickingManager interaction with widgets Sujin Philip (1): Update VTK-m Tiff Upstream (3): tiff 2018-01-29 (97937610) tiff 2018-01-31 (856a4f6c) tiff 2018-02-06 (ead0b7ec) Utkarsh Ayachit (16): Revert "Fix warning in FFMPEG 2.* or newer." vtkUGFacetReader: remove deprecated class Cleanup vtkDataArraySelection internals. Add `vtkDataArraySelection::Union` vtkMomentsTensor: fix performance warnings. vtkTransformFeedback: remove unused variable. Revert "mpi4py: remove the import" Add mpi4py to requirements.txt when using external. Refactor extracting arrays over time (vtkExtractArraysOverTime). add missing `override` in vtkPExtractDataArraysOverTime. update doxyfile to expand macros in vtkCommand.h minor API improvement in vtkMultiProcessStream. make vtkOutputWindow easier to subclass/use ignore deprecation warnings on legacy-enabled dashboards. Adding reader for AMReX particles. handle case where there are < 3 dims. Will Schroeder (4): New method to quickly pick/select points New filter to compute volume and area properties Add maximum error; handle closed loops Added new filter to drape height map with polydata Zlib Upstream (1): zlib 2018-01-22 (f6ab87f5) gl2ps Upstream (1): gl2ps 2018-01-29 (13e9e471) glew Upstream (1): glew 2018-01-31 (48f3df27) jpeg-turbo Upstream (2): jpeg 2018-01-25 (36d657e2) jpeg 2018-01-31 (b67afae0) luz.paz (7): MAINT: more misc. typos follow-up typos Few more typos Misc. typos Typo fixes Misc. typos Follow-up typo lz4 Upstream (3): lz4 2018-01-23 (42b004f9) lz4 2018-01-31 (ee6da925) lz4 2018-02-08 (2736d7e2) lzma Upstream (3): xz 2018-01-18 (d3e79a87) lzma 2018-01-29 (815e9ace) lzma 2018-01-31 (b5db2127) netcdf Upstream (3): netcdf 2018-02-07 (e8278d8f) netcdf 2018-02-08 (d482b7e9) netcdf 2018-02-08 (09480018) ogg Upstream (2): ogg 2018-02-02 (33d970e7) ogg 2018-02-13 (59daefa2) sqlite Upstream (1): sqlite 2018-02-07 (1e6c2aee) theora Upstream (1): theora 2018-02-02 (29df4ae4) utf8cpp Upstream (1): utf8 2018-01-22 (a3402f72) git-svn-id: http://svn.slicer.org/Slicer4/trunk@26940 3bd1e089-480b-0410-8dfb-8563597acbee
1 parent 3081fd1 commit 3da03e3

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#include <vtkProperty.h>
6767
#include <vtkRenderWindowInteractor.h>
6868
#include <vtkSmartPointer.h>
69+
#include <vtkTexture.h>
6970
#include <vtkTransformFilter.h>
7071
#include <vtkVersion.h>
7172
#include <vtkWeakPointer.h>

SuperBuild/External_VTKv9.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ set(_git_tag)
110110
if("${Slicer_VTK_VERSION_MAJOR}" STREQUAL "7")
111111
set(_git_tag "43f6ee36f6e28c8347768bd97df4d767da6b4ce7")
112112
elseif("${Slicer_VTK_VERSION_MAJOR}" STREQUAL "9")
113-
set(_git_tag "db38b04f8d90204a5e2dccbdacfefc4ded0d3ee0")
113+
set(_git_tag "67087ee105ae703eefd6d86023fe4764b7de5885")
114114
else()
115115
message(FATAL_ERROR "error: Unsupported Slicer_VTK_VERSION_MAJOR: ${Slicer_VTK_VERSION_MAJOR}")
116116
endif()

0 commit comments

Comments
 (0)