diff -Nru paraview-5.10.1/Adaptors/Cam/Grid.h paraview-5.11.0~rc1+dfsg/Adaptors/Cam/Grid.h --- paraview-5.10.1/Adaptors/Cam/Grid.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/Cam/Grid.h 2022-09-01 19:52:20.000000000 +0000 @@ -146,7 +146,6 @@ /// is made only for indexes that are shared between 2 or 3 faces. void MinFaceIndex(int side, int index[3]) const; -private: int MpiRank; /// MPI rank int ChunkCapacity; /// maximum number of (vertical) columns in a chunk int NCells2d; /// total number of 2D cells on a MPI processor diff -Nru paraview-5.10.1/Adaptors/Cam/Grid.txx paraview-5.11.0~rc1+dfsg/Adaptors/Cam/Grid.txx --- paraview-5.10.1/Adaptors/Cam/Grid.txx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/Cam/Grid.txx 2022-09-01 19:52:20.000000000 +0000 @@ -216,8 +216,8 @@ class Grid::Internals { public: - Internals() {} - ~Internals() {} + Internals() = default; + ~Internals() = default; typedef std::map MapType; std::map CellId2d; // lon x lat -> cellId std::map PointId2d; // lon x lat -> pointId @@ -260,10 +260,7 @@ template Grid::~Grid() { - if (this->Lev) - { - delete[] this->Lev; - } + delete[] this->Lev; delete this->Impl; } diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPBaseFieldBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPBaseFieldBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPBaseFieldBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPBaseFieldBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -49,7 +49,7 @@ protected: vtkCPBaseFieldBuilder(); - ~vtkCPBaseFieldBuilder(); + ~vtkCPBaseFieldBuilder() override; private: vtkCPBaseFieldBuilder(const vtkCPBaseFieldBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPBaseGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPBaseGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPBaseGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPBaseGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -43,7 +43,7 @@ protected: vtkCPBaseGridBuilder(); - ~vtkCPBaseGridBuilder(); + ~vtkCPBaseGridBuilder() override; private: vtkCPBaseGridBuilder(const vtkCPBaseGridBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPCellFieldBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPCellFieldBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPCellFieldBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPCellFieldBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -35,7 +35,7 @@ /** * Return a field on Grid. */ - virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) override; + void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) override; /** * Return the highest order of discretization of the field. @@ -44,7 +44,7 @@ protected: vtkCPCellFieldBuilder(); - ~vtkCPCellFieldBuilder(); + ~vtkCPCellFieldBuilder() override; private: vtkCPCellFieldBuilder(const vtkCPCellFieldBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPConstantScalarFieldFunction.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPConstantScalarFieldFunction.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPConstantScalarFieldFunction.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPConstantScalarFieldFunction.h 2022-09-01 19:52:20.000000000 +0000 @@ -36,7 +36,7 @@ /** * Compute the field value at Point which is an array of length 3. */ - virtual double ComputeComponenentAtPoint( + double ComputeComponenentAtPoint( unsigned int component, double* point, unsigned long timeStep, double time) override; //@{ @@ -49,7 +49,7 @@ protected: vtkCPConstantScalarFieldFunction(); - ~vtkCPConstantScalarFieldFunction(); + ~vtkCPConstantScalarFieldFunction() override; private: vtkCPConstantScalarFieldFunction(const vtkCPConstantScalarFieldFunction&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPFieldBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPFieldBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPFieldBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPFieldBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -36,7 +36,7 @@ /** * Return a field on Grid. */ - virtual void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) override = 0; + void BuildField(unsigned long TimeStep, double Time, vtkDataSet* Grid) override = 0; /** * Return the highest order of discretization of the field. @@ -61,7 +61,7 @@ protected: vtkCPFieldBuilder(); - ~vtkCPFieldBuilder(); + ~vtkCPFieldBuilder() override; private: vtkCPFieldBuilder(const vtkCPFieldBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPFileGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPFileGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPFileGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPFileGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -39,7 +39,7 @@ * that were returned were already built before. * vtkCPFileGridBuilder will also delete the grid. */ - virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; //@{ /** @@ -72,7 +72,7 @@ protected: vtkCPFileGridBuilder(); - ~vtkCPFileGridBuilder(); + ~vtkCPFileGridBuilder() override; /** * Function to set the grid and take care of the reference counting. diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -39,8 +39,7 @@ * that were returned were already built before. * vtkCPGridBuilder will also delete the grid. */ - virtual vtkDataObject* GetGrid( - unsigned long timeStep, double time, int& builtNewGrid) override = 0; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override = 0; //@{ /** @@ -52,7 +51,7 @@ protected: vtkCPGridBuilder(); - ~vtkCPGridBuilder(); + ~vtkCPGridBuilder() override; private: vtkCPGridBuilder(const vtkCPGridBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPLinearScalarFieldFunction.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPLinearScalarFieldFunction.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPLinearScalarFieldFunction.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPLinearScalarFieldFunction.h 2022-09-01 19:52:20.000000000 +0000 @@ -37,7 +37,7 @@ /** * Compute the field value at Point. */ - virtual double ComputeComponenentAtPoint( + double ComputeComponenentAtPoint( unsigned int component, double point[3], unsigned long timeStep, double time) override; //@{ @@ -82,7 +82,7 @@ protected: vtkCPLinearScalarFieldFunction(); - ~vtkCPLinearScalarFieldFunction(); + ~vtkCPLinearScalarFieldFunction() override; private: vtkCPLinearScalarFieldFunction(const vtkCPLinearScalarFieldFunction&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPMultiBlockGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPMultiBlockGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPMultiBlockGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPMultiBlockGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -41,7 +41,7 @@ * Return a grid. BuiltNewGrid is 0 if the grid is the same * as the last time step. */ - virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; /** * Get the Grid. @@ -75,7 +75,7 @@ protected: vtkCPMultiBlockGridBuilder(); - ~vtkCPMultiBlockGridBuilder(); + ~vtkCPMultiBlockGridBuilder() override; /** * Set the Grid. diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPNodalFieldBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPNodalFieldBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPNodalFieldBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPNodalFieldBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -35,11 +35,11 @@ /** * Return a field on Grid. */ - virtual void BuildField(unsigned long timeStep, double time, vtkDataSet* grid) override; + void BuildField(unsigned long timeStep, double time, vtkDataSet* grid) override; protected: vtkCPNodalFieldBuilder(); - ~vtkCPNodalFieldBuilder(); + ~vtkCPNodalFieldBuilder() override; private: vtkCPNodalFieldBuilder(const vtkCPNodalFieldBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPScalarFieldFunction.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPScalarFieldFunction.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPScalarFieldFunction.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPScalarFieldFunction.h 2022-09-01 19:52:20.000000000 +0000 @@ -35,17 +35,17 @@ * Get the NumberOfComponents. This is abstract to make sure * that the value for the NumberOfComponents cannot be changed. */ - virtual unsigned int GetNumberOfComponents() override { return 1; }; + unsigned int GetNumberOfComponents() override { return 1; }; /** * Compute the field value at Point. */ - virtual double ComputeComponenentAtPoint( + double ComputeComponenentAtPoint( unsigned int component, double point[3], unsigned long timeStep, double time) override = 0; protected: vtkCPScalarFieldFunction(); - ~vtkCPScalarFieldFunction(); + ~vtkCPScalarFieldFunction() override; private: vtkCPScalarFieldFunction(const vtkCPScalarFieldFunction&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPTensorFieldFunction.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPTensorFieldFunction.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPTensorFieldFunction.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPTensorFieldFunction.h 2022-09-01 19:52:20.000000000 +0000 @@ -45,7 +45,7 @@ protected: vtkCPTensorFieldFunction(); - ~vtkCPTensorFieldFunction(); + ~vtkCPTensorFieldFunction() override; private: vtkCPTensorFieldFunction(const vtkCPTensorFieldFunction&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPTestDriver.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPTestDriver.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPTestDriver.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPTestDriver.h 2022-09-01 19:52:20.000000000 +0000 @@ -76,7 +76,7 @@ protected: vtkCPTestDriver(); - ~vtkCPTestDriver(); + ~vtkCPTestDriver() override; private: vtkCPTestDriver(const vtkCPTestDriver&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPUniformGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPUniformGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPUniformGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPUniformGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -40,7 +40,7 @@ * that were returned were already built before. * vtkCPUniformGridBuilder will also delete the grid. */ - virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; //@{ /** @@ -79,7 +79,7 @@ protected: vtkCPUniformGridBuilder(); - ~vtkCPUniformGridBuilder(); + ~vtkCPUniformGridBuilder() override; private: vtkCPUniformGridBuilder(const vtkCPUniformGridBuilder&) = delete; diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPUnstructuredGridBuilder.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPUnstructuredGridBuilder.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPUnstructuredGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPUnstructuredGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -43,7 +43,7 @@ * that were returned were already built before. * vtkCPUnstructuredGridBuilder will also delete the grid. */ - virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; /** * Get the UnstructuredGrid. @@ -72,7 +72,7 @@ protected: vtkCPUnstructuredGridBuilder(); - ~vtkCPUnstructuredGridBuilder(); + ~vtkCPUnstructuredGridBuilder() override; /** * Flag to indicate if UnstructuredGrid has been modified since last call diff -Nru paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPVector3FieldFunction.h paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPVector3FieldFunction.h --- paraview-5.10.1/Adaptors/CatalystTestDriver/vtkCPVector3FieldFunction.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CatalystTestDriver/vtkCPVector3FieldFunction.h 2022-09-01 19:52:20.000000000 +0000 @@ -34,17 +34,17 @@ /** * Get the NumberOfComponents. */ - virtual unsigned int GetNumberOfComponents() override { return 3; }; + unsigned int GetNumberOfComponents() override { return 3; }; /** * Compute the field value at Point. */ - virtual double ComputeComponenentAtPoint( + double ComputeComponenentAtPoint( unsigned int component, double point[3], unsigned long timeStep, double time) override = 0; protected: vtkCPVector3FieldFunction(); - ~vtkCPVector3FieldFunction(); + ~vtkCPVector3FieldFunction() override; private: vtkCPVector3FieldFunction(const vtkCPVector3FieldFunction&) = delete; diff -Nru paraview-5.10.1/Adaptors/CTH/vtkCTHDataArray.h paraview-5.11.0~rc1+dfsg/Adaptors/CTH/vtkCTHDataArray.h --- paraview-5.10.1/Adaptors/CTH/vtkCTHDataArray.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CTH/vtkCTHDataArray.h 2022-09-01 19:52:20.000000000 +0000 @@ -261,7 +261,7 @@ protected: vtkCTHDataArray(); - ~vtkCTHDataArray(); + ~vtkCTHDataArray() override; int Dimensions[3]; diff -Nru paraview-5.10.1/Adaptors/CTH/vtkCTHSource.h paraview-5.11.0~rc1+dfsg/Adaptors/CTH/vtkCTHSource.h --- paraview-5.10.1/Adaptors/CTH/vtkCTHSource.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/CTH/vtkCTHSource.h 2022-09-01 19:52:20.000000000 +0000 @@ -42,7 +42,7 @@ // Description: // Initialize block parameters for block_id void InitializeBlock(int block_id, int Nx, int Ny, int Nz, double* x, double* y, double* z, - int active, int active1, int level); + int allocated, int active, int level); // Description: // Initialize field parameters for field_id void SetCellFieldName(int field_id, char* field_name, char* comment, int matid); @@ -53,7 +53,7 @@ void SetMaterialFieldPointer(int block_id, int field_id, int mat, int k, int j, double* istrip); // Description: // Update block parameters for block_id (due to refinement/coarsening) - void UpdateBlock(int block_id, int active, int active1, int level, int max_level, int bxbot, + void UpdateBlock(int block_id, int allocated, int active, int level, int max_level, int bxbot, int bxtop, int bybot, int bytop, int bzbot, int bztop, int* neighb_proc, int* neighb_block); virtual int FillInputData(vtkCPInputDataDescription* input); diff -Nru paraview-5.10.1/Adaptors/Particle/vtkParticlePipeline.h paraview-5.11.0~rc1+dfsg/Adaptors/Particle/vtkParticlePipeline.h --- paraview-5.10.1/Adaptors/Particle/vtkParticlePipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Adaptors/Particle/vtkParticlePipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -86,7 +86,7 @@ protected: vtkParticlePipeline(); - virtual ~vtkParticlePipeline(); + ~vtkParticlePipeline() override; void SetupPipeline(); diff -Nru paraview-5.10.1/Clients/ADIOS/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/ADIOS/CMakeLists.txt --- paraview-5.10.1/Clients/ADIOS/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ADIOS/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,31 @@ +# Plugin infrastructure added in ADIOS 2.8.0 +# 2.8.3 has a fix needed for catalyst live +find_package(ADIOS2 2.8.3 REQUIRED + COMPONENTS CXX C + OPTIONAL_COMPONENTS MPI Fortran) +find_package(catalyst 2.0 REQUIRED) + +add_library(ParaViewADIOSInSituEngine + ParaViewFidesEngine.cxx) + +include(GenerateExportHeader) +generate_export_header(ParaViewADIOSInSituEngine) + +target_link_libraries(ParaViewADIOSInSituEngine + PUBLIC + adios2::adios2 + adios2::cxx11 + adios2::core + PRIVATE + catalyst::catalyst +) + +target_include_directories(ParaViewADIOSInSituEngine PUBLIC + "$" + "$") + +install(TARGETS ParaViewADIOSInSituEngine DESTINATION lib + EXPORT ParaViewADIOSInSituEngineTargets) +install(EXPORT ParaViewADIOSInSituEngineTargets + FILE ParaViewADIOSInSituEngineTargets.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ADIOS) diff -Nru paraview-5.10.1/Clients/ADIOS/ParaViewFidesEngine.cxx paraview-5.11.0~rc1+dfsg/Clients/ADIOS/ParaViewFidesEngine.cxx --- paraview-5.10.1/Clients/ADIOS/ParaViewFidesEngine.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ADIOS/ParaViewFidesEngine.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,203 @@ +/*========================================================================= + + Program: ParaView + Module: ParaViewFidesEngine.cxx + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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 "ParaViewFidesEngine.h" + +#include + +#include + +#include +#include + +namespace fides_plugin +{ + +struct ParaViewFidesEngine::EngineImpl +{ + adios2::core::IO* Io; + adios2::core::Engine* Writer; + + std::string ScriptFileName; + std::string JSONFileName; + + int Rank; + + EngineImpl(adios2::core::ADIOS& adios) + { + this->Io = &adios.DeclareIO("InlinePluginIO"); + this->Io->SetEngine("inline"); + this->Writer = &Io->Open("write", adios2::Mode::Write); + } + + void CatalystConfig() + { + std::cout << "\tCatalyst Library Version: " << CATALYST_VERSION << "\n"; + std::cout << "\tCatalyst ABI Version: " << CATALYST_ABI_VERSION << "\n"; + + conduit_cpp::Node node; + catalyst_about(conduit_cpp::c_node(&node)); + auto implementation = node.has_path("catalyst/implementation") + ? node["catalyst/implementation"].as_string() + : std::string("stub"); + std::cout << "\tImplementation: " << implementation << "\n\n"; + } + + void CatalystInit() + { + conduit_cpp::Node node; + node["catalyst/scripts/script/filename"].set(this->ScriptFileName); + + // options to set up the fides reader in paraview + std::ostringstream address; + address << &Io; + + node["catalyst/fides/json_file"].set(this->JSONFileName); + node["catalyst/fides/data_source_io/source"].set(std::string("source")); + node["catalyst/fides/data_source_io/address"].set(address.str()); + node["catalyst/fides/data_source_path/source"].set(std::string("source")); + node["catalyst/fides/data_source_path/path"].set(std::string("DataReader")); + catalyst_initialize(conduit_cpp::c_node(&node)); + + if (this->Rank == 0) + { + this->CatalystConfig(); + } + } + + void CatalystExecute() + { + auto timestep = this->Writer->CurrentStep(); + conduit_cpp::Node node; + node["catalyst/state/timestep"].set(timestep); + // catalyst requires the next one, but when using Fides as the reader for + // Catalyst, it will grab the time from the correct adios variable if it is + // specified in the data model + node["catalyst/state/time"].set(timestep); + node["catalyst/channels/fides/type"].set(std::string("fides")); + + // catalyst requires the data node on a channel, but we don't actually + // need it when using fides, so just create a dummy object to pass + // the validation in catalyst + conduit_cpp::Node dummy; + dummy["dummy"].set(0); + node["catalyst/channels/fides/data"].set(dummy); + + catalyst_execute(conduit_cpp::c_node(&node)); + } +}; + +ParaViewFidesEngine::ParaViewFidesEngine( + adios2::core::IO& io, const std::string& name, adios2::helper::Comm comm) + : adios2::plugin::PluginEngineInterface(io, name, adios2::Mode::Write, comm.Duplicate()) + , Impl(new EngineImpl(io.m_ADIOS)) +{ + // Need to define the Variables in the IO object used for the inline engine + const auto& varMap = io.GetVariables(); + for (const auto& it : varMap) + { + if (it.second->m_Type == adios2::DataType::Compound) + { + } +#define declare_type(T) \ + else if (it.second->m_Type == adios2::helper::GetDataType()) \ + { \ + this->Impl->Io->DefineVariable(it.first, it.second->m_Shape, it.second->m_Start, \ + it.second->m_Count, it.second->IsConstantDims()); \ + } + ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) +#undef declare_type + } + + this->Impl->Rank = comm.Rank(); + + const auto& scriptIt = this->m_IO.m_Parameters.find("Script"); + if (scriptIt != this->m_IO.m_Parameters.end()) + { + this->Impl->ScriptFileName = scriptIt->second; + } + + // TODO required for now, but support data model generation in the future + const auto& fileIt = this->m_IO.m_Parameters.find("DataModel"); + if (fileIt == this->m_IO.m_Parameters.end()) + { + throw std::runtime_error("couldn't find DataModel in parameters!"); + } + this->Impl->JSONFileName = fileIt->second; + + this->Impl->CatalystInit(); +} + +ParaViewFidesEngine::~ParaViewFidesEngine() +{ + conduit_cpp::Node node; + catalyst_finalize(conduit_cpp::c_node(&node)); +} + +adios2::StepStatus ParaViewFidesEngine::BeginStep(adios2::StepMode mode, const float timeoutSeconds) +{ + return this->Impl->Writer->BeginStep(mode, timeoutSeconds); +} + +size_t ParaViewFidesEngine::CurrentStep() const +{ + return this->Impl->Writer->CurrentStep(); +} + +void ParaViewFidesEngine::EndStep() +{ + this->Impl->Writer->EndStep(); + + this->Impl->CatalystExecute(); +} + +void ParaViewFidesEngine::PerformPuts() +{ + this->Impl->Writer->PerformPuts(); +} + +#define declare(T) \ + void ParaViewFidesEngine::DoPutSync(adios2::core::Variable& variable, const T* values) \ + { \ + adios2::core::Variable* inlineVar = this->Impl->Io->InquireVariable(variable.m_Name); \ + this->Impl->Writer->Put(*inlineVar, values, adios2::Mode::Sync); \ + } \ + void ParaViewFidesEngine::DoPutDeferred(adios2::core::Variable& variable, const T* values) \ + { \ + adios2::core::Variable* inlineVar = this->Impl->Io->InquireVariable(variable.m_Name); \ + this->Impl->Writer->Put(*inlineVar, values); \ + } +ADIOS2_FOREACH_STDTYPE_1ARG(declare) +#undef declare + +void ParaViewFidesEngine::DoClose(const int transportIndex) +{ + this->Impl->Writer->Close(transportIndex); +} + +} // end namespace fides_plugin + +extern "C" +{ + + fides_plugin::ParaViewFidesEngine* EngineCreate(adios2::core::IO& io, const std::string& name, + const adios2::Mode mode, adios2::helper::Comm comm) + { + (void)mode; + return new fides_plugin::ParaViewFidesEngine(io, name, comm.Duplicate()); + } + + void EngineDestroy(fides_plugin::ParaViewFidesEngine* obj) { delete obj; } +} diff -Nru paraview-5.10.1/Clients/ADIOS/ParaViewFidesEngine.h paraview-5.11.0~rc1+dfsg/Clients/ADIOS/ParaViewFidesEngine.h --- paraview-5.10.1/Clients/ADIOS/ParaViewFidesEngine.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ADIOS/ParaViewFidesEngine.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,91 @@ +/*========================================================================= + + Program: ParaView + Module: ParaViewFidesEngine.h + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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. + +=========================================================================*/ + +#ifndef PARAVIEWFIDESENGINE_H +#define PARAVIEWFIDESENGINE_H + +#include "paraviewadiosinsituengine_export.h" + +#include "adios2/common/ADIOSMacros.h" +#include "adios2/common/ADIOSTypes.h" +#include "adios2/core/IO.h" +#include "adios2/engine/plugin/PluginEngineInterface.h" +#include "adios2/helper/adiosComm.h" +#include "adios2/helper/adiosType.h" + +#include + +namespace fides_plugin +{ + +/** + * ParaViewFidesEngine: An engine plugin for ADIOS2 that supports in situ + * visualization with the Inline engine. This engine handles the writing + * side of things by forwarding Puts onto the Inline writer. + * To handle to read side of things, a ParaView Fides reader is set up + * so the written data can be used in a visualization pipeline. + * Finally, the engine uses ParaView's catalyst infrastructure to run + * python scripts that set up the visualization pipeline. + * + * Parameters to be passed to ADIOS to use this engine: + * Key -> Value + * "Script" -> "/path/to/python/script" + * - Python script that sets up ParaView pipeline for visualization + * "DataModel" -> "/path/to/json" + * - Fides JSON data model file + * + */ +class ParaViewFidesEngine : public adios2::plugin::PluginEngineInterface +{ + +public: + ParaViewFidesEngine(adios2::core::IO& adios, const std::string& name, adios2::helper::Comm comm); + + ~ParaViewFidesEngine() override; + + adios2::StepStatus BeginStep(adios2::StepMode mode, const float timeoutSeconds = -1.0) override; + + void EndStep() override; + + size_t CurrentStep() const override; + + void PerformPuts() override; + +protected: +#define declare_type(T) \ + void DoPutSync(adios2::core::Variable&, const T*) override; \ + void DoPutDeferred(adios2::core::Variable&, const T*) override; + ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) +#undef declare_type + + void DoClose(const int transportIndex = -1) override; + +private: + struct EngineImpl; + std::unique_ptr Impl; +}; + +} // end namespace fides_plugin + +extern "C" +{ + + PARAVIEWADIOSINSITUENGINE_EXPORT fides_plugin::ParaViewFidesEngine* EngineCreate( + adios2::core::IO& io, const std::string& name, const adios2::Mode mode, + adios2::helper::Comm comm); + PARAVIEWADIOSINSITUENGINE_EXPORT void EngineDestroy(fides_plugin::ParaViewFidesEngine* obj); +} + +#endif // PARAVIEWFIDESENGINE_H diff -Nru paraview-5.10.1/Clients/Catalyst/Testing/Cxx/vtkCustomUnstructuredGridBuilder.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/Testing/Cxx/vtkCustomUnstructuredGridBuilder.h --- paraview-5.10.1/Clients/Catalyst/Testing/Cxx/vtkCustomUnstructuredGridBuilder.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/Testing/Cxx/vtkCustomUnstructuredGridBuilder.h 2022-09-01 19:52:20.000000000 +0000 @@ -44,7 +44,7 @@ * that were returned were already built before. * vtkCustomUnstructuredGridBuilder will also delete the grid. */ - virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; + vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override; /** * Customized function to build UnstructuredGrid. @@ -53,7 +53,7 @@ protected: vtkCustomUnstructuredGridBuilder(); - ~vtkCustomUnstructuredGridBuilder(); + ~vtkCustomUnstructuredGridBuilder() override; /** * Method to compute the centroid of Cell and return the values in xyz. diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPAdaptorAPI.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPAdaptorAPI.h --- paraview-5.10.1/Clients/Catalyst/vtkCPAdaptorAPI.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPAdaptorAPI.h 2022-09-01 19:52:20.000000000 +0000 @@ -60,7 +60,7 @@ protected: vtkCPAdaptorAPI(); - ~vtkCPAdaptorAPI(); + ~vtkCPAdaptorAPI() override; static vtkCPDataDescription* CoProcessorData; static vtkCPProcessor* CoProcessor; diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPCxxHelper.cxx paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPCxxHelper.cxx --- paraview-5.10.1/Clients/Catalyst/vtkCPCxxHelper.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPCxxHelper.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -19,7 +19,6 @@ #include "vtkMultiProcessController.h" #include "vtkNew.h" #include "vtkObjectFactory.h" -#include "vtkPVConfig.h" // Required to get build options for paraview #include "vtkPVPluginTracker.h" #include "vtkProcessModule.h" #include "vtkProcessModuleConfiguration.h" @@ -87,7 +86,8 @@ vtkCPCxxHelper::Instance = instance; - if (auto pm = vtkProcessModule::GetProcessModule()) + auto pm = vtkProcessModule::GetProcessModule(); + if (pm) { vtkCPCxxHelper::ParaViewExternallyInitialized = true; } @@ -117,11 +117,11 @@ delete[] argv[0]; delete[] argv; - } - // Create session, if none exists. - auto pm = vtkProcessModule::GetProcessModule(); - assert(pm != nullptr); + // Create session when none exists. + pm = vtkProcessModule::GetProcessModule(); + assert(pm != nullptr); + } // register static plugins ParaView_paraview_plugins_initialize(); diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPCxxHelper.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPCxxHelper.h --- paraview-5.10.1/Clients/Catalyst/vtkCPCxxHelper.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPCxxHelper.h 2022-09-01 19:52:20.000000000 +0000 @@ -37,7 +37,7 @@ protected: vtkCPCxxHelper(); - virtual ~vtkCPCxxHelper(); + ~vtkCPCxxHelper() override; private: vtkCPCxxHelper(const vtkCPCxxHelper&) = delete; diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPDataDescription.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPDataDescription.h --- paraview-5.10.1/Clients/Catalyst/vtkCPDataDescription.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPDataDescription.h 2022-09-01 19:52:20.000000000 +0000 @@ -102,7 +102,7 @@ protected: vtkCPDataDescription(); - virtual ~vtkCPDataDescription(); + ~vtkCPDataDescription() override; private: vtkCPDataDescription(const vtkCPDataDescription&) = delete; diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPPipeline.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPPipeline.h --- paraview-5.10.1/Clients/Catalyst/vtkCPPipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPPipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -50,7 +50,7 @@ protected: vtkCPPipeline(); - virtual ~vtkCPPipeline(); + ~vtkCPPipeline() override; private: vtkCPPipeline(const vtkCPPipeline&) = delete; diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPProcessor.cxx paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPProcessor.cxx --- paraview-5.10.1/Clients/Catalyst/vtkCPProcessor.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPProcessor.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -14,8 +14,6 @@ =========================================================================*/ #include "vtkCPProcessor.h" -#include "vtkPVConfig.h" // need ParaView defines before MPI stuff - #include "vtkCPCxxHelper.h" #include "vtkCPDataDescription.h" #include "vtkCPInputDataDescription.h" diff -Nru paraview-5.10.1/Clients/Catalyst/vtkCPXMLPWriterPipeline.h paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPXMLPWriterPipeline.h --- paraview-5.10.1/Clients/Catalyst/vtkCPXMLPWriterPipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Catalyst/vtkCPXMLPWriterPipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -51,7 +51,7 @@ protected: vtkCPXMLPWriterPipeline(); - virtual ~vtkCPXMLPWriterPipeline(); + ~vtkCPXMLPWriterPipeline() override; private: vtkCPXMLPWriterPipeline(const vtkCPXMLPWriterPipeline&) = delete; diff -Nru paraview-5.10.1/Clients/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/CMakeLists.txt --- paraview-5.10.1/Clients/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -9,3 +9,7 @@ "limited support, The `paraview` Qt client will not be built.") endif () endif () + +if (PARAVIEW_ENABLE_FIDES AND PARAVIEW_ENABLE_CATALYST) + add_subdirectory(ADIOS) +endif() diff -Nru paraview-5.10.1/Clients/CommandLineExecutables/pvbatch.cxx paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvbatch.cxx --- paraview-5.10.1/Clients/CommandLineExecutables/pvbatch.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvbatch.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -15,11 +15,18 @@ #include "pvpython.h" // include this 1st. #include "vtkOutputWindow.h" -#include "vtkPVConfig.h" // Required to get build options for paraview #include "vtkProcessModule.h" +#if defined(_WIN32) && !defined(__MINGW32__) +int wmain(int argc, wchar_t* wargv[]) +#else int main(int argc, char* argv[]) +#endif { +#if defined(_WIN32) && !defined(__MINGW32__) + vtkWideArgsConverter converter(argc, wargv); + char** argv = converter.GetArgs(); +#endif // Setup the output window to be vtkOutputWindow, rather than platform // specific one. This avoids creating vtkWin32OutputWindow on Windows, for // example, which puts all Python errors in a window rather than the terminal diff -Nru paraview-5.10.1/Clients/CommandLineExecutables/pvpython.cxx paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvpython.cxx --- paraview-5.10.1/Clients/CommandLineExecutables/pvpython.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvpython.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -15,11 +15,18 @@ #include "pvpython.h" // Include this first. #include "vtkOutputWindow.h" -#include "vtkPVConfig.h" // Required to get build options for paraview #include "vtkProcessModule.h" +#if defined(_WIN32) && !defined(__MINGW32__) +int wmain(int argc, wchar_t* wargv[]) +#else int main(int argc, char* argv[]) +#endif { +#if defined(_WIN32) && !defined(__MINGW32__) + vtkWideArgsConverter converter(argc, wargv); + char** argv = converter.GetArgs(); +#endif // Setup the output window to be vtkOutputWindow, rather than platform // specific one. This avoids creating vtkWin32OutputWindow on Windows, for // example, which puts all Python errors in a window rather than the terminal diff -Nru paraview-5.10.1/Clients/CommandLineExecutables/pvpython.h paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvpython.h --- paraview-5.10.1/Clients/CommandLineExecutables/pvpython.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvpython.h 2022-09-01 19:52:20.000000000 +0000 @@ -12,7 +12,6 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#include "vtkPVConfig.h" // Required to get build options for paraview extern "C" { @@ -41,8 +40,8 @@ //--------------------------------------------------------------------------- -void ProcessArgsForPython(std::vector& pythonArgs, const std::vector& args, - int vtkNotUsed(argc), char** argv) +inline void ProcessArgsForPython(std::vector& pythonArgs, + const std::vector& args, int vtkNotUsed(argc), char** argv) { pythonArgs.clear(); @@ -64,7 +63,7 @@ pythonArgs.push_back(vtksys::SystemTools::DuplicateString("-m")); std::string modulename = vtksys::SystemTools::GetFilenameWithoutLastExtension( - vtksys::SystemTools::GetFilenameName(args[0].c_str())); + vtksys::SystemTools::GetFilenameName(args[0])); pythonArgs.push_back(vtksys::SystemTools::DuplicateString(modulename.c_str())); } else @@ -79,13 +78,31 @@ } //--------------------------------------------------------------------------- -int Run(int processType, int argc, char* argv[]) +inline int Run(int processType, int argc, char* argv[]) { - // Setup options vtkInitializationHelper::SetApplicationName("ParaView"); + // Setup options auto options = vtk::TakeSmartPointer(vtkCLIOptions::New()); - const auto status = vtkInitializationHelper::Initialize(argc, argv, processType, options); + auto status = vtkInitializationHelper::InitializeOptions(argc, argv, processType, options); + if (!status) + { + return vtkInitializationHelper::GetExitCode(); + } + + // register callback to initialize modules statically. The callback is + // empty when BUILD_SHARED_LIBS is ON. + vtkPVInitializePythonModules(); + + // Setup python options + std::vector pythonArgs; + ProcessArgsForPython(pythonArgs, options->GetExtraArguments(), argc, argv); + pythonArgs.push_back(nullptr); + vtkPythonInterpreter::InitializeWithArgs( + 1, static_cast(pythonArgs.size()) - 1, &pythonArgs.front()); + + // Do the rest of the initialization + status = vtkInitializationHelper::InitializeMiscellaneous(processType); if (!status) { return vtkInitializationHelper::GetExitCode(); @@ -99,10 +116,6 @@ vtkProcessModule* pm = vtkProcessModule::GetProcessModule(); - // register callback to initialize modules statically. The callback is - // empty when BUILD_SHARED_LIBS is ON. - vtkPVInitializePythonModules(); - // register static plugins ParaView_paraview_plugins_initialize(); @@ -117,11 +130,6 @@ } else { - // Process arguments - std::vector pythonArgs; - ProcessArgsForPython(pythonArgs, options->GetExtraArguments(), argc, argv); - pythonArgs.push_back(nullptr); - // if user specified verbosity option on command line, then we make vtkPythonInterpreter post // log information as INFO, otherwise we leave it at default which is TRACE. auto pmConfig = vtkProcessModuleConfiguration::GetInstance(); @@ -130,18 +138,16 @@ ? vtkLogger::VERBOSITY_INFO : vtkLogger::VERBOSITY_TRACE); - // Start interpretor - vtkPythonInterpreter::Initialize(); - ret_val = vtkPythonInterpreter::PyMain(static_cast(pythonArgs.size()) - 1, &pythonArgs.front()); + } - // Free python args - for (auto& ptr : pythonArgs) - { - delete[] ptr; - } + // Free python args + for (auto& ptr : pythonArgs) + { + delete[] ptr; } + // Exit application vtkInitializationHelper::Finalize(); return ret_val; diff -Nru paraview-5.10.1/Clients/CommandLineExecutables/pvserver_common.h paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvserver_common.h --- paraview-5.10.1/Clients/CommandLineExecutables/pvserver_common.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/CommandLineExecutables/pvserver_common.h 2022-09-01 19:52:20.000000000 +0000 @@ -12,7 +12,6 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#include "vtkPVConfig.h" #include "vtkCLIOptions.h" #include "vtkInitializationHelper.h" diff -Nru paraview-5.10.1/Clients/InSitu/catalyst/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/CMakeLists.txt --- paraview-5.10.1/Clients/InSitu/catalyst/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -23,13 +23,9 @@ "${catalyst_rel_rpath}") endif () +# setup this property so other place in the code can use catalyst (c.f. Examples) set_property(GLOBAL PROPERTY paraview_catalyst_directory "${catalyst_library_destination}") -# Transport the variable needed for Catalyst's CMake API from -# `ThirdParty/catalyst/CMakeLists.txt`. -get_property(_catalyst_macro_directory GLOBAL - PROPERTY paraview_catalyst_macro_directory) - catalyst_implementation( NAME paraview TARGET catalyst-paraview @@ -39,14 +35,14 @@ ParaViewCatalyst.cxx vtkCatalystBlueprint.cxx vtkCatalystBlueprint.h - CATALYST_TARGET ParaView::vtkcatalyst) + CATALYST_TARGET catalyst::catalyst) add_library(ParaView::catalyst-paraview ALIAS catalyst-paraview) target_link_libraries(catalyst-paraview PRIVATE ParaView::InSitu ParaView::VTKExtensionsCore - ParaView::VTKExtensionsConduit + VTK::IOCatalystConduit ParaView::RemotingServerManager) if (TARGET VTK::ParallelMPI) @@ -61,10 +57,17 @@ VTK::IOIOSS) endif () +if (TARGET VTK::IOFides) + target_link_libraries(catalyst-paraview + PRIVATE + VTK::IOFides) +endif () + target_compile_definitions(catalyst-paraview PRIVATE "VTK_MODULE_ENABLE_VTK_ParallelMPI=$" - "VTK_MODULE_ENABLE_VTK_IOIOSS=$") + "VTK_MODULE_ENABLE_VTK_IOIOSS=$" + "VTK_MODULE_ENABLE_VTK_IOFides=$") if (TARGET VTK::Python) # Simulations loading the ParaView Catalyst implementation might not have diff -Nru paraview-5.10.1/Clients/InSitu/catalyst/ParaViewCatalyst.cxx paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/ParaViewCatalyst.cxx --- paraview-5.10.1/Clients/InSitu/catalyst/ParaViewCatalyst.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/ParaViewCatalyst.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -43,11 +43,15 @@ #include "vtkIOSSReader.h" #endif +#if VTK_MODULE_ENABLE_VTK_IOFides +#include "vtkFidesReader.h" +#endif + #include "catalyst_impl_paraview.h" static bool update_producer_mesh_blueprint(const std::string& channel_name, const conduit_node* node, const conduit_node* global_fields, bool multimesh, - const conduit_node* assemblyNode) + const conduit_node* assemblyNode, bool multiblock) { auto producer = vtkInSituInitializationHelper::GetProducer(channel_name); if (producer == nullptr) @@ -67,6 +71,7 @@ algo->SetNode(node); algo->SetGlobalFieldsNode(global_fields); algo->SetUseMultiMeshProtocol(multimesh); + algo->SetOutputMultiBlock(multiblock); algo->SetAssemblyNode(assemblyNode); vtkInSituInitializationHelper::MarkProducerModified(channel_name); return true; @@ -123,6 +128,63 @@ #endif } +#if VTK_MODULE_ENABLE_VTK_IOFides +static bool create_producer_fides(const std::string& channel_name, const conduit_cpp::Node& node) +{ + // For the ADIOS Inline engine, the reader proxy must be created before simulation + // steps can start + auto producer = vtkInSituInitializationHelper::GetProducer(channel_name); + if (producer == nullptr) + { + auto pxm = vtkSMProxyManager::GetProxyManager()->GetActiveSessionProxyManager(); + producer = vtkSMSourceProxy::SafeDownCast(pxm->NewProxy("sources", "FidesJSONReader")); + if (!producer) + { + vtkLogF(ERROR, "Failed to create 'Fides' proxy!"); + return false; + } + + vtkSMPropertyHelper(producer, "FileName").Set(node["json_file"].as_string().c_str()); + vtkSMPropertyHelper(producer, "DataSourceIO") + .Set(0, node["data_source_io/source"].as_string().c_str()); + vtkSMPropertyHelper(producer, "DataSourceIO") + .Set(1, node["data_source_io/address"].as_string().c_str()); + vtkSMPropertyHelper(producer, "DataSourcePath") + .Set(0, node["data_source_path/source"].as_string().c_str()); + vtkSMPropertyHelper(producer, "DataSourcePath") + .Set(1, node["data_source_path/path"].as_string().c_str()); + vtkInSituInitializationHelper::SetProducer(channel_name, producer); + producer->UpdateVTKObjects(); + // Required so that vtkFidesReader will setup the inline reader + producer->UpdatePipelineInformation(); + producer->Delete(); + } + + return true; +} +#endif + +static bool update_producer_fides(const std::string& channel_name, double& time) +{ +#if VTK_MODULE_ENABLE_VTK_IOFides + auto producer = vtkInSituInitializationHelper::GetProducer(channel_name); + if (producer == nullptr) + { + vtkLogF(ERROR, "Fides producer doesn't exist!"); + return false; + } + auto algo = vtkFidesReader::SafeDownCast(producer->GetClientSideObject()); + algo->PrepareNextStep(); + time = algo->GetTimeOfCurrentStep(); + vtkInSituInitializationHelper::MarkProducerModified(channel_name); + return true; +#else + (void)channel_name; + (void)time; + return false; +#endif +} + static bool process_script_args(vtkInSituPipelinePython* pipeline, const conduit_cpp::Node& node) { std::vector args; @@ -277,6 +339,16 @@ "analysis pipelines will be executed."); } +#if VTK_MODULE_ENABLE_VTK_IOFides + // For the ADIOS Inline engine, the reader proxy must be created before simulation + // steps can start + if (cpp_params.has_path("catalyst/fides")) + { + auto& fidesParams = cpp_params["catalyst/fides"]; + create_producer_fides("fides", fidesParams); + } +#endif + return catalyst_status_ok; } @@ -304,7 +376,10 @@ const int timestep = root.has_path("state/timestep") ? root["state/timestep"].to_int64() : (root.has_path("state/cycle") ? root["state/cycle"].to_int64() : 0); - const double time = root.has_path("state/time") ? root["state/time"].to_float64() : 0; + double time = root.has_path("state/time") ? root["state/time"].to_float64() : 0; + + const int output_multiblock = + root.has_path("state/multiblock") ? root["state/multiblock"].to_int() : 0; vtkVLogScopeF( PARAVIEW_LOG_CATALYST_VERBOSITY(), "co-processing for timestep=%d, time=%f", timestep, time); @@ -334,6 +409,10 @@ const double channel_time = channel_node.has_path("state/time") ? channel_node["state/time"].to_float64() : time; + const int channel_output_multiblock = channel_node.has_path("state/multiblock") + ? channel_node["state/multiblock"].to_int() + : output_multiblock; + if (type == "mesh") { conduit_cpp::Node info; @@ -380,6 +459,17 @@ vtkLogF(ERROR, "IOSS mesh is not supported by this build. Rebuild with IOSS enabled."); #endif } + else if (type == "fides") + { +#if VTK_MODULE_ENABLE_VTK_IOFides + is_valid = true; + vtkVLogF(PARAVIEW_LOG_CATALYST_VERBOSITY(), + "Fides mesh detected for channel (%s); validation will be skipped for now", + channel_name.c_str()); +#else + vtkLogF(ERROR, "Fides mesh is not supported by this build. Rebuild with Fides enabled."); +#endif + } else { is_valid = false; @@ -407,12 +497,17 @@ assembly = conduit_cpp::c_node(&anode); } update_producer_mesh_blueprint(channel_name, conduit_cpp::c_node(&data_node), - conduit_cpp::c_node(&fields), type == "multimesh", assembly); + conduit_cpp::c_node(&fields), type == "multimesh", assembly, + channel_output_multiblock != 0); } else if (type == "ioss") { update_producer_ioss(channel_name, &data_node, &fields); } + else if (type == "fides") + { + update_producer_fides(channel_name, time); + } } } else diff -Nru paraview-5.10.1/Clients/InSitu/catalyst/vtkCatalystBlueprint.cxx paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/vtkCatalystBlueprint.cxx --- paraview-5.10.1/Clients/InSitu/catalyst/vtkCatalystBlueprint.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/vtkCatalystBlueprint.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -286,10 +286,60 @@ { vtkVLogF(PARAVIEW_LOG_CATALYST_VERBOSITY(), "'time' set to %lf", n["time"].to_float64()); } + + if (n.has_child("multiblock") && !n["multiblock"].dtype().is_integer()) + { + vtkLogF(ERROR, "'multiblock' must be an integral."); + return false; + } + else if (n.has_child("multiblock")) + { + vtkVLogF( + PARAVIEW_LOG_CATALYST_VERBOSITY(), "'multiblock' set to %" PRIi32, n["multiblock"].to_int()); + } + return true; } } // namespace state +namespace state_fields +{ +bool verify(const std::string& protocol, const conduit_cpp::Node& n) +{ + vtkVLogF(PARAVIEW_LOG_CATALYST_VERBOSITY(), "%s: verify", protocol.c_str()); + if (!n.dtype().is_object()) + { + vtkLogF(ERROR, "node must be an 'object'."); + return false; + } + + const conduit_index_t nchildren = n.number_of_children(); + for (conduit_index_t i = 0; i < nchildren; ++i) + { + auto child = n.child(i); + // String nodes are supported, let's check other types. + if (!child.dtype().is_string()) + { + conduit_cpp::Node info; + if (!conduit_cpp::BlueprintMcArray::verify(child, info)) + { + // in some-cases, this may directly be an array of numeric values; if so, handle that. + if (!child.dtype().is_number()) + { + vtkLogF(ERROR, + "Validation of mesh state field '%s' failed. Expected types are: string, MCArrays or " + "numeric values.", + child.name().c_str()); + return false; + } + } + } + } + + return true; +} +} // namespace state_fields + namespace channel { bool verify(const std::string& protocol, const conduit_cpp::Node& n) @@ -337,6 +387,14 @@ /* vtkVLog(PARAVIEW_LOG_CATALYST_VERBOSITY(), << info.to_json()); */ return false; } + + if (n.has_path("state/fields")) + { + if (!state_fields::verify(protocol + "::state::fields", n["state/fields"])) + { + return false; + } + } } else if (type == "multimesh") { @@ -357,6 +415,14 @@ /* vtkVLog(PARAVIEW_LOG_CATALYST_VERBOSITY(), << info.to_json()); */ return false; } + + if (child.has_path("state/fields")) + { + if (!state_fields::verify(protocol + "::state::fields", child["state/fields"])) + { + return false; + } + } } vtkVLogScopeF(PARAVIEW_LOG_CATALYST_VERBOSITY(), "multimesh blueprint verified."); } @@ -364,6 +430,10 @@ { // no additional verification at this time. } + else if (type == "fides") + { + // no additional verification at this time. + } else { vtkLogF(ERROR, "unsupported channel type '%s' specified.", type.c_str()); @@ -399,6 +469,7 @@ } } // namespace channels + bool verify(const std::string& protocol, const conduit_cpp::Node& n) { vtkVLogScopeF(PARAVIEW_LOG_CATALYST_VERBOSITY(), "%s: verify", protocol.c_str()); diff -Nru paraview-5.10.1/Clients/InSitu/catalyst/vtkCatalystBlueprint.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/vtkCatalystBlueprint.h --- paraview-5.10.1/Clients/InSitu/catalyst/vtkCatalystBlueprint.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/catalyst/vtkCatalystBlueprint.h 2022-09-01 19:52:20.000000000 +0000 @@ -45,7 +45,7 @@ protected: vtkCatalystBlueprint(); - ~vtkCatalystBlueprint(); + ~vtkCatalystBlueprint() override; private: vtkCatalystBlueprint(const vtkCatalystBlueprint&) = delete; diff -Nru paraview-5.10.1/Clients/InSitu/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/InSitu/CMakeLists.txt --- paraview-5.10.1/Clients/InSitu/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -29,18 +29,27 @@ # #========================================================================== set(classes - vtkDataObjectToConduit + vtkInSituInitializationHelper vtkInSituPipeline vtkInSituPipelineIO vtkInSituPipelinePython - vtkInSituInitializationHelper) + ) vtk_module_add_module(ParaView::InSitu CLASSES ${classes}) vtk_module_client_server_exclude() -# vtk_module_link(ParaView::InSitu -# PRIVATE -# # for plugins, in case of static builds. -# ParaView::paraview_plugins) -add_subdirectory(catalyst) +if (PARAVIEW_ENABLE_CATALYST) + if (NOT TARGET VTK::IOCatalystConduit) + message(FATAL_ERROR "Cannot build Catalyst implementation without VTK::IOCatalystConduit module enabled") + endif () + + vtk_module_find_package(PACKAGE catalyst VERSION 2.0 COMPONENTS SDK) + set_property(GLOBAL PROPERTY vtk_catalyst_dir_ClientsInSitu "${catalyst_DIR}") + + add_subdirectory(catalyst) + + vtk_module_link(ParaView::InSitu + PRIVATE + catalyst::catalyst) +endif () diff -Nru paraview-5.10.1/Clients/InSitu/Testing/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/CMakeLists.txt --- paraview-5.10.1/Clients/InSitu/Testing/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -add_subdirectory(Cxx) diff -Nru paraview-5.10.1/Clients/InSitu/Testing/Cxx/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/Cxx/CMakeLists.txt --- paraview-5.10.1/Clients/InSitu/Testing/Cxx/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/Cxx/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -vtk_add_test_cxx(vtkPVInSituCatalystCxxTests tests - NO_DATA NO_VALID NO_OUTPUT - TestDataObjectToConduit.cxx) - -vtk_test_cxx_executable(vtkPVInSituCatalystCxxTests tests) diff -Nru paraview-5.10.1/Clients/InSitu/Testing/Cxx/TestDataObjectToConduit.cxx paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/Cxx/TestDataObjectToConduit.cxx --- paraview-5.10.1/Clients/InSitu/Testing/Cxx/TestDataObjectToConduit.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/Testing/Cxx/TestDataObjectToConduit.cxx 1970-01-01 00:00:00.000000000 +0000 @@ -1,801 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: TestDataObjectToConduit.cxx - - Copyright (c) Kitware, Inc. - All rights reserved. - See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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 "vtkDataObjectToConduit.h" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -bool TestNonDataSetObject() -{ - conduit_cpp::Node node; - vtkNew table; - - auto previous_verbosity = vtkLogger::GetCurrentVerbosityCutoff(); - vtkLogger::SetStderrVerbosity(vtkLogger::VERBOSITY_OFF); - - bool is_table_supported = vtkDataObjectToConduit::FillConduitNode(table, node); - - vtkLogger::SetStderrVerbosity(previous_verbosity); - - return !is_table_supported; -} - -bool TestImageData() -{ - conduit_cpp::Node node; - vtkNew image; - - image->SetDimensions(2, 3, 1); - image->SetSpacing(10, 20, 30); - image->SetOrigin(-1, -2, -3); - image->AllocateScalars(VTK_INT, 1); - int* dims = image->GetDimensions(); - - for (int z = 0; z < dims[2]; z++) - { - for (int y = 0; y < dims[1]; y++) - { - for (int x = 0; x < dims[0]; x++) - { - image->SetScalarComponentFromFloat(x, y, z, 0, 2); - } - } - } - - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(image), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestImageData" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "uniform"; - coords_node["dims/i"] = image->GetDimensions()[0]; - coords_node["dims/j"] = image->GetDimensions()[1]; - coords_node["dims/k"] = image->GetDimensions()[2]; - coords_node["origin/x"] = image->GetOrigin()[0]; - coords_node["origin/y"] = image->GetOrigin()[1]; - coords_node["origin/z"] = image->GetOrigin()[2]; - coords_node["spacing/dx"] = image->GetSpacing()[0]; - coords_node["spacing/dy"] = image->GetSpacing()[1]; - coords_node["spacing/dz"] = image->GetSpacing()[2]; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "uniform"; - topologies_node["coordset"] = "coords"; - - auto field_node = expected_node["fields/ImageScalars"]; - field_node["association"] = "vertex"; - field_node["topology"] = "mesh"; - field_node["volume_dependent"] = "false"; - field_node["values"] = std::vector{ 2, 2, 2, 2, 2, 2 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestRectilinearGrid() -{ - conduit_cpp::Node node; - vtkNew rectilinear_grid; - - rectilinear_grid->SetDimensions(2, 3, 1); - - std::vector x_coordinates = { 0, 2 }; - vtkNew xArray; - xArray->SetArray(x_coordinates.data(), x_coordinates.size(), 1); - rectilinear_grid->SetXCoordinates(xArray); - - std::vector y_coordinates = { 0, 1, 2 }; - vtkNew yArray; - yArray->SetArray(y_coordinates.data(), y_coordinates.size(), 1); - rectilinear_grid->SetYCoordinates(yArray); - - std::vector z_coordinates = { 0 }; - vtkNew zArray; - zArray->SetArray(z_coordinates.data(), z_coordinates.size(), 1); - rectilinear_grid->SetZCoordinates(zArray); - - std::vector field_values = { 0, 0, 1, 2, 2, 4, 3, 6, 4, 8, 5, 10 }; - vtkNew fieldArray; - fieldArray->SetName("rectilinear_field"); - fieldArray->SetNumberOfComponents(2); - fieldArray->SetNumberOfTuples(6); - fieldArray->SetArray(field_values.data(), field_values.size(), 1); - - rectilinear_grid->GetPointData()->AddArray(fieldArray); - - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(rectilinear_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestRectilinearGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "rectilinear"; - coords_node["values/x"] = x_coordinates; - coords_node["values/y"] = y_coordinates; - coords_node["values/z"] = z_coordinates; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "rectilinear"; - topologies_node["coordset"] = "coords"; - - auto field_node = expected_node["fields/rectilinear_field"]; - field_node["association"] = "vertex"; - field_node["topology"] = "mesh"; - field_node["volume_dependent"] = "false"; - field_node["values"] = field_values; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestStructuredGrid() -{ - conduit_cpp::Node node; - vtkNew structured_grid; - - vtkIdType nx = 2, ny = 3, nz = 2; - auto dataSize = nx * ny * nz; - - vtkNew pointValues; - pointValues->SetNumberOfComponents(1); - pointValues->SetNumberOfTuples(dataSize); - for (vtkIdType i = 0; i < dataSize; ++i) - { - pointValues->SetValue(i, i); - } - pointValues->SetName("point_field"); - - auto numberOfCells = (nx - 1) * (ny - 1) * (nz - 1); - vtkNew cellValues; - cellValues->SetNumberOfTuples(numberOfCells); - for (vtkIdType i = 0; i < numberOfCells; ++i) - { - cellValues->SetValue(i, i * 2.0); - } - cellValues->SetName("cell_field"); - - vtkNew points; - auto x = 0.0; - auto y = 0.0; - auto z = 0.0; - for (unsigned int k = 0; k < nz; k++) - { - z += 2.0; - for (unsigned int j = 0; j < ny; j++) - { - y += 1.0; - for (unsigned int i = 0; i < nx; i++) - { - x += .5; - points->InsertNextPoint(x, y, z); - } - } - } - - structured_grid->SetDimensions(static_cast(nx), static_cast(ny), static_cast(nz)); - structured_grid->SetPoints(points); - structured_grid->GetCellData()->SetScalars(cellValues); - structured_grid->GetPointData()->SetScalars(pointValues); - - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(structured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestStructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = - std::vector{ 0.5, 1, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 5.5, 6.0 }; - coords_node["values/y"] = std::vector{ 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6 }; - coords_node["values/z"] = std::vector{ 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "structured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/dims/i"] = 2; - topologies_node["elements/dims/j"] = 3; - topologies_node["elements/dims/k"] = 2; - - auto point_field_node = expected_node["fields/point_field"]; - point_field_node["association"] = "vertex"; - point_field_node["topology"] = "mesh"; - point_field_node["volume_dependent"] = "false"; - point_field_node["values"] = std::vector{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 0, 2 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -static double unstructured_grid_points_coordinates[27][3] = { { 0, 0, 0 }, { 1, 0, 0 }, { 2, 0, 0 }, - { 0, 1, 0 }, { 1, 1, 0 }, { 2, 1, 0 }, { 0, 0, 1 }, { 1, 0, 1 }, { 2, 0, 1 }, { 0, 1, 1 }, - { 1, 1, 1 }, { 2, 1, 1 }, { 0, 1, 2 }, { 1, 1, 2 }, { 2, 1, 2 }, { 0, 1, 3 }, { 1, 1, 3 }, - { 2, 1, 3 }, { 0, 1, 4 }, { 1, 1, 4 }, { 2, 1, 4 }, { 0, 1, 5 }, { 1, 1, 5 }, { 2, 1, 5 }, - { 0, 1, 6 }, { 1, 1, 6 }, { 2, 1, 6 } }; - -static struct -{ - VTKCellType cell_type; - std::vector connectivity; -} unstructured_grid_cell_connectivities[] = { { VTK_HEXAHEDRON, { 0, 1, 4, 3, 6, 7, 10, 9 } }, - { VTK_HEXAHEDRON, { 1, 2, 5, 4, 7, 8, 11, 10 } }, { VTK_TETRA, { 6, 10, 9, 12 } }, - { VTK_TETRA, { 8, 11, 10, 14 } }, { VTK_POLYGON, { 16, 17, 14, 13, 12, 15 } }, - { VTK_TRIANGLE_STRIP, { 18, 15, 19, 16, 20, 17 } }, { VTK_QUAD, { 22, 23, 20, 19 } }, - { VTK_TRIANGLE, { 21, 22, 18 } }, { VTK_TRIANGLE, { 22, 19, 18 } }, { VTK_LINE, { 23, 26 } }, - { VTK_LINE, { 21, 24 } }, { VTK_VERTEX, { 25 } } }; - -bool TestMixedShapedUnstructuredGrid() -{ - conduit_cpp::Node node; - vtkNew unstructured_grid; - - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - - unstructured_grid->Allocate(100); - for (auto const& connectivity : unstructured_grid_cell_connectivities) - { - unstructured_grid->InsertNextCell( - connectivity.cell_type, connectivity.connectivity.size(), connectivity.connectivity.data()); - } - - auto previous_verbosity = vtkLogger::GetCurrentVerbosityCutoff(); - vtkLogger::SetStderrVerbosity(vtkLogger::VERBOSITY_OFF); - - bool is_filling_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - vtkLogger::SetStderrVerbosity(previous_verbosity); - - // Not supported for now. - return !is_filling_success; -} - -bool TestHexahedronUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[0].cell_type, - unstructured_grid_cell_connectivities[0].connectivity.size(), - unstructured_grid_cell_connectivities[0].connectivity.data()); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[1].cell_type, - unstructured_grid_cell_connectivities[1].connectivity.size(), - unstructured_grid_cell_connectivities[1].connectivity.data()); - - vtkNew cellValues; - cellValues->SetNumberOfTuples(2); - cellValues->SetValue(0, 10); - cellValues->SetValue(1, -10); - cellValues->SetName("cell_field"); - unstructured_grid->GetCellData()->AddArray(cellValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestHexahedronUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node0 = expected_node["topologies/mesh"]; - topologies_node0["type"] = "unstructured"; - topologies_node0["coordset"] = "coords"; - topologies_node0["elements/shape"] = "hex"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node0["elements/connectivity"] = - std::vector{ 0, 1, 4, 3, 6, 7, 10, 9, 1, 2, 5, 4, 7, 8, 11, 10 }; - } - else - { - topologies_node0["elements/connectivity"] = - std::vector{ 0, 1, 4, 3, 6, 7, 10, 9, 1, 2, 5, 4, 7, 8, 11, 10 }; - } - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10, -10 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestTetrahedronUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[2].cell_type, - unstructured_grid_cell_connectivities[2].connectivity.size(), - unstructured_grid_cell_connectivities[2].connectivity.data()); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[3].cell_type, - unstructured_grid_cell_connectivities[3].connectivity.size(), - unstructured_grid_cell_connectivities[3].connectivity.data()); - - vtkNew cellValues; - cellValues->SetNumberOfTuples(2); - cellValues->SetValue(0, 10); - cellValues->SetValue(1, -10); - cellValues->SetName("cell_field"); - unstructured_grid->GetCellData()->AddArray(cellValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestTetrahedronUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/shape"] = "tet"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node["elements/connectivity"] = - std::vector{ 6, 10, 9, 12, 8, 11, 10, 14 }; - } - else - { - topologies_node["elements/connectivity"] = - std::vector{ 6, 10, 9, 12, 8, 11, 10, 14 }; - } - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10, -10 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestQuadUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[6].cell_type, - unstructured_grid_cell_connectivities[6].connectivity.size(), - unstructured_grid_cell_connectivities[6].connectivity.data()); - - vtkNew pointValues; - pointValues->SetNumberOfTuples(4); - pointValues->SetValue(0, 10); - pointValues->SetValue(1, -10); - pointValues->SetValue(2, 20); - pointValues->SetValue(3, -20); - pointValues->SetName("point_field"); - unstructured_grid->GetPointData()->AddArray(pointValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestQuadUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/shape"] = "quad"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node["elements/connectivity"] = std::vector{ 22, 23, 20, 19 }; - } - else - { - topologies_node["elements/connectivity"] = std::vector{ 22, 23, 20, 19 }; - } - - auto cell_field_node = expected_node["fields/point_field"]; - cell_field_node["association"] = "vertex"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10, -10, 20, -20 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestTriangleUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[7].cell_type, - unstructured_grid_cell_connectivities[7].connectivity.size(), - unstructured_grid_cell_connectivities[7].connectivity.data()); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[8].cell_type, - unstructured_grid_cell_connectivities[8].connectivity.size(), - unstructured_grid_cell_connectivities[8].connectivity.data()); - - vtkNew cellValues; - cellValues->SetNumberOfTuples(2); - cellValues->SetValue(0, 10); - cellValues->SetValue(1, -10); - cellValues->SetName("cell_field"); - unstructured_grid->GetCellData()->AddArray(cellValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestTriangleUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/shape"] = "tri"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node["elements/connectivity"] = std::vector{ 21, 22, 18, 22, 19, 18 }; - } - else - { - topologies_node["elements/connectivity"] = std::vector{ 21, 22, 18, 22, 19, 18 }; - } - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10, -10 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestLineUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[9].cell_type, - unstructured_grid_cell_connectivities[9].connectivity.size(), - unstructured_grid_cell_connectivities[9].connectivity.data()); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[10].cell_type, - unstructured_grid_cell_connectivities[10].connectivity.size(), - unstructured_grid_cell_connectivities[10].connectivity.data()); - - vtkNew cellValues; - cellValues->SetNumberOfTuples(2); - cellValues->SetValue(0, 10); - cellValues->SetValue(1, -10); - cellValues->SetName("cell_field"); - unstructured_grid->GetCellData()->AddArray(cellValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestLineUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/shape"] = "line"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node["elements/connectivity"] = std::vector{ 23, 26, 21, 24 }; - } - else - { - topologies_node["elements/connectivity"] = std::vector{ 23, 26, 21, 24 }; - } - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10, -10 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestPointUnstructuredGrid() -{ - vtkNew unstructured_grid; - vtkNew points; - for (int i = 0; i < 27; i++) - { - points->InsertPoint(i, unstructured_grid_points_coordinates[i]); - } - unstructured_grid->SetPoints(points); - unstructured_grid->Allocate(100); - unstructured_grid->InsertNextCell(unstructured_grid_cell_connectivities[11].cell_type, - unstructured_grid_cell_connectivities[11].connectivity.size(), - unstructured_grid_cell_connectivities[11].connectivity.data()); - - vtkNew cellValues; - cellValues->SetNumberOfTuples(1); - cellValues->SetValue(0, 10); - cellValues->SetName("cell_field"); - unstructured_grid->GetCellData()->AddArray(cellValues); - - conduit_cpp::Node node; - bool is_success = - vtkDataObjectToConduit::FillConduitNode(vtkDataObject::SafeDownCast(unstructured_grid), node); - - if (!is_success) - { - std::cerr << "FillConduitNode failed for TestPointUnstructuredGrid" << std::endl; - return is_success; - } - - conduit_cpp::Node expected_node; - auto coords_node = expected_node["coordsets/coords"]; - coords_node["type"] = "explicit"; - coords_node["values/x"] = std::vector{ 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, - 2, 0, 1, 2, 0, 1, 2, 0, 1, 2 }; - coords_node["values/y"] = std::vector{ 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - coords_node["values/z"] = std::vector{ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, - 3, 4, 4, 4, 5, 5, 5, 6, 6, 6 }; - - auto topologies_node = expected_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - topologies_node["elements/shape"] = "point"; - if (unstructured_grid->GetCells()->IsStorage64Bit()) - { - topologies_node["elements/connectivity"] = std::vector{ 25 }; - } - else - { - topologies_node["elements/connectivity"] = std::vector{ 25 }; - } - - auto cell_field_node = expected_node["fields/cell_field"]; - cell_field_node["association"] = "element"; - cell_field_node["topology"] = "mesh"; - cell_field_node["volume_dependent"] = "false"; - cell_field_node["values"] = std::vector{ 10 }; - - conduit_cpp::Node diff_info; - bool are_nodes_different = node.diff(expected_node, diff_info, 1e-6); - if (are_nodes_different) - { - diff_info.print(); - } - - is_success = !are_nodes_different; - - return is_success; -} - -bool TestUnstructuredGrid() -{ - bool is_success = true; - - is_success &= TestMixedShapedUnstructuredGrid(); - is_success &= TestHexahedronUnstructuredGrid(); - is_success &= TestTetrahedronUnstructuredGrid(); - is_success &= TestQuadUnstructuredGrid(); - is_success &= TestTriangleUnstructuredGrid(); - is_success &= TestLineUnstructuredGrid(); - is_success &= TestPointUnstructuredGrid(); - - return is_success; -} - -int TestDataObjectToConduit(int, char*[]) -{ - bool is_success = true; - - is_success &= TestNonDataSetObject(); - is_success &= TestImageData(); - is_success &= TestRectilinearGrid(); - is_success &= TestStructuredGrid(); - is_success &= TestUnstructuredGrid(); - - return is_success ? EXIT_SUCCESS : EXIT_FAILURE; -} diff -Nru paraview-5.10.1/Clients/InSitu/vtkDataObjectToConduit.cxx paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkDataObjectToConduit.cxx --- paraview-5.10.1/Clients/InSitu/vtkDataObjectToConduit.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkDataObjectToConduit.cxx 1970-01-01 00:00:00.000000000 +0000 @@ -1,464 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: vtkDataObjectToConduit.cxx - - Copyright (c) Kitware, Inc. - All rights reserved. - See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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 "vtkDataObjectToConduit.h" - -#include "vtkAOSDataArrayTemplate.h" -#include "vtkCellData.h" -#include "vtkDataArray.h" -#include "vtkDataObject.h" -#include "vtkDataSet.h" -#include "vtkFieldData.h" -#include "vtkImageData.h" -#include "vtkLogger.h" -#include "vtkPointData.h" -#include "vtkPointSet.h" -#include "vtkPoints.h" -#include "vtkRectilinearGrid.h" -#include "vtkSOADataArrayTemplate.h" -#include "vtkStructuredGrid.h" -#include "vtkTypeFloat32Array.h" -#include "vtkTypeFloat64Array.h" -#include "vtkTypeInt16Array.h" -#include "vtkTypeInt32Array.h" -#include "vtkTypeInt64Array.h" -#include "vtkTypeInt8Array.h" -#include "vtkTypeUInt16Array.h" -#include "vtkTypeUInt32Array.h" -#include "vtkTypeUInt64Array.h" -#include "vtkTypeUInt8Array.h" -#include "vtkUnstructuredGrid.h" - -#include - -namespace -{ - -//---------------------------------------------------------------------------- -bool IsMixedShape(vtkUnstructuredGrid* unstructured_grid) -{ - vtkNew cell_types; - unstructured_grid->GetCellTypes(cell_types); - return cell_types->GetNumberOfTypes() > 1; -} - -//---------------------------------------------------------------------------- -bool IsSignedIntegralType(int data_type) -{ - constexpr bool is_char_type_signed = (CHAR_MIN == SCHAR_MIN) && (CHAR_MAX == SCHAR_MAX); - - return (is_char_type_signed && (data_type == VTK_CHAR)) || (data_type == VTK_SIGNED_CHAR) || - (data_type == VTK_SHORT) || (data_type == VTK_INT) || (data_type == VTK_LONG) || - (data_type == VTK_ID_TYPE) || (data_type == VTK_LONG_LONG) || (data_type == VTK_TYPE_INT64); -} - -//---------------------------------------------------------------------------- -bool IsUnsignedIntegralType(int data_type) -{ - constexpr bool is_char_type_signed = (CHAR_MIN == SCHAR_MIN) && (CHAR_MAX == SCHAR_MAX); - - return (!is_char_type_signed && (data_type == VTK_CHAR)) || (data_type == VTK_UNSIGNED_CHAR) || - (data_type == VTK_UNSIGNED_SHORT) || (data_type == VTK_UNSIGNED_INT) || - (data_type == VTK_UNSIGNED_LONG) || (data_type == VTK_ID_TYPE) || - (data_type == VTK_UNSIGNED_LONG_LONG); -} - -//---------------------------------------------------------------------------- -bool IsFloatType(int data_type) -{ - return ((data_type == VTK_FLOAT) || (data_type == VTK_DOUBLE)); -} - -//---------------------------------------------------------------------------- -bool ConvertDataArrayToMCArray( - vtkDataArray* data_array, int offset, int stride, conduit_cpp::Node& conduit_node) -{ - stride = std::max(stride, 1); - conduit_index_t number_of_elements = data_array->GetNumberOfValues() / stride; - - int data_type = data_array->GetDataType(); - int data_type_size = data_array->GetDataTypeSize(); - int array_type = data_array->GetArrayType(); - - if (array_type != vtkAbstractArray::AoSDataArrayTemplate) - { - vtkLog(ERROR, "Unsupported data array type: " << data_array->GetDataTypeAsString()); - return false; - } - - // The code below uses the legacy GetVoidPointer on purpose to get zero copy. - bool is_supported = true; - if (IsSignedIntegralType(data_type)) - { - switch (data_type_size) - { - case 1: - conduit_node.set_external_int8_ptr((conduit_int8*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_int8), stride * sizeof(conduit_int8)); - break; - - case 2: - conduit_node.set_external_int16_ptr((conduit_int16*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_int16), stride * sizeof(conduit_int16)); - break; - - case 4: - conduit_node.set_external_int32_ptr((conduit_int32*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_int32), stride * sizeof(conduit_int32)); - break; - - case 8: - conduit_node.set_external_int64_ptr((conduit_int64*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_int64), stride * sizeof(conduit_int64)); - break; - - default: - is_supported = false; - } - } - else if (IsUnsignedIntegralType(data_type)) - { - switch (data_type_size) - { - case 1: - conduit_node.set_external_uint8_ptr((conduit_uint8*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_uint8), stride * sizeof(conduit_uint8)); - break; - - case 2: - conduit_node.set_external_uint16_ptr((conduit_uint16*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_uint16), stride * sizeof(conduit_uint16)); - break; - - case 4: - conduit_node.set_external_uint32_ptr((conduit_uint32*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_uint32), stride * sizeof(conduit_uint32)); - break; - - case 8: - conduit_node.set_external_uint64_ptr((conduit_uint64*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_uint64), stride * sizeof(conduit_uint64)); - break; - - default: - is_supported = false; - } - } - else if (IsFloatType(data_type)) - { - switch (data_type_size) - { - case 4: - conduit_node.set_external_float32_ptr((conduit_float32*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_float32), stride * sizeof(conduit_float32)); - break; - - case 8: - conduit_node.set_external_float64_ptr((conduit_float64*)data_array->GetVoidPointer(0), - number_of_elements, offset * sizeof(conduit_float64), stride * sizeof(conduit_float64)); - break; - - default: - is_supported = false; - } - } - - if (!is_supported) - { - vtkLog(ERROR, - "Unsupported data array type: " << data_array->GetDataTypeAsString() - << " size: " << data_type_size << " type: " << array_type); - } - - return is_supported; -} - -//---------------------------------------------------------------------------- -bool ConvertDataArrayToMCArray(vtkDataArray* data_array, conduit_cpp::Node& conduit_node) -{ - return ConvertDataArrayToMCArray(data_array, 0, 0, conduit_node); -} - -//---------------------------------------------------------------------------- -bool ConvertPoints(vtkPoints* points, conduit_cpp::Node& x_values_node, - conduit_cpp::Node& y_values_node, conduit_cpp::Node& z_values_node) -{ - if (auto data_array = points->GetData()) - { - return ConvertDataArrayToMCArray(data_array, 0, 3, x_values_node) && - ConvertDataArrayToMCArray(data_array, 1, 3, y_values_node) && - ConvertDataArrayToMCArray(data_array, 2, 3, z_values_node); - } - - return false; -} - -//---------------------------------------------------------------------------- -bool FillTopology(vtkDataSet* data_set, conduit_cpp::Node& conduit_node) -{ - if (auto imageData = vtkImageData::SafeDownCast(data_set)) - { - auto coords_node = conduit_node["coordsets/coords"]; - - coords_node["type"] = "uniform"; - - int* dimensions = imageData->GetDimensions(); - coords_node["dims/i"] = dimensions[0]; - coords_node["dims/j"] = dimensions[1]; - coords_node["dims/k"] = dimensions[2]; - - double* origin = imageData->GetOrigin(); - coords_node["origin/x"] = origin[0]; - coords_node["origin/y"] = origin[1]; - coords_node["origin/z"] = origin[2]; - - double* spacing = imageData->GetSpacing(); - coords_node["spacing/dx"] = spacing[0]; - coords_node["spacing/dy"] = spacing[1]; - coords_node["spacing/dz"] = spacing[2]; - - auto topologies_node = conduit_node["topologies/mesh"]; - topologies_node["type"] = "uniform"; - topologies_node["coordset"] = "coords"; - } - else if (auto rectilinear_grid = vtkRectilinearGrid::SafeDownCast(data_set)) - { - auto coords_node = conduit_node["coordsets/coords"]; - - coords_node["type"] = "rectilinear"; - - auto x_values_node = coords_node["values/x"]; - if (!ConvertDataArrayToMCArray(rectilinear_grid->GetXCoordinates(), x_values_node)) - { - vtkLog(ERROR, "Failed ConvertDataArrayToMCArray for values/x"); - return false; - } - - auto y_values_node = coords_node["values/y"]; - if (!ConvertDataArrayToMCArray(rectilinear_grid->GetYCoordinates(), y_values_node)) - { - vtkLog(ERROR, "Failed ConvertDataArrayToMCArray for values/y"); - return false; - } - - auto z_values_node = coords_node["values/z"]; - if (!ConvertDataArrayToMCArray(rectilinear_grid->GetZCoordinates(), z_values_node)) - { - vtkLog(ERROR, "Failed ConvertDataArrayToMCArray for values/z"); - return false; - } - - auto topologies_node = conduit_node["topologies/mesh"]; - topologies_node["type"] = "rectilinear"; - topologies_node["coordset"] = "coords"; - } - else if (auto structured_grid = vtkStructuredGrid::SafeDownCast(data_set)) - { - auto coords_node = conduit_node["coordsets/coords"]; - - coords_node["type"] = "explicit"; - - auto x_values_node = coords_node["values/x"]; - auto y_values_node = coords_node["values/y"]; - auto z_values_node = coords_node["values/z"]; - - if (!ConvertPoints(structured_grid->GetPoints(), x_values_node, y_values_node, z_values_node)) - { - vtkLog(ERROR, "Failed ConvertPoints for structured grid"); - return false; - } - - auto topologies_node = conduit_node["topologies/mesh"]; - topologies_node["type"] = "structured"; - topologies_node["coordset"] = "coords"; - int* dimensions = structured_grid->GetDimensions(); - topologies_node["elements/dims/i"] = dimensions[0]; - topologies_node["elements/dims/j"] = dimensions[1]; - topologies_node["elements/dims/k"] = dimensions[2]; - } - else if (auto unstructured_grid = vtkUnstructuredGrid::SafeDownCast(data_set)) - { - if (IsMixedShape(unstructured_grid)) - { - vtkLogF(ERROR, "Unstructured type with mixed shape type unsupported."); - return false; - } - - auto coords_node = conduit_node["coordsets/coords"]; - - coords_node["type"] = "explicit"; - - auto x_values_node = coords_node["values/x"]; - auto y_values_node = coords_node["values/y"]; - auto z_values_node = coords_node["values/z"]; - - auto* points = unstructured_grid->GetPoints(); - - if (points) - { - if (!ConvertPoints(points, x_values_node, y_values_node, z_values_node)) - { - vtkLogF(ERROR, "ConvertPoints failed for unstructured grid."); - return false; - } - } - else - { - x_values_node = std::vector(); - y_values_node = std::vector(); - z_values_node = std::vector(); - } - - auto topologies_node = conduit_node["topologies/mesh"]; - topologies_node["type"] = "unstructured"; - topologies_node["coordset"] = "coords"; - - int cell_type = VTK_VERTEX; - const auto number_of_cells = unstructured_grid->GetNumberOfCells(); - if (number_of_cells > 0) - { - cell_type = unstructured_grid->GetCellType(0); - } - - switch (cell_type) - { - case VTK_HEXAHEDRON: - topologies_node["elements/shape"] = "hex"; - break; - case VTK_TETRA: - topologies_node["elements/shape"] = "tet"; - break; - case VTK_QUAD: - topologies_node["elements/shape"] = "quad"; - break; - case VTK_TRIANGLE: - topologies_node["elements/shape"] = "tri"; - break; - case VTK_LINE: - topologies_node["elements/shape"] = "line"; - break; - case VTK_VERTEX: - topologies_node["elements/shape"] = "point"; - break; - default: - vtkLog(ERROR, << "Unsupported cell type in unstructured grid. Cell type: " - << vtkCellTypes::GetClassNameFromTypeId(cell_type)); - return false; - } - - auto cell_connectivity = unstructured_grid->GetCells(); - auto connectivity_node = topologies_node["elements/connectivity"]; - - if (!ConvertDataArrayToMCArray(cell_connectivity->GetConnectivityArray(), connectivity_node)) - { - vtkLogF(ERROR, "ConvertDataArrayToMCArray failed for unstructured grid."); - return false; - } - } - else - { - vtkLog(ERROR, "Unsupported data set type: " << data_set->GetClassName()); - return false; - } - - return true; -} - -//---------------------------------------------------------------------------- -bool FillFields( - vtkFieldData* field_data, const std::string& association, conduit_cpp::Node& conduit_node) -{ - bool is_success = true; - - int array_count = field_data->GetNumberOfArrays(); - for (int array_index = 0; is_success && array_index < array_count; ++array_index) - { - auto array = field_data->GetArray(array_index); - auto name = array->GetName(); - if (!name) - { - vtkLogF(WARNING, "Unamed array, it will be ignored."); - continue; - } - - auto field_node = conduit_node["fields"][name]; - field_node["association"] = association; - field_node["topology"] = "mesh"; - field_node["volume_dependent"] = "false"; - - auto values_node = field_node["values"]; - is_success = ConvertDataArrayToMCArray(array, values_node); - } - - return is_success; -} - -//---------------------------------------------------------------------------- -bool FillFields(vtkDataSet* data_set, conduit_cpp::Node& conduit_node) -{ - if (auto cell_data = data_set->GetCellData()) - { - if (!FillFields(cell_data, "element", conduit_node)) - { - vtkVLog(vtkLogger::VERBOSITY_ERROR, "FillFields with element failed."); - return false; - } - } - - if (auto point_data = data_set->GetPointData()) - { - if (!FillFields(point_data, "vertex", conduit_node)) - { - vtkVLog(vtkLogger::VERBOSITY_ERROR, "FillFields with vertex failed."); - return false; - } - } - - if (auto field_data = data_set->GetFieldData()) - { - if (field_data->GetNumberOfArrays() > 0) - { - vtkVLog(vtkLogger::VERBOSITY_WARNING, - "Field without associated topology is not supported by conduit. Will be ignored."); - } - } - - return true; -} - -//---------------------------------------------------------------------------- -bool FillConduitNodeFromDataSet(vtkDataSet* data_set, conduit_cpp::Node& conduit_node) -{ - return FillTopology(data_set, conduit_node) && FillFields(data_set, conduit_node); -} - -} // anonymous namespace - -namespace vtkDataObjectToConduit -{ - -//---------------------------------------------------------------------------- -bool FillConduitNode(vtkDataObject* data_object, conduit_cpp::Node& conduit_node) -{ - auto data_set = vtkDataSet::SafeDownCast(data_object); - if (!data_set) - { - vtkLogF(ERROR, "Only Data Set objects are supported in vtkDataObjectToConduit."); - return false; - } - - return FillConduitNodeFromDataSet(data_set, conduit_node); -} - -} // vtkDataObjectToConduit namespace diff -Nru paraview-5.10.1/Clients/InSitu/vtkDataObjectToConduit.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkDataObjectToConduit.h --- paraview-5.10.1/Clients/InSitu/vtkDataObjectToConduit.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkDataObjectToConduit.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: vtkDataObjectToConduit.h - - Copyright (c) Kitware, Inc. - All rights reserved. - See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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. - -=========================================================================*/ -/** - * @class vtkDataObjectToConduit - * @brief Convert VTK Data Object to Conduit Node - */ - -#ifndef vtkDataObjectToConduit_h -#define vtkDataObjectToConduit_h - -#include "vtkObject.h" -#include "vtkPVInSituModule.h" // For windows import/export of shared libraries - -namespace conduit_cpp -{ -class Node; -} - -class vtkDataObject; - -namespace vtkDataObjectToConduit -{ - -/** - * Fill the given conduit node with the data from the data object. - * The final structure is a valid blueprint mesh. - * - * At the moment, only vtkDataSet are supported. - */ -VTKPVINSITU_EXPORT bool FillConduitNode( - vtkDataObject* data_object, conduit_cpp::Node& conduit_node); -} - -#endif diff -Nru paraview-5.10.1/Clients/InSitu/vtkInSituInitializationHelper.cxx paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituInitializationHelper.cxx --- paraview-5.10.1/Clients/InSitu/vtkInSituInitializationHelper.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituInitializationHelper.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -17,7 +17,9 @@ #include "vtkArrayDispatch.h" #include "vtkCPCxxHelper.h" #include "vtkCallbackCommand.h" +#if VTK_MODULE_ENABLE_VTK_IOCatalystConduit #include "vtkConduitSource.h" +#endif #include "vtkDataArrayAccessor.h" #include "vtkFieldData.h" #include "vtkInSituPipelinePython.h" @@ -71,6 +73,9 @@ }; vtkSmartPointer CPCxxHelper; +#if VTK_MODULE_ENABLE_VTK_ParallelMPI + vtkSmartPointer MPIController; +#endif std::map> Producers; std::vector Pipelines; std::map SteerableProxies; @@ -126,6 +131,9 @@ //---------------------------------------------------------------------------- void vtkInSituInitializationHelper::Initialize(vtkTypeUInt64 comm) { + vtkInSituInitializationHelper::Internals = new vtkInternals(); + auto& internals = (*vtkInSituInitializationHelper::Internals); + #if VTK_MODULE_ENABLE_VTK_ParallelMPI int isMPIInitialized = 0; if (MPI_Initialized(&isMPIInitialized) == MPI_SUCCESS && isMPIInitialized) @@ -137,9 +145,9 @@ vtkMPICommunicatorOpaqueComm opaqueComm(&mpicomm); vtkNew mpiCommunicator; mpiCommunicator->InitializeExternal(&opaqueComm); - vtkNew controller; - controller->SetCommunicator(mpiCommunicator); - vtkMultiProcessController::SetGlobalController(controller); + internals.MPIController = vtkSmartPointer::New(); + internals.MPIController->SetCommunicator(mpiCommunicator); + vtkMultiProcessController::SetGlobalController(internals.MPIController); } #else vtkVLogF(PARAVIEW_LOG_CATALYST_VERBOSITY(), @@ -168,8 +176,6 @@ vtkInSituInitializationHelper::WasInitializedOnce = 1; - vtkInSituInitializationHelper::Internals = new vtkInternals(); - auto& internals = (*vtkInSituInitializationHelper::Internals); // for now, I am using vtkCPCxxHelper; that class should be removed when we // deprecate Legacy Catalyst API. internals.CPCxxHelper.TakeReference(vtkCPCxxHelper::New()); @@ -420,6 +426,7 @@ //---------------------------------------------------------------------------- void vtkInSituInitializationHelper::UpdateSteerableProxies() { +#if VTK_MODULE_ENABLE_VTK_IOCatalystConduit auto& internals = (*vtkInSituInitializationHelper::Internals); for (auto& steerable_proxies : internals.SteerableProxies) @@ -544,6 +551,9 @@ } } } +#else + vtkErrorWithObjectMacro(nullptr, << "module IOCatalystConduit is disabled, cannot use steering."); +#endif } //---------------------------------------------------------------------------- diff -Nru paraview-5.10.1/Clients/InSitu/vtkInSituInitializationHelper.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituInitializationHelper.h --- paraview-5.10.1/Clients/InSitu/vtkInSituInitializationHelper.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituInitializationHelper.h 2022-09-01 19:52:20.000000000 +0000 @@ -154,7 +154,7 @@ protected: vtkInSituInitializationHelper(); - ~vtkInSituInitializationHelper(); + ~vtkInSituInitializationHelper() override; private: vtkInSituInitializationHelper(const vtkInSituInitializationHelper&) = delete; diff -Nru paraview-5.10.1/Clients/InSitu/vtkInSituPipeline.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipeline.h --- paraview-5.10.1/Clients/InSitu/vtkInSituPipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -67,7 +67,7 @@ protected: vtkInSituPipeline(); - ~vtkInSituPipeline(); + ~vtkInSituPipeline() override; private: vtkInSituPipeline(const vtkInSituPipeline&) = delete; diff -Nru paraview-5.10.1/Clients/InSitu/vtkInSituPipelineIO.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipelineIO.h --- paraview-5.10.1/Clients/InSitu/vtkInSituPipelineIO.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipelineIO.h 2022-09-01 19:52:20.000000000 +0000 @@ -72,7 +72,7 @@ protected: vtkInSituPipelineIO(); - ~vtkInSituPipelineIO(); + ~vtkInSituPipelineIO() override; private: vtkInSituPipelineIO(const vtkInSituPipelineIO&) = delete; diff -Nru paraview-5.10.1/Clients/InSitu/vtkInSituPipelinePython.h paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipelinePython.h --- paraview-5.10.1/Clients/InSitu/vtkInSituPipelinePython.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtkInSituPipelinePython.h 2022-09-01 19:52:20.000000000 +0000 @@ -75,7 +75,7 @@ protected: vtkInSituPipelinePython(); - ~vtkInSituPipelinePython(); + ~vtkInSituPipelinePython() override; private: vtkInSituPipelinePython(const vtkInSituPipelinePython&) = delete; diff -Nru paraview-5.10.1/Clients/InSitu/vtk.module paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtk.module --- paraview-5.10.1/Clients/InSitu/vtk.module 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/InSitu/vtk.module 2022-09-01 19:52:20.000000000 +0000 @@ -12,29 +12,13 @@ ParaView::Catalyst ParaView::RemotingApplication ParaView::RemotingLive - ParaView::VTKExtensionsConduit ParaView::VTKExtensionsCore - ParaView::vtkcatalyst - VTK::FiltersGeneral - VTK::FiltersHybrid - VTK::vtksys OPTIONAL_DEPENDS ParaView::PythonCatalyst ParaView::PythonInitializer ParaView::RemotingLive + VTK::IOCatalystConduit + VTK::IOFides VTK::IOIOSS VTK::ParallelMPI VTK::WrappingPythonCore -TEST_DEPENDS - ParaView::InSitu - ParaView::Catalyst - ParaView::RemotingApplication - ParaView::vtkcatalyst - ParaView::VTKExtensionsConduit - ParaView::VTKExtensionsCore - VTK::FiltersSources - VTK::IOXML - VTK::TestingCore -TEST_LABELS - Catalyst - ParaView diff -Nru paraview-5.10.1/Clients/ParaView/ParaViewFilters.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewFilters.xml --- paraview-5.10.1/Clients/ParaView/ParaViewFilters.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewFilters.xml 2022-09-01 19:52:20.000000000 +0000 @@ -23,11 +23,15 @@ + + + + + - @@ -38,6 +42,7 @@ + @@ -59,12 +64,15 @@ + + + @@ -98,18 +106,16 @@ - - - + @@ -149,13 +155,11 @@ - - @@ -186,6 +190,7 @@ + @@ -199,7 +204,6 @@ - @@ -214,8 +218,12 @@ + + + + @@ -225,17 +233,21 @@ + + + + @@ -310,6 +322,7 @@ + @@ -325,8 +338,10 @@ + + @@ -363,6 +378,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.cxx paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.cxx --- paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -33,8 +33,6 @@ #include "pvpythonmodules.h" #endif -#include "vtkPVConfig.h" - #include "ParaViewMainWindow.h" #include "ui_ParaViewMainWindow.h" @@ -49,19 +47,19 @@ #include "pqSettings.h" #include "pqTimer.h" #include "pqWelcomeDialog.h" + #include "vtkCommand.h" #include "vtkPVGeneralSettings.h" -#include "vtkProcessModule.h" #include "vtkRemotingCoreConfiguration.h" #include "vtkSMSettings.h" #include "vtksys/SystemTools.hxx" +#include "pqQtConfig.h" #ifdef PARAVIEW_USE_QTHELP #include "pqHelpReaction.h" #endif #include -#include #include #include #include @@ -154,7 +152,6 @@ this->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); this->tabifyDockWidget(this->Internals->colorMapEditorDock, this->Internals->memoryInspectorDock); - this->tabifyDockWidget(this->Internals->colorMapEditorDock, this->Internals->timeInspectorDock); this->tabifyDockWidget( this->Internals->colorMapEditorDock, this->Internals->comparativePanelDock); this->tabifyDockWidget( @@ -174,10 +171,12 @@ this->Internals->colorMapEditorDock->hide(); this->Internals->timeInspectorDock->hide(); this->Internals->lightInspectorDock->hide(); + this->Internals->selectionEditorDock->hide(); this->tabifyDockWidget(this->Internals->animationViewDock, this->Internals->statisticsDock); this->tabifyDockWidget(this->Internals->animationViewDock, this->Internals->outputWidgetDock); this->tabifyDockWidget(this->Internals->animationViewDock, this->Internals->pythonShellDock); + this->tabifyDockWidget(this->Internals->animationViewDock, this->Internals->timeInspectorDock); // setup properties dock this->tabifyDockWidget(this->Internals->propertiesDock, this->Internals->viewPropertiesDock); @@ -401,6 +400,11 @@ void ParaViewMainWindow::handleMessage(const QString&, int type) { QDockWidget* dock = this->Internals->outputWidgetDock; + pqOutputWidget* outputWidget = qobject_cast(dock->widget()); + if (dock->isFloating() && !outputWidget->shouldOpenForNewMessages()) + { + return; + } if (!dock->isVisible() && (type == QtCriticalMsg || type == QtFatalMsg || type == QtWarningMsg)) { // if dock is not visible, we always pop it up as a floating dialog. This diff -Nru paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.h paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.h --- paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.h 2022-09-01 19:52:20.000000000 +0000 @@ -50,7 +50,7 @@ void showEvent(QShowEvent* evt) override; void closeEvent(QCloseEvent* evt) override; -protected Q_SLOTS: +protected Q_SLOTS: // NOLINT(readability-redundant-access-specifiers) void showHelpForProxy(const QString& groupname, const QString& proxyname); void showWelcomeDialog(); void handleMessage(const QString&, int); diff -Nru paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.ui paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.ui --- paraview-5.10.1/Clients/ParaView/ParaViewMainWindow.ui 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewMainWindow.ui 2022-09-01 19:52:20.000000000 +0000 @@ -241,7 +241,7 @@ Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - Multi-block Inspector + MultiBlock Inspector 2 @@ -272,6 +272,18 @@ + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Selection Editor + + + 2 + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea @@ -346,15 +358,15 @@ - Qt::AllDockWidgetAreas + Qt::BottomDockWidgetArea|Qt::TopDockWidgetArea Time Inspector - 2 + 8 - + @@ -545,6 +557,12 @@ 1 + pqSelectionEditor + QWidget +
pqSelectionEditor.h
+ 1 + + pqFindDataWidget QWidget
pqFindDataWidget.h
diff -Nru paraview-5.10.1/Clients/ParaView/ParaViewSources.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewSources.xml --- paraview-5.10.1/Clients/ParaView/ParaViewSources.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/ParaViewSources.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,6 +20,7 @@ + Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.icns and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.icns differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_128x128@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_128x128@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_128x128.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_128x128.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_16x16@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_16x16@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_16x16.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_16x16.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_256x256@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_256x256@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_256x256.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_256x256.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_32x32@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_32x32@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_32x32.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_32x32.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_512x512@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_512x512@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_512x512.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_512x512.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_64x64@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_64x64@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/icon_64x64.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/icon_64x64.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-128x128@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-128x128@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-128x128.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-128x128.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-16x16@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-16x16@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-16x16.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-16x16.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-256x256@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-256x256@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-256x256.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-256x256.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-32x32@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-32x32@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-32x32.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-32x32.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-512x512@2x.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-512x512@2x.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-512x512.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-512x512.png differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/pvIcon.iconset/Icon_MacOS-64x64.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/pvIcon.iconset/Icon_MacOS-64x64.png differ diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -26bb110468cdf01284bee43687da67b88ddea4aea22aefe378cca21975a70ca7c2ce246fddeacc165ffde03faa2f1e5995abe3baacaacfc0ebe94c6ade898558 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_2.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_2.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d528122234dd952ebed6aa0ba005039cf4b5e91671b245e24acc569f410d05200ddf571c6f6f5fd6ff15a54a2225640a8e2db9c7b6da8c6d7a9acda6d8c8f199 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_3.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_3.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -a3d8388ab976b46cbc814343c238dc86dd151b3dfb116d59c9dbc6f761cfac9d69d1a5926f421a92e7b4977dbd0e4e4b597b350b2455dd6ec360f75dd77258d6 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_4.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_4.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_4.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter_4.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d26de611704049dbad5b134f70b55bf62f7bc1ea551384b3df6b85e06c8630bdd2dba4f27ecc4809c56886a5bb5105a91954a54972634fabdf61b46a75426123 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/3DWidgetInCustomFilter.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -08fd795c10d74d85d1af27fd94545c8b115dd1eadc8f3f386bc9edf807c41aa8ec5cfe6f2f3fea4bf599f43f98843e481ed784a85b4efd3f09f89761c6ab94c9 +8b4b9c4cb81c3dbce3f72edd539caeb8cec2dc01606c96d29f098dc2acb86b0adb4703ecd093556ab09805133de8d9c470a11ecd11dd7a142490fb55b441b788 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AMRContour.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AMRContour.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AMRContour.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AMRContour.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +97e6490e7f377501375c6a8b7d7594d29119b0867fc1cce3a0a13ebf4d9d9e6084adb8977f628afc42e94710381f89ef927b434109d95d7850d20a625029b8c3 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AMRCutPlane.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AMRCutPlane.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AMRCutPlane.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AMRCutPlane.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -8d3efd3b1af84bbb7b41f97968241adc26096290a96af4d0f877e0e610203a772e5efc65434e1d44a5107fbe507cf1651e2cbc033dc19c908c8e532e8ed01e14 +4ba202436fddff87beb62588b9840d4f80630b2749a632414707f0b576730abbbdf4ad4cab3ac3c7f431b3f09bdcaf0be961884a7133a973ea870f83a583897d diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AnimationFollowPath.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AnimationFollowPath.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AnimationFollowPath.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AnimationFollowPath.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +3de3d7e6ac74c056383d98018d512de58ec804fc64cfeaefcf27b3beb9203804325f5ce9232831bb75f9c7cc0837e1f4ce161231659c5564101bf06cf8304ce9 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AnnotateNotSanitizedArray.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AnnotateNotSanitizedArray.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/AnnotateNotSanitizedArray.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/AnnotateNotSanitizedArray.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +2f910ce4d530ea018c9b2329865103728b1ce02cd65faaf2ad602adcf736d70147cb02d49eeede2220f67061585421726da4ca2098a2abb735344c09d8aea574 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/BDFReader.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/BDFReader.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/BDFReader.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/BDFReader.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +3e0aa1253e2c32865c31c51585ccd35cd040aee4c7b3988ccfd582e93e0790c97b9e816ac82751942025edfe0b44ac480bd03bddbe79e2a1fbe52f1a32476690 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CGNSReaderCellMesh.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CGNSReaderCellMesh.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CGNSReaderCellMesh.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CGNSReaderCellMesh.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +ec434339bd18ccb0f957d09ffa7a7ca32e7f18e57f76b9309c858b8357dc3bbec3f4aae2f85dee02a133020e7dc6c37166957ff9d6676f661cc926e0f74313bb diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CGNSReaderFaceMesh.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CGNSReaderFaceMesh.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CGNSReaderFaceMesh.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CGNSReaderFaceMesh.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +f522c7495df45b804f828c4c224403ed1ef39b5b605ee93b37a41827aaea88440c9ba82ffa5158f9eee16fe35f3309ffb65a1ccc78c748d950bc39d1299063b1 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CheckableHeader.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CheckableHeader.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CheckableHeader.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CheckableHeader.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -fe6b4a2b4400b659a3849b4e40acb6c957458c22a7d9a98a203f536c7b25ac16a565b2868c5c937d1b93afa83f8f4e53a3ef4cb71d11d39a0441579dc85a5a04 +161e97dfa94f53dfc562fb796f50777c2069de200e6e463625bf05952dccedd7293e10be31459b6a321fe8cd6a244e666fdbf550f7c12ff24eaaa97f89ed57cf diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Clip_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Clip_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Clip_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Clip_1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +96c5eb2629843484d09a1d0745436a75da25a65d2d99c745895412ce3e15b0526ef83ccfde37bffc26f420603d8494f12b064a86206e98fed45338b5ddf8a444 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Clip.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Clip.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Clip.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Clip.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -1e00bc7f8410b59c7c1fa436e07f4428f0837e3155c041dd65803b082672c1f7fb9f55488d8388703854b17b975831b88203a3958bfaacf729bfd8ccbd3861eb +a4d0ac3d2508b3e9dc9de081a70a2ba36b4ea4f043bd92a59dab02b2bad7c8b41f4052852bf8fd716568c28499c90c51779a0b5b106b2b62fd6f3016a0d4f941 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ColorLegendBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ColorLegendBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ColorLegendBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ColorLegendBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +37b7ef89fe359b10d6a933754bd0e5470fc882fc7ab5a3a405bb23c1111a20612ffaa40700c9e4a8023a5e7c90d596a224684c648a8f962c0358b016a5768ce5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ComputeConnectedSurfaceProperties.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ComputeConnectedSurfaceProperties.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ComputeConnectedSurfaceProperties.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ComputeConnectedSurfaceProperties.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +c6342e979f276cfa3b8572ec0fbe7803cdbff02a92c4bad41d5500835ec8319b2b8bb0021f7789ac756177704465fc0441df047013835c78dddd9e5c512a451a diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Contour3_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Contour3_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Contour3_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Contour3_1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +5ea162048e5a302a7c2ec0b523b2f1a6b624f605c662d9fbd7d8912fdb9d1dbe254168c87eb6ac0586317e1a72ef58c875320bd2ff5061631b496e4c799c7515 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange_A.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange_A.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange_A.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange_A.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +c696ceeb1ae35b82f9db93c61e6eb9af72f2156f1486e92b4cc4dc78a61a979a933493631ac6e2b8bae51b8154fc25ac0b1aea4ba891fc87823519576d7902b5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange_B.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange_B.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange_B.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange_B.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +94b46e4f20f7521058a32068db6f0f0dc7792c350783a6afdce9cad94513d7dd172fd692e878c19ec7baff0d9854c00c8db45c303feb179b5b41cdcd3c74e300 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ContourRange.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ContourRange.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -c696ceeb1ae35b82f9db93c61e6eb9af72f2156f1486e92b4cc4dc78a61a979a933493631ac6e2b8bae51b8154fc25ac0b1aea4ba891fc87823519576d7902b5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CopyPasteProperties.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CopyPasteProperties.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CopyPasteProperties.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CopyPasteProperties.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -3a5b3b0bc0180332d9c6d73a508805d75fc7323e9499abd0df892b17d411a382b4b70580280be78b5c55c5e2ede11babe0c47ef62f1f3745228762b24d17addc +105a5b937ea945e02dafbf57153d6bac941dfd8461d22834fbd8f26979250cfcbaba06cb74313a7409d750403edfa08c8cb73c51b4c6acac8d9a2db0555abd67 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip_1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +20e3865db4f41a92ecf291dab4f5fa17c27f32504b02624862019136b7ff791f5147869189a6355f03d4bbac35a47a2bcf3338e7c44714188eff1df471d8656a diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/CTHAMRClip.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -534118788b0b0cf931440f99d161bb64434a5a5552dba5da27adf97772bae4a69a1ce82d6939d42590d2607d0007112dbbbd7741ef92b80b6815cc8a70ed4bc5 +7dee06e7f77ec0138e531694b92c9b3a512b578179c78192c6aeb7c535fc0c11804701b1832e95b6ef2600f692242171f832ca34c998703ccaafe6f5e75d175f diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser0.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser0.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser0.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser0.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +24df1393dd2f8a92dec31ef0d538bff44196271a99e249885d7161dcaeae809b216983d19d94f466bc9df5e8ad8962d2556f4dcf2b7b74b6219a45ac72f32371 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +1743b5267832e56f07a8d234dde9a54c3bb747375c6d35ab3686d533185f89aba0597ec53fb8d41142e1149bdff0367f6a0b4b6f33fed858f537e0e96a3bccbc diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/DeleteSubtreePipelineBrowser2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +8135f8e3154b3b7029a7aed4c1382c2ec53b0571dbfa346cddc7a6c046ec0aab5375e272ed9556b077682604fa6cd90a60db8f8f3aa4e63b8b074f89157d1f1f diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_A.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_A.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_A.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_A.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +82e03607b51d21f8a327cd2e5316c56f5f028d7d2f9d42460b41d20642f7ee998d34be3d33fbc75ec7d28650e62a033925241252ce5802a55fbf2ffe0400cce7 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_B.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_B.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_B.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExpandSelection_B.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +41b6b54060376865ec556447b961c34b203a39b8f784be4efc5531554e28bd0d15217dfdaeac1e74c2a9e2c5379d9fb2e632d4ad9f1cffd6533abdbe5b47a894 Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/.ExternalData_SHA512_666010fefb7a8a9f3d15a5d7cba039033490b583eaed34bdd852cf989f836f07104f050c2e6be9d8467a45cab066c08f78cdf499681436098f6a09fb3dfbd567 and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/.ExternalData_SHA512_666010fefb7a8a9f3d15a5d7cba039033490b583eaed34bdd852cf989f836f07104f050c2e6be9d8467a45cab066c08f78cdf499681436098f6a09fb3dfbd567 differ Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/.ExternalData_SHA512_931ccc29bb0d49414e60956b7a02f34995a17d30bf69a23f16c021644fb5fc1b4a219a362fd73153c0a26de7a990c0114b8adbf154227c8f40f50b9c08b7e345 and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/.ExternalData_SHA512_931ccc29bb0d49414e60956b7a02f34995a17d30bf69a23f16c021644fb5fc1b4a219a362fd73153c0a26de7a990c0114b8adbf154227c8f40f50b9c08b7e345 differ diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +c237f7123e1ece33addd3c324c1c9cc3d046af87ef461b92bc296735ba98b3b717cdbadca4abede89cb94f292d509709476b6f661d54fb17af3f47b4c871afa1 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType3.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +28a325d272e6599f6dad4d64aafdc4781c1882109123774b8e5a5d68522a98df11ee6a89ae639ab234461d5864f6b1e3ed4c7607fd1bfe00493d3feae47e79ee diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ExtractCellsByType.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +c94aa633011c9f97c254cdcd125f97667b505d522d8f4678e2304322cd5fde13d14836f4cd5a23d6103552abb158d3e69c26b38595e3bca8e0d7e83dc673f67c diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/FidesReader_cartesian.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/FidesReader_cartesian.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/FidesReader_cartesian.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/FidesReader_cartesian.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -6c95977c3263ba9b3872f1244fe675a71965db39b2fb66e536fabf8675e7bf81cb143ecd9ee83a9519debdcf4727fd7f07f20a5765520b689884df48d06c66ea +74525cc102af2005ae2d2a475785e67b8dfe18822f91cca233334d5d8bb47b4440baabbd2a85c697d86757e79c33578fb4fe930d7343a740e1dee85dbf5ad8da diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/GenerateTimeSteps.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/GenerateTimeSteps.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/GenerateTimeSteps.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/GenerateTimeSteps.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +34d6c16570d5067f4fa99960435b4a52928b1de8d439a7024dd3b16ae2aab0274018769691de0fe9903f2c454c8db5624ea3cf5119f6484a0601019d7d08e8ba diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Glyph56State.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Glyph56State.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/Glyph56State.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/Glyph56State.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -4647de69a7b7d6f67e16d583d06ec5f3fc747ce2fdc07b8ee870ab0dc33364cd525200f1c1677c6ea5b51c586ca56a3e1b16e5a54686fbbcc9a895f5010fe316 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/HyperTreeGridMultiBlock.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/HyperTreeGridMultiBlock.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/HyperTreeGridMultiBlock.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/HyperTreeGridMultiBlock.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +07877858770ce1b21e63f374f5fec30d08ddef71a596e039678b4590103167445b273757607c923d47912d24b26b478c66a9188319eeb0d02b8af474432ad15b diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ImageVolumeRendering.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ImageVolumeRendering.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ImageVolumeRendering.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ImageVolumeRendering.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -adb85ccc447421da101689b3614bbdaf539b12538b06b70dcc68020799b0bbf2664f2bf895ebf65ec7b642fb62930e8311b2fd309212f843a649ffbca0af62a0 +b64da011de8bf49df57b1ab7712f1d00115baa1d5a3db21960cb3c79a2c147eed450e033d6aea9c3286aeae3210b994c9226232aeb1ba4947a6608bd74f9d4aa diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LightToolbar.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LightToolbar.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LightToolbar.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LightToolbar.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +862e263e2f9fd24aabbf21a08fdc7e6b99deb7ef6c7d15688bea0262168e01e80941a63b98e566e5399f0079bf6dd88d9c33b23a8df38ee6d4efc85a5fa0985b diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView_2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView_2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView_2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView_2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +dd4fb978808df7f6b7239652754d9d928eccc943b021c385c7fd4031b24785dab1be353dd201a05a17f88a8227ad8419665c22a30c84092ff1ffa49bdbbf88f3 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LinkCameraFromView.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -07df759293e0cc619c9335c6f4e42f5712db2c9b6ab7d358782374908cba775c25d2718f4fbc560062580016c05615a10889bfed3821c2bc23e79131b3506163 +b8fe11e955d197a9351a636f8dfb8fac4271665cdf4be27192c63537d5dc7e52133fee9a35f228c729012e723aa82fa688ca068e5165ebf598f4a9b5f1e6e6a8 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadState_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadState_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadState_1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadState_1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -df84829f668fbc114fa61c5c102ab4aa6a24ec60191014a61c59beee8dd0b2b98ff4811f1b42d3d1faf60f82a49040a0d3f030450eb41534a4e97a2c45bf5683 +def5148b9fdae2848d78d747d704dfd32331ef0c53753b05b69807a3f4eb9114af6d48aab7d69ca1f48a292bfcc27f297bb0b0c72675ab9c46dc6ec1c3133782 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadStateMultiView.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadStateMultiView.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadStateMultiView.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadStateMultiView.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -f2b0b77b61b030b582aa4e310aa2fba8eb26a2c1102dc5f9a0fcd2abe576c2d1a3fd4a34e4bc776b7c2cf118ee3e9ca911634814d482e54bcbfa65f3c080e076 +4905ff9c83694e034f22d291c6b98cbf5fc1c9c8329ad7de0deff073c0c2728f70a0daf7e69ade50d577ce0dcfc6ad60e6108ddcfd0d887cbbce4f5e32e63ea2 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadState.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadState.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LoadState.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LoadState.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -3c04675d844e26b366a4395574db29181ca5d62a4b13de637f5c98c636d317f10084c328f751b1397e2225dfc4f1e70e348ed883a8e16e94bbb37164a9cfee9c +82302714fe4c5e0c74f2c5e5310c6318ec65bb1c1f0120de354b3acae3dbdd58acaf11e0c7e155df804db0fed87703ee83a9cbba4cc6484aa44d694144d3422c diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LogoSourcesInChartViews.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LogoSourcesInChartViews.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/LogoSourcesInChartViews.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/LogoSourcesInChartViews.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +5eb74084fad1531013bdfd4931d0c6dbfc0e90493ea1a03fdb2e320221e784f4274d0a51fc01bf5d1adb6bb96ad5c65bcc298f8e2234507205911b132402d6c3 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +fafd7fcbcd6897c2af937ea5050ff5ffb75ed28ba69956498a533624a6e4a7d5e999ea049222ed3f5ff517bb263bce513d7c6ac52dfc05898bf2e4bf49c2fc87 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +d76b02e81e21a4fdfa193a2ee3081b4ffcdfdeb2a0b441f8247cb080870d247abf24a27a9b510456e1cf3f065d8f99faa14590aef4b31b50f8b545938183d0c0 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials3.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MaterialEditorSaveMaterials3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +9871194afc024a666545225b5a232a49efc4acc4ff68d42bc5ae09e93a6396a053a88e27e840ec323dbbb764a8065bcfc280acf03f88b117b11e7b030539738a diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorExtractBlocks.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorExtractBlocks.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorExtractBlocks.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorExtractBlocks.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +67c38c1c2999a6e6c2f1b1d9f42b159561dbdc6245d5f023f0977d9c8c733be7d99f6bf0a85cbb4756702dd5a561c23e3d47747d89550c87693e053fbe119dce diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorWithoutSelectOnClickSetting.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorWithoutSelectOnClickSetting.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorWithoutSelectOnClickSetting.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiBlockInspectorWithoutSelectOnClickSetting.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +71ffb1d13bf835924d44c01e850e9dfddd3028f75f58ab0f323bb68e0bd0652330873cf0df933347e1ca154a52318ae1a667c93f620bbd43ae9ec414674fe872 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock_1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3df2e506b7e3e807307790b8d4c2c7f500685b54423e6bcabf7e06697cbee3271b7a8802a88aedee7e27a1fa607fd41caa46d0f75d48c04f589e1746fa4f2050 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceMultiBlock.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -6bcc597e86872edec99d138121e3835d34a242319014fc1008e8a6045ba6feb9eb3189f2c0fc49bb9ef2ad4268ef00d28084f733e333a1c9276055220ea3f8af +e527ab6bf193b1b0113775c723384bfb9fcabd8262a9048bc21472a2652b0c3d13fc045948453d8cf34f361d9a017b1da1778a3e60c7bbf7e859a217e166ea25 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceWavelet.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceWavelet.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/MultiSliceWavelet.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/MultiSliceWavelet.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -602bbe8715731ab710fb1c67da25ac6d1889f78aaf718c161e93360cb56f5d88927cbf1918ac74cf165149391e78ea1e6ce896b08f2202f0d1d704222852307a +5a63073e0d5291e2748580cee331c7fec655bbdbc764a122d10eda2b0c2e64fcdbfbb562a4a6228d55d323fe011b7e0d6f244b80fdb3d8856e4fb80dab2e7239 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/OffsetSliceWithPlane.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/OffsetSliceWithPlane.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/OffsetSliceWithPlane.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/OffsetSliceWithPlane.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -4a24844aba79330e26370fa6fb5c85ae4ae30b30dfb8d277210f872dfc87b9fb628769eb8f6068757d124f8f6e5132a806f2f46f003aae9ca5d054068f40183c +c366e127f87e59bbdb1482c2c14b0db291de36d7a2ebd910fec81d3b0d912809510049fd157e9e7b9c6d8294b313b3f712c7daff6b0ab5cdf91480a23ff0451f diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteBlackBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteBlackBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteBlackBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteBlackBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +bf81ffe4882f1071947f167f12a020f4fb76faad0ac85ea5c26b00a5b364a4a03419236f8f31564ce378f48577e4138d86c45f287fe53ac56f568ca02b2e16c0 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteBlueGrayBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteBlueGrayBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteBlueGrayBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteBlueGrayBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +99dc83d50d105021279847f4d9c22cc8b0018e2f06a8c471775bee9de271f0a216d3afe2fcd612925b84867f0942fcce775ecda8e8fe50274a9f1dd04afbd74e diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteGradientBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteGradientBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteGradientBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteGradientBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +4e10cc0ea748b17bfc38c428a92d46ab09445ab938a82c9869f742ad558a67c0e19407d13ff70e282cd2735cdc3a54f7f87a4ee2d9e9350502455e5ad16bf23e diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteLightGrayBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteLightGrayBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteLightGrayBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteLightGrayBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +5845da13815d41f7c68aa3461b410e2d76beca037abd890743a5ad5d5e2c573c06d2ee306bb91562957c8ad407c5179e61f92051e782744069c33177eca6c646 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteNeutralGrayBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteNeutralGrayBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteNeutralGrayBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteNeutralGrayBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +70f917ce4f5ece78e46b96d4ef0fc6a83ad1c7bfdc1e279d3eae05de26e56eb28926758a72df2950713ec202edf964747cab9f051aafb29951f2a5f976bcd116 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteWarmGrayBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteWarmGrayBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteWarmGrayBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteWarmGrayBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +70f917ce4f5ece78e46b96d4ef0fc6a83ad1c7bfdc1e279d3eae05de26e56eb28926758a72df2950713ec202edf964747cab9f051aafb29951f2a5f976bcd116 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteWhiteBackground.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteWhiteBackground.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PaletteWhiteBackground.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PaletteWhiteBackground.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +4c6a00f60d77d1fdc413dd16ea12951c32bfff570c04bc9c9be6b8ae4187b5e76f3d4a8ef7f16d23e1ac834ec6d4b9aaeb14f1a1adbb6c0d0163e12093cea1ea diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ParallelCoordinatesView.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ParallelCoordinatesView.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ParallelCoordinatesView.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ParallelCoordinatesView.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -e9bac3ac52513796fdfcaa0ce8ad1c89d411f92011383f3b704d8a19bc66b132e72ddb56e0f6b01315633d61955572f0d16c900e2dd05baf380c2496876522a3 +a287aaadb329e87a6ca7a2b2be02deb60a16146e5b55c1fefcfc5cea948f0914e8da174e8a4c1392045fff20cca579f6779646959a489675db31588ed93963c9 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Slice.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Slice.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Slice.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSetCollection_Slice.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -ee48166e5da9868f015c235f32938e75dd12b1f1c3eb509f2965f5042a592101969c6a34e048fe69a8e447c2b8bcc18da758394f55f31eae4a72b65fbc455c9d +52a92b1d393783d06d78f1ff73b799696b8a769191cb09cc3c8467dbc5eae30cf712282f276a88bdd8d730ca951a5df8bb57e5da8df92032775b1dbb655edc45 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSet_Slice.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSet_Slice.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSet_Slice.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PartitionedDataSet_Slice.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -b8e252f07926081313f040e575ba6924afdf350a4fb8562b08c4ba7e21f776df6543abfc5572ed9689829ed33336f146ab753e504de5bb53c26f03664c544ada +7de7782c14e3c326e937bf649a5aedcfaa0eadbff70991144a65a0127756665b1a54d0dda70fa727bee74ed7d5c6df4ccbf2a4cc68e03de9c3d56e0ea2ce4786 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PlotMatrixViewArraySelection.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PlotMatrixViewArraySelection.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PlotMatrixViewArraySelection.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PlotMatrixViewArraySelection.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -77d61eac0c5879d0a9a399243064b5b56ec894e99d96f8a7331a75c82f9c3033071bc4982dbca3612c384b8337479686b593b1044ce54241ad446ffd72e9e03f +a81c0ae2c097d2cd769d34dab72b26a83213eaa070be52dfab54a34bc9c907831fadd5096ee6826aa2a2939be0d2369e4cb00d225077cd855c19fd554eb94746 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PlotOverTimeAutoApply.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PlotOverTimeAutoApply.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PlotOverTimeAutoApply.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PlotOverTimeAutoApply.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -bfde562c4af37408e0adfae684b2d3f171d1c9ff8a90c14b700684de9520d5b405d69513c1951febe3167f8c166cc31cd590258b829b7d816f59b44914724378 +310b0bc81043b9ed40d1cad906f534d89f4d19b9a842249e056eb86f13845295c27ec0e3ab615477d0320cd1bb85d9575756f17693c9ce4e115497a19abc38db diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PythonEditorRun.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PythonEditorRun.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/PythonEditorRun.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/PythonEditorRun.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +ba8f6723b473765ee5b77c587cb6bfb14ad9a32f68816e03271222a021b454089aaa2085d5c4b17394c28da214b16a25cacdced08cde4fc6c6c1c165d3cd3ca1 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +2011790260c87c91284b551a5e9a86f97cb14b799423ca7df3119138498ac6f102590bca28af475536e5ca48c94bcb3d9f56707b4390e8256b6a65f2ccfebd56 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_3.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RandomAttributes_3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +318640bc0fa22e1fb43504b9b3fea8ffe61e16e298cf51dff0a94b12e53888e51d2af6ab1cee1dae7bd033cf519872494f7fe014952ae4a3338ae25f5ad359fc diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RecentFiles.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RecentFiles.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RecentFiles.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RecentFiles.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +ac5b341a3e502cf57072deb509675836036e79eeec818c3c97aa9441735576ab6a9cdc6e3afdde4d879a21abf892f350104dec79dd9682804e06efb3ad9093dd diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RemoveGhostInterfaces.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RemoveGhostInterfaces.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/RemoveGhostInterfaces.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/RemoveGhostInterfaces.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +25939ddc8af8bbf3d059820a0ca8f8529075bd721c1431a71a67cb4b79621bd78d602ae9c2b3b225d9bdb5f36996a1c46e7b27579b212e7691a76e82fdc88785 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ResampleToLine.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ResampleToLine.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ResampleToLine.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ResampleToLine.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +1c2beb458ba376176dcb3b6717b41572c7cfb61530b1913d6a2b5befe5d6f54b462df7c513e562090b0cb2f6fc9d92da418e31441848919ac67aebdb4817e151 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +b702c519b3f2606dfbed29cf22f486ed9c0d7133d52ba2eae214785a8b934fbc2803fa946f011fcf45c4e0e1ad3744a865e08faed3790a6e1ebfb8a73441196e diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +14237d1c3230ac93dbf47b23f4ef02e97dd30acc08a2d907a222dc6825e3d9447d4103b17e46b290a08af4de97df7bbc54ba8318b5e8e92bbb4754af64c11bc5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar3.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +fee68dc633b7e9197086ba6edcbff026892476b42c5613afb892f06137bb89bdbbc9b74ec48441a20f96433b8f13cbaa0e942b773f3f1a17555c15f6f53814d5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar4.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar4.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar4.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar4.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +14237d1c3230ac93dbf47b23f4ef02e97dd30acc08a2d907a222dc6825e3d9447d4103b17e46b290a08af4de97df7bbc54ba8318b5e8e92bbb4754af64c11bc5 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar5.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar5.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar5.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar5.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +0908cf05113faf7f0cd6da05476a3388870ea65d3e2ec7600bbb548c817eedce93207c367743e1ef8fb8b0cfd6dcc9b07c4c75d2c51098d97755083a3a59a93c diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar6.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar6.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar6.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar6.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +0908cf05113faf7f0cd6da05476a3388870ea65d3e2ec7600bbb548c817eedce93207c367743e1ef8fb8b0cfd6dcc9b07c4c75d2c51098d97755083a3a59a93c diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar7.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar7.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar7.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar7.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +86ff66d6e4bfe8c5d19499b34a271b1a8d547ece9f7f6485c50e2a4cd78466a49b57102b2a69215d2e786229f135bf379cad66a94a157e50dc0922c7de8e34aa diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar8.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar8.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ScalarBar8.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ScalarBar8.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +0908cf05113faf7f0cd6da05476a3388870ea65d3e2ec7600bbb548c817eedce93207c367743e1ef8fb8b0cfd6dcc9b07c4c75d2c51098d97755083a3a59a93c diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SelectionEditor.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SelectionEditor.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SelectionEditor.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SelectionEditor.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +1a40e59909d94c902ff60f43991221e83fc9779b1b66c44039b826a74a84bfb7dbff3974ec0473d6abb125e9df22c3d34beac5c067484a822c75f63749696b23 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SelectionLinkHistogram.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SelectionLinkHistogram.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SelectionLinkHistogram.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SelectionLinkHistogram.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -b54ca314fed4eaac35be373d4ea08066bf670e628957fc094dd72909b81d20f559ca8a465e0d26f7a41151cc50af4be9d90a1bb3911a55c077d82b2b027d2861 +bab79984778db468f0cd7c21596e1a3dab778bd363a9dfb8fcd2c63cf5511a4235d49db75b5b7765dd5de0397ea5778da44bdcb1de3721df43ada2e1d0df54bc diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ShowMultiPieceFieldData.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ShowMultiPieceFieldData.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ShowMultiPieceFieldData.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ShowMultiPieceFieldData.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +6357e65edf306031dce5435b93a48bf677bdac72763a12e077e3d139afabbbc7857abb4dd07a14607a77508aa6909abb34ae61f4b2c1a2b8861d9d32fd68938f diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneCellData.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneCellData.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneCellData.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneCellData.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -3cc75c96cb318efe9c909f7045130c5dd12a8b50f4a24682e7384154de669ef82f38f30e533499f96e4e5fdddaa2a040c505de05eaa901cb5795b8f61d28ac66 +36a56c56f93a143eb93f0daadf2179ff00dad6d7ec84691cc73256149ba4133bdd3954206cceea0d0a6e1b282718efcdeca51799379c6984c120de435cb365c8 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock_1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -693ba58e84c2feb4e24aa50f84b19f9ad8da1d513bdbbc1af2ac454f0f100e4d6c6e861820d6365d35df2fe22d86b447e8d1cba2ba3afb0ce80354f7a5a74b87 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlock.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -53a7431b0d2f2de2f49a4ef8aa3d38e908af92540e10e2cf6459baee6e735a3e04e0f4174920c14d45875f5bef1b783f1ce737f0f28660d6584151c098285483 +64093afa52652b836072c1e80555cabd2e59a1756826b1d47e5ddf8256e957cf55a7acdf24b726b88ecf92f3f58802b725a2d334c9fa3b245e546bb1d8e6af92 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface_1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -f159faeb3559962d0048d15bd5e65abae3aa88108c670c37451bab006cdc594a62a0af1ea339631fa22639da28fe346fb1e297ac706e3f2287f680209e24d800 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlaneMultiBlockSurface.png.sha512 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7acf642033da393955cb7d8604fd2457d77ff7299e8ea8ae09a9b0089ef9223649d566e108702bf52e179016ec69c7ec9e4d2fc0f87d6a54808249310e2b1185 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlane.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlane.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/SliceWithPlane.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/SliceWithPlane.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -5fc2c0398ed18a80499c6da6882ddbfd7e83a5cad3fbf99dfb0a826e1ceab19c7467296a4cd7ccb900609682214fab85b00320c898333270d8005bc1e77ae956 +bac50db6bdd2a7d8736ea9802c89c29befb2e04dce3439e081c63ac55a872b91b98657c62c1318779d7a620737b4e2f3ef84f70d8fd4ecc8afe46e3ce7cf5493 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TableFFT1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TableFFT1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TableFFT1.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TableFFT1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -26611948977a97ba57a4a6a62c4d1093abc4b2b2113dbfd09f4a58df50775af3fe49bf872c41729dd09467a0ed7ceee7268ee14cd6cd72c0c4f19ca6785d15a0 +183e7d3a8d12b137501347a604682898b8c702ee65f531bd309955eecee4715aebeca91c7dcf7b29c68804376187c2223b777c4c7e4a5f50676e57d5c2a5c356 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TableFFT2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TableFFT2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TableFFT2.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TableFFT2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -693ba7d1f62818441ad56d4a377fa4751cce1c66f6727a47140915a55cf60452106a545ed62c74e099831170491cc4186d34273a92d77870c8fa5d1911fdc1ef +da0cc9e935afbea212c2795bcb7b292c77376b497edfd1ef335b480a42f755684ee7a8a11e9cf509a2045b37e499717482208916d37571145cee483a55f55c77 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile0.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile0.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile0.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile0.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +672bc0a45fdb0762e257022ec227875bfeb23483af73d6c561c6e920403bc463bfda0b81a51d832f31d040d621d7c7ded8c6e1d7f95fa53fc9102692da5215fd diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestCAVEVolRen-tile1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +c1cf0dc75ed24855977d3b6ea0affc72791fd66cd86eaf702a1dd1907ae9576d70055ed52b773cc90f03b01250bbd4cb75a6812334a8fc275a0e081e1edd75a3 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestPV_PLUGIN_PATH.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestPV_PLUGIN_PATH.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestPV_PLUGIN_PATH.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestPV_PLUGIN_PATH.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +f893e390e5c74613fa06c06cbeb3b33428b66bf785c7ad264c23fddaf397b7682b72e52e9b9e7c9dc9f64d4d3defee9513e292ee5a268498f9e0e821ba3de81e diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestResampleHyperTreeGridWithSphere.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestResampleHyperTreeGridWithSphere.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestResampleHyperTreeGridWithSphere.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestResampleHyperTreeGridWithSphere.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +931ccc29bb0d49414e60956b7a02f34995a17d30bf69a23f16c021644fb5fc1b4a219a362fd73153c0a26de7a990c0114b8adbf154227c8f40f50b9c08b7e345 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestXYChartOpacity.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestXYChartOpacity.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TestXYChartOpacity.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TestXYChartOpacity.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +d4e2e26fed4acc6c06f2fce1f65cabdf9c77bbc1a5304fc43e20712525dbdfdf1d08213213a3eb0aa8ec4143258116afdcc464191524e2fa5611d9431e1674f4 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourceInteriorLines.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourceInteriorLines.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourceInteriorLines.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourceInteriorLines.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +6a7dc882b2a5f16476433166b9a1af3a8f2f1f65c15091abd7e160bea98e47c56806a7c43f968eb8073ed02d741aecc66046b188b915c92ee8eb8a8d36a03b6d diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +7116df9763b8b25a3a5da65572e328f59d1148b3133f653a48a4e50fbd8f5f4170950c9c17762d8a307e1230433c2c4e6ded4d17bee6f17db175a695d69010ec diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews3.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TextSourcesInChartViews3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +4652612b6e8e6d6892cabada3f673f7ac3f3a720b91cdd95f09983e9fbe597191119031813515f55b096abcb6bd494833b919978920b416f9803d393d7284933 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DEditor.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DEditor.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DEditor.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DEditor.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +2a647401d27494a9c5e12a7812d8323887fe42abde4f34bd9a5eb6f8c46c322abef07f87aabe2dc834acb35f3e2975a891496c0691edd96eaeb299556db7d89d diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2D.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2D.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2D.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2D.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +a3c8e0f6203c6e31e1318a4be7c8a5071f29c6d29595205e1640ef078cfecf3f84bca480ff2fca53920939960ee2c5c700bbed5468b60dae06260cee9a8474a2 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_1.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_1.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_1.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_1.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +b1111908353b8a33e7ee95800131ce2aba849de329c1db2fb0c4b5afd77765c19799ec052959e2e593022c4d356735807a19de3b8915e5849d1114cb269cf80f diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_2.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_2.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_2.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor_2.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +8dc5c6c39aad960de09ca647697cdb82a173ea43680f175ac91f3441e5ba11c4e20a328d5790b49ef0c20c8154afc4b7ce42edabe20455a2a0d01b416bb0bf37 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalarsEditor.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +fa624d33fc477c8567ae30369e2f0b881b359762af94241880e2528f70688f18a480db3fd914823077d4a1ca38677d03f4ecc7e093081565424e632df8779bbe diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalars.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalars.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalars.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/TransferFunction2DYScalars.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +dc340b32d8e56034e7d4f1facb0fdfcf97fea2d5c42b16d5bf15fc3c1481164aff7370dfb7fce01a8b86784fcf5f3cb65f023a91fc32d043e94d1fc95397df66 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/UndoRedo3.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/UndoRedo3.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/UndoRedo3.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/UndoRedo3.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -bcd4c660055cf721aae801432776088d9af75366822cd2d67b7d34e8f6f0b3fecf840c8101d64720bbaf2821f6807e9e51703cadcbe007cfaa678c98b81ab196 +8474d81af17175861fc91e3d0136c81dd33bfc2a582cfca8cad57620b1fdaa706297de475ea9af52413ee2d211f3cb9103b46f3b9fc5066b75e3ba2ca46d6415 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/VectorComponentHistogram.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/VectorComponentHistogram.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/VectorComponentHistogram.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/VectorComponentHistogram.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -5ba658267fd82b19b7da4f441072d845684b11e971307b7498a93a8b1119705c72284fc29718096b67d92096b23c79c79a15c35269eae60b2630559de8800efc +1866b50f6e9bf3ea52a2a711155e12fdc7104ef99a44620d8de20ad07e4a93f00afc221d148166ed26659767b100366c7eaa9d97e4033848efaa972105c98cdb diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ViewSettingsDialog.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ViewSettingsDialog.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ViewSettingsDialog.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ViewSettingsDialog.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -bfa201e9b311d0f8b75f508c711be31f9ad28233adc7e00c50024a92c8e7fe67f6022a9d788c54e9e331d4eef44995b76ffeecf8ee2b9092857e765c2fc1c169 +537393569443da2313f8aaa15bf372a63f31ac6b82b16fb98f191b5b2da505f08da737f5fa0ab5654c6de771f4a9baa705b2ad8c32c121ba85b8a682b47585ab diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData_A.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData_A.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData_A.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData_A.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +e7ec7843d072c8adc60ec935ed7e12861f16029dbd00aa665d6e720c946eecabc36d2f8b751a6455f537d1317db535e0d8462e21b6b0cf2a034b89cc6460fbd4 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData_B.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData_B.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData_B.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData_B.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +6505381e8bd5c3c5db7c44cd0317468c977e235a1c227a313eaf6fcda195975ce7c93036a1870909cda181fec5452f957ebae071cbaa5002df5dd2c2908c59d3 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToData.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToData.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +380ebc90ee3e1beefb00b76271013e493946c2835d375eaa20a06a92ac78a6d35b9f166b1a09a635bfdcc4c3d7118431ce47be41ba0170485e666524de00352d diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToEmptyData.png.sha512 paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToEmptyData.png.sha512 --- paraview-5.10.1/Clients/ParaView/Testing/Data/Baseline/ZoomToEmptyData.png.sha512 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Data/Baseline/ZoomToEmptyData.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1 @@ +a7018a4e7b7945340f5bee9b97ee858843f10002f7658a523cce00e6e125a68c49a719be51addf49a4246462b783216d1bab7342f7994b0b94ba0f66736d5483 diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/CMakeLists.txt --- paraview-5.10.1/Clients/ParaView/Testing/Python/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -101,16 +101,20 @@ LoadStateWithDataSets.py Plot3DReader.py SaveDataWithArraySelection.py + SaveDataWithArrayAndBlockSelection.py ReadTimeArray.py + ReplaceReaderFileName.py ) # These tests could run safely in serial and parallel. set(PVBATCH_TESTS BatchAxesGrid.py + TestXYChartOpacity.py FontSize.py # BUG #19816 PLYWriter.py VolumeCellSelection.py SaveDataWithArraySelection.py,NO_VALID + # SaveDataWithArrayAndBlockSelection.py,NO_VALID # BUG #21419 ) if(NOT APPLE) # temporarily disable on mac due to bugs in @@ -214,3 +218,14 @@ unset(_vtk_testing_python_exe) unset(_vtk_test_python_args) endif() + +#------------------------------------------------------------------------------ +# Add a test using python plugin and a python script + +paraview_add_test_python( + NO_DATA NO_RT + TestPV_PLUGIN_PATH.py +) + +set_tests_properties(paraviewPython-TestPV_PLUGIN_PATH + PROPERTIES ENVIRONMENT "PV_PLUGIN_PATH=${CMAKE_SOURCE_DIR}/Examples/Plugins/PythonAlgorithm/") diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/PointPicking.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/PointPicking.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/PointPicking.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/PointPicking.py 2022-09-01 19:52:20.000000000 +0000 @@ -18,9 +18,11 @@ Render() pt1 = [0, 0, 0] +normal1 = [0, 0, 0] pt2 = [0, 0, 0] -view.ConvertDisplayToPointOnSurface([100, 100], pt1) -view.ConvertDisplayToPointOnSurface([245, 215], pt2) +normal2 = [0, 0, 0] +view.ConvertDisplayToPointOnSurface([100, 100], pt1, normal1) +view.ConvertDisplayToPointOnSurface([245, 215], pt2, normal2) print("Point 1:") print(pt1) diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/ReplaceReaderFileName.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/ReplaceReaderFileName.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/ReplaceReaderFileName.py 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/ReplaceReaderFileName.py 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,44 @@ +from paraview.simple import * +#### disable automatic camera reset on 'Show' +paraview.simple._DisableFirstRenderCameraReset() + +for i, arg in enumerate(sys.argv): + if arg == "-D" and i+1 < len(sys.argv): + canFile = sys.argv[i+1] + '/Testing/Data/can.ex2' + diskFile = sys.argv[i+1] + '/Testing/Data/disk_out_ref.ex2' + +# create a new 'IOSS Reader' +disk_out_ref = IOSSReader(registrationName='disk_out_ref', + FileName=[diskFile]) +disk_out_ref.ElementBlocks = ['block_1'] +disk_out_ref.NodeBlockFields = ['ash3', 'ch4', 'game3', 'h2', 'pres', 'temp', 'v'] +disk_out_ref.NodeSets = [] +disk_out_ref.SideSets = [] + +# get active view +renderView1 = GetActiveViewOrCreate('RenderView') + +# show data in view +disk_out_refDisplay = Show(disk_out_ref, renderView1, 'UnstructuredGridRepresentation') + +# init the 'PiecewiseFunction' selected for 'ScaleTransferFunction' +disk_out_refDisplay.ScaleTransferFunction.Points = [0.08047682046890259, 0.0, 0.5, 0.0, + 0.18483947217464447, 1.0, 0.5, 0.0] + +# init the 'PiecewiseFunction' selected for 'OpacityTransferFunction' +disk_out_refDisplay.OpacityTransferFunction.Points = [0.08047682046890259, 0.0, 0.5, 0.0, + 0.18483947217464447, 1.0, 0.5, 0.0] + +# reset view to fit data +renderView1.ResetCamera(False) + +# update the view to ensure updated data information +renderView1.Update() + +ReplaceReaderFileName(disk_out_ref, + [canFile], 'FileName') + +can = FindSource('can.ex2') + +if (can == None): + raise("Error: new source is not created properly.") diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/SaveAnimationMultiView.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/SaveAnimationMultiView.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/SaveAnimationMultiView.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/SaveAnimationMultiView.py 2022-09-01 19:52:20.000000000 +0000 @@ -83,7 +83,7 @@ QtTesting.playCommand(objectSaveAnimationDialog, 'filesSelected', '$PARAVIEW_TEST_ROOT/movie_test.png') time.sleep(3); -objectPlayButton = 'pqClientMainWindow/VCRToolbar/1QToolButton2' +objectPlayButton = 'pqClientMainWindow/VCRToolbar/1QToolButton3' while QtTesting.getProperty(objectPlayButton, "text") != 'Play' : time.sleep(1); diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/SaveDataWithArrayAndBlockSelection.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/SaveDataWithArrayAndBlockSelection.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/SaveDataWithArrayAndBlockSelection.py 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/SaveDataWithArrayAndBlockSelection.py 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,92 @@ +from paraview.simple import * +from paraview.vtk.util.misc import vtkGetTempDir +from os.path import join +import shutil + +# Create MultiBlock Dataset + +s1 = Sphere() +UpdatePipeline() + +e1 = Elevation() +UpdatePipeline() + +s2 = Sphere() +UpdatePipeline() + +e2 = Elevation() +UpdatePipeline() + +g = GroupDatasets(e1, e2) +UpdatePipeline() + +# Setup output destination + +dirname = join(vtkGetTempDir(), "savedatawitharrayselection") +shutil.rmtree(dirname, ignore_errors=True) + +filename = join(dirname, "data.vtm") + +# Test MultiBlock Dataset writer + +SaveData(filename, ChooseArraysToWrite=1, PointDataArrays=["Normals"], ChooseBlocksToWrite=1, Selectors=['/Root/Elevation1']) + +r = OpenDataFile(filename) +assert r.PointData.GetNumberOfArrays() == 1 +assert r.PointData.GetArray(0).GetName() == "Normals" + +dii = r.GetDataInformation().DataInformation +assert dii.GetNumberOfDataSets() == 1 +assert dii.GetBlockName(1) == "Elevation1" + +Delete(r) +shutil.rmtree(dirname, ignore_errors=True) + +SetActiveSource(g) + +SaveData(filename, ChooseArraysToWrite=1, PointDataArrays=["Normals"], ChooseBlocksToWrite=0, Selectors=['/Root/Elevation1']) + +r = OpenDataFile(filename) +assert r.PointData.GetNumberOfArrays() == 1 +assert r.PointData.GetArray(0).GetName() == "Normals" + +dii = r.GetDataInformation().DataInformation +assert dii.GetNumberOfDataSets() == 2 +assert dii.GetBlockName(1) == "Elevation1" +assert dii.GetBlockName(2) == "Elevation2" + +Delete(r) +shutil.rmtree(dirname, ignore_errors=True) + +SetActiveSource(g) + +SaveData(filename, ChooseArraysToWrite=0, PointDataArrays=["Normals"], ChooseBlocksToWrite=1, Selectors=['/Root/Elevation1']) + +r = OpenDataFile(filename) +assert r.PointData.GetNumberOfArrays() == 2 +assert r.PointData.GetArray(0).GetName() == "Elevation" +assert r.PointData.GetArray(1).GetName() == "Normals" + +dii = r.GetDataInformation().DataInformation +assert dii.GetNumberOfDataSets() == 1 +assert dii.GetBlockName(1) == "Elevation1" + +Delete(r) +shutil.rmtree(dirname, ignore_errors=True) + +SetActiveSource(g) + +SaveData(filename, ChooseArraysToWrite=0, PointDataArrays=["Normals"], ChooseBlocksToWrite=0, Selectors=['/Root/Elevation1']) + +r = OpenDataFile(filename) +assert r.PointData.GetNumberOfArrays() == 2 +assert r.PointData.GetArray(0).GetName() == "Elevation" +assert r.PointData.GetArray(1).GetName() == "Normals" + +dii = r.GetDataInformation().DataInformation +assert dii.GetNumberOfDataSets() == 2 +assert dii.GetBlockName(1) == "Elevation1" +assert dii.GetBlockName(2) == "Elevation2" + +Delete(r) +shutil.rmtree(dirname, ignore_errors=True) diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/TestPV_PLUGIN_PATH.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPV_PLUGIN_PATH.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/TestPV_PLUGIN_PATH.py 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPV_PLUGIN_PATH.py 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,18 @@ +from paraview.simple import * +PythonbasedSuperquadricSourceExample() +Show() +rv = Render() + +import os +import sys +try: + baselineIndex = sys.argv.index('-B')+1 + baselinePath = sys.argv[baselineIndex] +except: + print("Could not get baseline directory. Test failed.") +baseline_file = os.path.join(baselinePath, "TestPV_PLUGIN_PATH.png") +from paraview.vtk.test import Testing +from paraview.vtk.util.misc import vtkGetTempDir +Testing.VTK_TEMP_DIR = vtkGetTempDir() +Testing.compareImage(rv.GetRenderWindow(), baseline_file, threshold=40) +Testing.interact() diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/TestPythonAnnotationFilterNoMerge.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPythonAnnotationFilterNoMerge.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/TestPythonAnnotationFilterNoMerge.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPythonAnnotationFilterNoMerge.py 2022-09-01 19:52:20.000000000 +0000 @@ -49,7 +49,7 @@ # Annotation filter annotation = PythonAnnotation() -annotation.Expression = '"%f %f %f" % (xmom, ymom, zmom)' +annotation.Expression = '"%f %f %f" % (XMOM, YMOM, ZMOM)' # Update time and trigger pipeline execution time = timesteps[5] diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/TestPythonAnnotationFilter.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPythonAnnotationFilter.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/TestPythonAnnotationFilter.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestPythonAnnotationFilter.py 2022-09-01 19:52:20.000000000 +0000 @@ -54,7 +54,7 @@ # Annotation filter annotation = PythonAnnotation() -annotation.Expression = '"%f %f %f" % (xmom, ymom, zmom)' +annotation.Expression = '"%f %f %f" % (XMOM, YMOM, ZMOM)' # Update time and trigger pipeline execution time = timesteps[5] diff -Nru paraview-5.10.1/Clients/ParaView/Testing/Python/TestXYChartOpacity.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestXYChartOpacity.py --- paraview-5.10.1/Clients/ParaView/Testing/Python/TestXYChartOpacity.py 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/Python/TestXYChartOpacity.py 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,90 @@ +from paraview.simple import * + +# disable automatic camera reset on 'Show' +paraview.simple._DisableFirstRenderCameraReset() + +# create a new 'Wavelet' +wavelet1 = Wavelet(registrationName='Wavelet1') + +# get active view +renderView1 = GetActiveViewOrCreate('RenderView') + +# show data in view +wavelet1Display = Show(wavelet1, renderView1, 'UniformGridRepresentation') + +# trace defaults for the display properties. +wavelet1Display.Representation = 'Outline' + +# reset view to fit data +renderView1.ResetCamera(False) + +# update the view to ensure updated data information +renderView1.Update() + +# create a new 'Plot Over Line' +plotOverLine1 = PlotOverLine(registrationName='PlotOverLine1', Input=wavelet1) + +# show data in view +plotOverLine1Display = Show(plotOverLine1, renderView1, 'GeometryRepresentation') + +# trace defaults for the display properties. +plotOverLine1Display.Representation = 'Surface' + +# Create a new 'Line Chart View' +lineChartView1 = CreateView('XYChartView') + +# show data in view +plotOverLine1Display_1 = Show(plotOverLine1, lineChartView1, 'XYChartRepresentation') + +# get layout +layout1 = GetLayoutByName("Layout #1") + +# add view to a layout so it's visible in UI +AssignViewToLayout(view=lineChartView1, layout=layout1, hint=0) + +# Properties modified on plotOverLine1Display_1 +plotOverLine1Display_1.SeriesOpacity = ['arc_length', '1', 'RTData', '1', 'vtkValidPointMask', '1', 'Points_X', '1', 'Points_Y', '1', 'Points_Z', '1', 'Points_Magnitude', '1'] +plotOverLine1Display_1.SeriesPlotCorner = ['Points_Magnitude', '0', 'Points_X', '0', 'Points_Y', '0', 'Points_Z', '0', 'RTData', '0', 'arc_length', '0', 'vtkValidPointMask', '0'] +plotOverLine1Display_1.SeriesLineStyle = ['Points_Magnitude', '1', 'Points_X', '1', 'Points_Y', '1', 'Points_Z', '1', 'RTData', '1', 'arc_length', '1', 'vtkValidPointMask', '1'] +plotOverLine1Display_1.SeriesLineThickness = ['Points_Magnitude', '2', 'Points_X', '2', 'Points_Y', '2', 'Points_Z', '2', 'RTData', '2', 'arc_length', '2', 'vtkValidPointMask', '2'] +plotOverLine1Display_1.SeriesMarkerStyle = ['Points_Magnitude', '0', 'Points_X', '0', 'Points_Y', '0', 'Points_Z', '0', 'RTData', '0', 'arc_length', '0', 'vtkValidPointMask', '0'] +plotOverLine1Display_1.SeriesMarkerSize = ['Points_Magnitude', '4', 'Points_X', '4', 'Points_Y', '4', 'Points_Z', '4', 'RTData', '4', 'arc_length', '4', 'vtkValidPointMask', '4'] + +# Properties modified on plotOverLine1Display_1 +plotOverLine1Display_1.SeriesVisibility = ['arc_length', 'RTData'] + +# Properties modified on plotOverLine1Display_1 +plotOverLine1Display_1.SeriesVisibility = ['arc_length', 'Points_Z', 'RTData'] + +# Properties modified on plotOverLine1Display_1 +plotOverLine1Display_1.SeriesOpacity = ['arc_length', '0.3', 'RTData', '0.3', 'vtkValidPointMask', '0.3', 'Points_X', '0.3', 'Points_Y', '0.3', 'Points_Z', '0.3', 'Points_Magnitude', '0.3'] + +# Properties modified on plotOverLine1Display_1 +plotOverLine1Display_1.SeriesOpacity = ['arc_length', '1', 'RTData', '0.3', 'vtkValidPointMask', '0.3', 'Points_X', '0.3', 'Points_Y', '0.3', 'Points_Z', '0.3', 'Points_Magnitude', '0.3'] + +#================================================================ +# Save the baseline and do the regression test +#================================================================ + +from os.path import join +from paraview.vtk.vtkTestingRendering import vtkTesting +import sys + +testing = vtkTesting() +for arg in sys.argv: + testing.AddArgument(arg) +for x in range(1, len(sys.argv)): + if sys.argv[x] == "-B" and len(sys.argv) > (x+1): + testing.AddArgument("-V") + testing.AddArgument(join(sys.argv[x+1], "TestXYChartOpacity.png")) + +testimage = join(testing.GetTempDirectory(), "TestXYChartOpacity.png") +SaveScreenshot(testimage, view=lineChartView1) + +result = testing.RegressionTest(testimage, 10) +if result == testing.DO_INTERACTOR: + sys.exit(0) +elif result == testing.NOT_RUN: + sys.exit(125) +elif result == testing.FAILED: + raise RuntimeError("test failed!") diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AddActiveValuesFromVisibleObjects.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AddActiveValuesFromVisibleObjects.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AddActiveValuesFromVisibleObjects.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AddActiveValuesFromVisibleObjects.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + @@ -31,7 +31,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AMRContour.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AMRContour.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AMRContour.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AMRContour.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AMRCutPlane.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AMRCutPlane.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AMRCutPlane.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AMRCutPlane.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,10 +4,9 @@ - - - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AnimatePipelineTime.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimatePipelineTime.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AnimatePipelineTime.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimatePipelineTime.xml 2022-09-01 19:52:20.000000000 +0000 @@ -24,7 +24,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AnimationFollowPath.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimationFollowPath.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AnimationFollowPath.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimationFollowPath.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AnimationUseCamera.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimationUseCamera.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AnimationUseCamera.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnimationUseCamera.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,14 +1,21 @@ + + + + + - + + + @@ -19,10 +26,19 @@ + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AnnotateNotSanitizedArray.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnnotateNotSanitizedArray.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AnnotateNotSanitizedArray.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AnnotateNotSanitizedArray.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ArrayBoundsScaleDomain.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ArrayBoundsScaleDomain.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ArrayBoundsScaleDomain.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ArrayBoundsScaleDomain.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,22 +5,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ArraySelectionWidget.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ArraySelectionWidget.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ArraySelectionWidget.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ArraySelectionWidget.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/AxesGrid.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AxesGrid.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/AxesGrid.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/AxesGrid.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,9 +21,9 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/BDFReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BDFReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/BDFReader.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BDFReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/BlockContextMenu.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockContextMenu.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/BlockContextMenu.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockContextMenu.xml 2022-09-01 19:52:20.000000000 +0000 @@ -81,7 +81,7 @@ - + @@ -98,4 +98,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/BlockLinkedSelection.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockLinkedSelection.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/BlockLinkedSelection.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockLinkedSelection.xml 2022-09-01 19:52:20.000000000 +0000 @@ -13,7 +13,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/BlockOpacities.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockOpacities.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/BlockOpacities.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/BlockOpacities.xml 2022-09-01 19:52:20.000000000 +0000 @@ -17,7 +17,7 @@ note, the automatically recorded trace needs a bit manual fine tuning since the events are not recoreded in proper order --> - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CalcParens.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalcParens.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CalcParens.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalcParens.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,7 +3,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CalculatorInput.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalculatorInput.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CalculatorInput.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalculatorInput.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,7 +11,7 @@ - + @@ -20,8 +20,20 @@ - + + + + + + + + + + + + + @@ -35,6 +47,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CalculatorQuotedVariable.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalculatorQuotedVariable.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CalculatorQuotedVariable.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CalculatorQuotedVariable.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,12 +6,12 @@ - - + + - - + + @@ -24,12 +24,12 @@ - - + + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Calculator.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Calculator.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Calculator.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Calculator.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,6 +21,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CategoricalColors.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CategoricalColors.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CategoricalColors.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CategoricalColors.xml 2022-09-01 19:52:20.000000000 +0000 @@ -9,9 +9,9 @@ - - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CGNSIOSSReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CGNSIOSSReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CGNSIOSSReader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CGNSIOSSReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,7 +11,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CGNSReaderDataLocation.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CGNSReaderDataLocation.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CGNSReaderDataLocation.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CGNSReaderDataLocation.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ChangeGlyphRepVisibility.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ChangeGlyphRepVisibility.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ChangeGlyphRepVisibility.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ChangeGlyphRepVisibility.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ChangingTimestepsInStateFiles.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ChangingTimestepsInStateFiles.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ChangingTimestepsInStateFiles.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ChangingTimestepsInStateFiles.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -20,9 +20,9 @@ - - - - - + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CheckableHeader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CheckableHeader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CheckableHeader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CheckableHeader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -12,15 +12,7 @@ - - - - - - - - - - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ClampAndUpdateColorMap.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ClampAndUpdateColorMap.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ClampAndUpdateColorMap.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ClampAndUpdateColorMap.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,7 +6,6 @@ - @@ -15,7 +14,9 @@ - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Clip.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Clip.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Clip.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Clip.xml 2022-09-01 19:52:20.000000000 +0000 @@ -37,14 +37,14 @@ - + - + @@ -83,18 +83,18 @@ - + - + - + - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CMakeLists.txt --- paraview-5.10.1/Clients/ParaView/Testing/XML/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -55,6 +55,8 @@ "DATA{${paraview_test_data_directory_input}/Data/OMETIFF/multi-channel-time-series.ome.tif}" "DATA{${paraview_test_data_directory_input}/Data/OverridePropertyPlugin.xml}" "DATA{${paraview_test_data_directory_input}/Data/PlotOverLineLegacy.pvsm}" + "DATA{${paraview_test_data_directory_input}/Data/PLOAD_C_xMax.bdf}" + "DATA{${paraview_test_data_directory_input}/Data/PNGReadersPlugin.xml}" "DATA{${paraview_test_data_directory_input}/Data/PropertyLink.pvsm}" "DATA{${paraview_test_data_directory_input}/Data/RectGrid2.vtk}" "DATA{${paraview_test_data_directory_input}/Data/RodPlate/,REGEX:.*}" @@ -72,9 +74,11 @@ "DATA{${paraview_test_data_directory_input}/Data/amr/,REGEX:.*}" "DATA{${paraview_test_data_directory_input}/Data/amr/wavelet/,REGEX:.*}" "DATA{${paraview_test_data_directory_input}/Data/artifact.dta}" + "DATA{${paraview_test_data_directory_input}/Data/amr_gaussian_pulse.hdf}" "DATA{${paraview_test_data_directory_input}/Data/blow.vtk}" "DATA{${paraview_test_data_directory_input}/Data/blow_data.myvtk}" "DATA{${paraview_test_data_directory_input}/Data/bluntfin.vts}" + "DATA{${paraview_test_data_directory_input}/Data/BoxWithFaceData.cgns}" "DATA{${paraview_test_data_directory_input}/Data/can.ex2}" "DATA{${paraview_test_data_directory_input}/Data/can.e.4/can.e.4.0}" "DATA{${paraview_test_data_directory_input}/Data/can.e.4/can.e.4.1}" @@ -108,9 +112,15 @@ "DATA{${paraview_test_data_directory_input}/Data/glTF/InterpolationTest/,REGEX:.*}" "DATA{${paraview_test_data_directory_input}/Data/glTF/Triangle/Triangle.glb}" "DATA{${paraview_test_data_directory_input}/Data/glTF/SimpleSkin/SimpleSkin.gltf}" + "DATA{${paraview_test_data_directory_input}/Data/HTGMulti.vtm}" + "DATA{${paraview_test_data_directory_input}/Data/HTGMulti/HTGMulti_0_0.htg}" + "DATA{${paraview_test_data_directory_input}/Data/HTGMulti/HTGMulti_1_0.htg}" "DATA{${paraview_test_data_directory_input}/Data/WaveletGradientLegacy.pvsm}" + "DATA{${paraview_test_data_directory_input}/Data/img1.png}" + "DATA{${paraview_test_data_directory_input}/Data/img2.png}" "DATA{${paraview_test_data_directory_input}/Data/iron_protein.vtk}" "DATA{${paraview_test_data_directory_input}/Data/linesPolydata.vtk}" + "DATA{${paraview_test_data_directory_input}/Data/LogoSourcesInChartViews.png}" "DATA{${paraview_test_data_directory_input}/Data/manyTypes.vtu}" "DATA{${paraview_test_data_directory_input}/Data/mb_with_pieces.vtm}" "DATA{${paraview_test_data_directory_input}/Data/mb_with_pieces/pvi_Material_Remap2_0005_0_0.vtu}" @@ -124,6 +134,13 @@ "DATA{${paraview_test_data_directory_input}/Data/multicomb_0.vts}" "DATA{${paraview_test_data_directory_input}/Data/multicomb_1.vts}" "DATA{${paraview_test_data_directory_input}/Data/multicomb_2.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece.vtm}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece1.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece2.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece3.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece4.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece5.vts}" + "DATA{${paraview_test_data_directory_input}/Data/MultiPiece/Piece6.vts}" "DATA{${paraview_test_data_directory_input}/Data/non_convex_polygon.vtu}" "DATA{${paraview_test_data_directory_input}/Data/office.binary.vtk}" "DATA{${paraview_test_data_directory_input}/Data/OMF/test_file.omf}" @@ -141,7 +158,9 @@ "DATA{${paraview_test_data_directory_input}/Data/quadratic_tets_with_ghost_cells_1.vtu}" "DATA{${paraview_test_data_directory_input}/Data/sample.h5part}" "DATA{${paraview_test_data_directory_input}/Data/servers-wiki.pvsc}" + "DATA{${paraview_test_data_directory_input}/Data/Udirectory/coneScript.py}" "DATA{${paraview_test_data_directory_input}/Data/Udirectory/simpleScript.py}" + "DATA{${paraview_test_data_directory_input}/Data/Udirectory/resetSession.py}" "DATA{${paraview_test_data_directory_input}/Data/sineWaves.csv}" "DATA{${paraview_test_data_directory_input}/Data/singleSphereAnimation.pvd}" "DATA{${paraview_test_data_directory_input}/Data/singleSphereAnimation/,REGEX:.*}" @@ -160,6 +179,7 @@ "DATA{${paraview_test_data_directory_input}/Data/todd2_small/dumps/3D_nomix_diff-dmp000000}" "DATA{${paraview_test_data_directory_input}/Data/todd2_small/dumps/3D_nomix_diff-dmp000010}" "DATA{${paraview_test_data_directory_input}/Data/tube.exo}" + "DATA{${paraview_test_data_directory_input}/Data/Unbalanced3DepthOctTree3x2x3.htg}" "DATA{${paraview_test_data_directory_input}/Data/vehicle_data.csv}" "DATA{${paraview_test_data_directory_input}/Data/viscoplastic-ring.h5}" "DATA{${paraview_test_data_directory_input}/Data/waveletElevation.vti}" @@ -214,6 +234,8 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CategoricalAutomaticAnnotationsInterC.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CategoricalAutomaticAnnotationsInterD.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CategoriesWithNaN.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CGNSReaderCellMesh.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CGNSReaderFaceMesh.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ChartAxisRangeAndLabelsA.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ChartAxisRangeAndLabelsB.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ChartAxisRangeAndLabelsC.png}" @@ -249,12 +271,16 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ColorOpacityTableEditorHistogram_T.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ColorOpacityTableEditorHistogram_U.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ColorOpacityTableEditorHistogram_V.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ColorLegendBackground.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ColorLegendScaledScreenshot.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ConnectivityCountAscending.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ConnectivityCountDescending.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Contour1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Contour2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Contour3.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Contour3_1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ContourRange_A.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ContourRange_B.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ContourCellData.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CONVERGECFDReaderMesh.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/CONVERGECFDReaderParcels.png}" @@ -266,6 +292,9 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DataAxesGrid2X.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DataAxesGrid-Custom.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DataAxesGrid-CustomWithReset.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DeleteSubtreePipelineBrowser0.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DeleteSubtreePipelineBrowser1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/DeleteSubtreePipelineBrowser2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EdgeTintPBR.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EDLWithSubsampling.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EllipseSource1.png}" @@ -274,6 +303,11 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EnsembleT0.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EnsembleT1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/EnsembleT3.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExpandSelection_A.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExpandSelection_B.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractCellsByType.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractCellsByType2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractCellsByType3.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractSubsetWithSeed.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractSubsetWithSeed_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ExtractSubsetWithSeed_2.png}" @@ -338,6 +372,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridCellCenters.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridContour.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridDepthLimiter.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridMultiBlock.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridObliquePlaneCutter.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridPlaneCutter.png}" #"DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/HyperTreeGridThreshold.png}" @@ -348,6 +383,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LightAddRemove1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LightAddRemove2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LightWidget.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LightToolbar.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LineChartSelection1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LineChartSelection1_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LineChartSelection2.png}" @@ -356,6 +392,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LineChartSelection4_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LinkCameraFromView.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LinkCameraFromView_1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LinkCameraFromView_2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LoadStateMultiView.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogColorMap1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogColorMap2.png}" @@ -366,11 +403,15 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogColorMap7.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogColorMapToggle1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogColorMapToggle2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/LogoSourcesInChartViews.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorCreateMaterials1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorCreateMaterials2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorCreateMaterials3.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorLoadMaterials1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorLoadMaterials2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorSaveMaterials1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorSaveMaterials2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MaterialEditorSaveMaterials3.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MathTextColumn.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MergePointBlocks.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MergeVectorComponents.png}" @@ -382,6 +423,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MultiBlockInspectorSelection-SelectBlock2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MultiBlockInspectorSelection-SelectElementBlocks.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MultiBlockInspectorSelection-HideBlock1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/MultiBlockInspectorWithoutSelectOnClickSetting.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/NestedViews.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/NestedViews_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/NonlinearSubdivision0Display.png}" @@ -400,12 +442,20 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OffsetSliceWithPlane.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OMFReader.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/OpacityWidgetRange.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ParallelCoordinatesView.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSet_Slice.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSet_Surface.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSetCollection_Slice.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PartitionedDataSetCollection_Surface.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PBRSpheres.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PLYWriter.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteBlackBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteBlueGrayBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteGradientBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteLightGrayBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteNeutralGrayBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteWarmGrayBackground.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PaletteWhiteBackground.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PointGaussianScaleOpacityArrayA.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/PointGaussianScaleOpacityArrayA.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Preview-SingleView.png}" @@ -441,6 +491,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleToHyperTreeGrid2DX.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleToHyperTreeGrid2DY.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleToHyperTreeGrid2DZ.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleToLine.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleWithDataset_A.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleWithDataset_B.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ResampleWithDataset_C.png}" @@ -475,6 +526,14 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SaveLargeScreenshot_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SaveSmallScreenshot.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SaveSmallScreenshot_1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar3.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar4.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar5.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar6.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar7.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ScalarBar8.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectCellsFrustumTrace.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectCellsFrustumTrace_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectCellsInteractiveTrace.png}" @@ -483,6 +542,7 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectCellsTrace_2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectColorMapFromComboBox_A.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectionByArray.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectionEditor.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectionLinkParallelCoordinatesView.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectionLinkScriptingA.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SelectionLinkScriptingB.png}" @@ -499,13 +559,11 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SeriesPresetRegexpNoRegexp.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SeriesPresetRegexpYD.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SeriesPresetRegexp.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ShowMultiPieceFieldData.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Slice.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceDirectDoubleColoring.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlaneCellData.png}" - "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlaneMultiBlock_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlaneMultiBlock.png}" - "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlaneMultiBlockSurface_1.png}" - "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlaneMultiBlockSurface.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SliceWithPlane.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SpherePointSource_InterA.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/SpherePointSource_InterB.png}" @@ -521,6 +579,8 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TableFFT2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestCAVE-tile0.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestCAVE-tile1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestCAVEVolRen-tile0.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestCAVEVolRen-tile1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestClipCylinder.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestColorHistogram.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestCompositedGeometryCulling.png}" @@ -540,8 +600,12 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestPythonView.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestPythonView_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestPythonViewScript.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestResampleHyperTreeGridWithSphere.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TextSourceBorder.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TextSourceInteriorLines.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TextSourcesInChartViews.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TextSourcesInChartViews2.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TextSourcesInChartViews3.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/Threshold.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ThresholdInvert.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TileDisplaySplitView-1x1-tile0.png}" @@ -563,6 +627,10 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunctionResetOnVisibilityChange_AllBlocks.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunctionResetOnVisibilityChange_OneBlock.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunctionResetOnVisibilityChange_TwoBlocks.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunction2DEditor.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunction2DYScalarsEditor.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunction2DYScalarsEditor_1.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TransferFunction2DYScalarsEditor_2.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/UniformInverseTransformSamplingGlyph_A.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/UniformInverseTransformSamplingGlyph_B.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/UniformInverseTransformSamplingGlyph_C.png}" @@ -608,17 +676,28 @@ "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomClosestA_1.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomClosestB.png}" "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomClosestC.png}" - "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomClosestD.png}") + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomClosestD.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomToData.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomToData_A.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomToData_B.png}" + "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/ZoomToEmptyData.png}" +) SET (TESTS_WITHOUT_BASELINES AboutDialog.xml AddFieldArrays.xml ArrayBoundsScaleDomain.xml + ArraySelectionWidget.xml CustomOutputFormat.xml + DefaultReadersSetting.xml DelimitedTextReader.xml DynamicFieldDataDomain.xml ExportFilteredColumnsSpreadsheet.xml ExportSpreadsheetFormatting.xml + ExpressionsDialog.xml + ExpressionsExporter.xml + ExpressionsSettings.xml + ExtractParticlesOverTime.xml FavoritesFilters.xml FindWidget.xml GradientBackwardsCompatibility.xml @@ -633,6 +712,7 @@ PartialArrayInLineChart.xml PlotOverLineLegacy.xml PointCellDataConversion.xml + ReadIOHDFAMRMaxLevels.xml ReloadCGNSFile.xml SearchBox.xml ServerConnectDialog.xml @@ -645,6 +725,7 @@ TestFileListPropertyWidget.xml TextSource.xml ThresholdBackwardsCompatibility.xml + ThresholdTable.xml ) if (PARAVIEW_PLUGIN_ENABLE_EULATestPlugin) @@ -652,6 +733,12 @@ PluginEULA.xml) endif () +if (PARAVIEW_ENABLE_OPENVDB) + list (APPEND TESTS_WITHOUT_BASELINES + OpenVDBReader.xml + ) +endif () + if (PARAVIEW_USE_PYTHON) list(APPEND TESTS_WITHOUT_BASELINES TestPythonConsole.xml @@ -659,6 +746,13 @@ MultipleNumberOfComponents.xml SpreadSheetNullArrayName.xml # needs programmable filter ) + + # This test rely on copy being Ctrl-C + if(NOT APPLE) + list(APPEND TESTS_WITHOUT_BASELINES + TooltipCopy.xml + ) + endif() endif() SET (TESTS_WITH_INLINE_COMPARES @@ -669,12 +763,15 @@ BlockLinkedSelection.xml CalculatorQuotedVariable.xml CameraLink.xml + CGNSReaderDataLocation.xml ChartLoadNoVariables.xml ClampAndUpdateColorMap.xml ColorOpacityTableEditorHistogram.xml Connectivity.xml Contour.xml + ContourRange.xml DataAxesGrid2X.xml + DeleteSubtreePipelineBrowser.xml EllipseSource.xml Ensemble.xml ExtractSubsetWithSeed.xml @@ -687,23 +784,25 @@ HyperTreeGridCellCenters.xml HyperTreeGridContour.xml HyperTreeGridDepthLimiter.xml + HyperTreeGridMultiBlock.xml HyperTreeGridObliquePlaneCutter.xml HyperTreeGridPlaneCutter.xml HyperTreeGridThreshold.xml LightAddRemove.xml + LightToolbar.xml LineChartSelection.xml LoadStateMultiView.xml LogColorMap.xml LogColorMapToggle.xml + LogoSourcesInChartViews.xml MemoryInspectorPanel.xml Molecule.xml - # temporary disabling since we don't support - # selection in the MB-inspector right now. - # (see #20525) - # MultiBlockInspectorSelection.xml + MultiBlockInspectorSelection.xml MultiBlockChartSelection.xml NestedViews.xml NonlinearSubdivisionDisplay.xml + PaletteBackgrounds.xml + ParallelCoordinatesView.xml PartitionedDataSet.xml PartitionedDataSetCollection.xml Preview.xml @@ -716,19 +815,21 @@ ReloadAMReXGrid.xml ReloadExodusFile.xml RemoteRendering.xml + RenameArrays.xml RenderNan.xml ResetToVisibleRange.xml Ruler.xml SaveExodus.xml SaveLargeScreenshot.xml + ScalarBarRange.xml SelectColorMapFromComboBox.xml + SelectionEditor.xml SelectionLinkParallelCoordinatesView.xml SeparateOpacityArray.xml Slice.xml SteeringDataGenerator.xml TestIsoVolume.xml TextSourceBorder.xml - TextSourcesInChartViews.xml Threshold.xml TransferFunctionResetOnVisibilityChange.xml UnstructuredVolumeRenderingVectorComponent.xml @@ -749,18 +850,25 @@ endif() SET(TESTS_WITH_BASELINES - ContourRange.xml + BDFReader.xml DataAxesGrid.xml MergeVectorComponents.xml MoleculeScalarBar.xml PassArrays.xml PerlinNoise.xml + ResampleToLine.xml ReverseSense.xml SelectionByArray.xml SeriesPreset.xml SeriesPresetRegexp.xml + ShowMultiPieceFieldData.xml TestHiddenLineRemoval.xml TestOpacityRendering.xml + TestResampleHyperTreeGridWithSphere.xml + TransferFunction2D.xml + TransferFunction2DYScalars.xml + ZoomToData.xml + ZoomToEmptyData.xml ) if(PARAVIEW_ENABLE_VISITBRIDGE) @@ -880,9 +988,11 @@ AccentuatedFilename.xml AdaptiveResampleToImage.xml AMRArraySelection.xml + AMRContour.xml AMRCutPlane.xml AMReXParticlesReader.xml AnimationUseCamera.xml + AnimationFollowPath.xml AnimationSetTimeCursor.xml AnisotropyPBR.xml Annotations.xml @@ -917,6 +1027,7 @@ ColorEditorControls.xml ColorEditorVolumeControls.xml ColorLegendMinMaxLabels.xml + ColorLegendBackground.xml ColorOpacityTableEditing.xml ColorOpacityEditorFreehandDrawing.xml ColorOpacityEditorRangeHandles.xml @@ -929,6 +1040,7 @@ # disabling overlay test for now. It has issues with Time 0. # ComparativeOverlay.xml CompositeSurfaceSelection.xml + ComputeConnectedSurfaceProperties.xml CustomFilter.xml CustomSourceProbe.xml CustomViewpoints.xml @@ -948,6 +1060,7 @@ ExportX3dPOVVRML.xml ExTimeseries.xml ExTimeseries2.xml + ExtractCellsByType.xml ExtractComponentFilter.xml ExtractLevel.xml ExtractTimeSteps.xml @@ -961,6 +1074,7 @@ FollowHiddenData.xml ForceTime.xml Fractal2D.xml + GenerateTimeSteps.xml glTFReaderAnimatedMorphing.xml glTFReaderMultipleAnimations.xml glTFReaderMultipleScenes.xml @@ -999,8 +1113,10 @@ MoleculeToLines.xml # MultiBlockAttributes1.xml MultiBlockInspector.xml + MultiBlockInspectorExtractBlocks.xml MultiBlockSingleBlock.xml MultiBlockVolumeRendering.xml + MultiBlockInspectorWithoutSelectOnClickSetting.xml MultiSliceMultiBlock.xml MultiSliceWavelet.xml NormalGlyphs.xml @@ -1012,7 +1128,6 @@ OrthographicView.xml OutOfRangeColors.xml PBRSpheres.xml - # ParallelCoordinatesView.xml see paraview/paraview#20679 PlotDataOverTime-NonDistributed.xml PlotEdges2.xml # PlotEdges.xml see paraview/paraview#20659 @@ -1037,6 +1152,7 @@ QuadraticGhostCells.xml ReadPIOWithHTG.xml ReadXMLPolyDataFileSeries.xml + RecentFiles.xml RectilinearVolumeRendering.xml RedistributeDataSetFilter.xml RepresentationSelector.xml @@ -1246,6 +1362,11 @@ TEST_SCRIPTS GhostCellsGenerator.xml ) + paraview_add_client_server_render_tests( + BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR} + TEST_SCRIPTS RemoveGhostInterfaces.xml + ) + if (PARAVIEW_ENABLE_COSMOTOOLS) # Test the Generic IO file writer in VTKExtensions/CosmoTools ExternalData_Expand_Arguments(ParaViewData _ @@ -1279,6 +1400,7 @@ ColorByComponentNames.xml # needs programmable filter LiveProgrammableSource.xml PythonShellRunScript.xml + PythonEditorRun.xml SaveLoadStatePython.xml TraceExodus.xml TraceExportAndSaveData.xml @@ -1302,8 +1424,8 @@ set(SelectPointsTrace_DISABLE_CRS TRUE) list(APPEND TESTS_WITHOUT_BASELINES - PythonCalculator.xml PythonEditorTab.xml + PythonResetSessionMacro.xml ProgrammableSourcePythonEditorLink.xml TraceIntegrateVariables.xml ) @@ -1313,12 +1435,15 @@ find_python_module(matplotlib matplotlib_found) if (matplotlib_found) list(APPEND TESTS_WITH_BASELINES TestPythonView.xml) + list(APPEND TESTS_WITH_INLINE_COMPARES TextSourceInteriorLines.xml) + list(APPEND TESTS_WITH_INLINE_COMPARES TextSourcesInChartViews.xml) list(APPEND TESTS_WITH_INLINE_COMPARES MathTextColumn.xml) endif() find_python_module(numpy numpy_found) if (numpy_found) list(APPEND TESTS_WITH_BASELINES + AnnotateNotSanitizedArray.xml ContextViewSelectionTrace.xml ExodusModeShapes.xml FindDataNameSanitization.xml @@ -1336,6 +1461,13 @@ StructuredGridCellBlanking.xml VolumeNoMapScalars.xml # needs programmable filter + numpy ) + + list(APPEND TESTS_WITHOUT_BASELINES + ExpressionChooser.xml + PythonCalculator.xml + PythonCalculatorInput.xml + ) + set(SpreadSheetSelectionTrace_DISABLE_CS TRUE) set(SpreadSheetSelectionTrace_DISABLE_CRS TRUE) @@ -1476,6 +1608,7 @@ list(APPEND TESTS_WITH_INLINE_COMPARES MaterialEditorCreateMaterials.xml MaterialEditorLoadMaterials.xml + MaterialEditorSaveMaterials.xml ) endif () @@ -1508,33 +1641,54 @@ set(BlockOpacities_DISABLE_CRS TRUE) set(SaveExodus_DISABLE_CRS TRUE) # yes, this test does a selection +# ZoomToData is not working as well in crs +set(ZoomToData_DISABLE_CRS TRUE) # These tests cannot be run using ctest -j since they are affected by focus # changed events. set (AnimatePipelineTime_FORCE_SERIAL TRUE) -set (FavoritesFilters_FORCE_SERIAL TRUE) -set (PolygonCellSelection_FORCE_SERIAL TRUE) -set (PolygonPointSelection_FORCE_SERIAL TRUE) -set (Contour_FORCE_SERIAL TRUE) # since this uses popup-menu +set (BlockContextMenu_FORCE_SERIAL TRUE) # requires context menu +set (CGNSReaderDataLocation_FORCE_SERIAL TRUE) # since this uses popup-menu +set (CTHAMRBaseline_FORCE_SERIAL TRUE) # since this uses popup-menu +set (CTHAMRContour_FORCE_SERIAL TRUE) # since this uses popup-menu +set (CTHAMRDualClip_FORCE_SERIAL TRUE) # since this uses popup-menu +set (CTHAMRMaterialInterfaceFilter_FORCE_SERIAL TRUE) # since this uses popup-menu +set (CTHDerivedDensity2DClyinder_FORCE_SERIAL TRUE) # since this uses popup-menu set (Calculator_FORCE_SERIAL TRUE) # since this uses popup-menu -set (LogColorMap_FORCE_SERIAL TRUE) # since this uses popup-menu -set (LogColorMapToggle_FORCE_SERIAL TRUE) # since this pops up output window -set (ColorOpacityTableEditing_FORCE_SERIAL TRUE) # since this uses popup-menu -set (SimpleInteraction_FORCE_SERIAL TRUE) # since this uses popup-menu -set (ExportFilteredColumnsSpreadsheet_FORCE_SERIAL TRUE) # since this uses popup-menu -set (PropertyLink_FORCE_SERIAL TRUE) -set (TestPythonView_FORCE_SERIAL TRUE) # Seems to work better in serial. -set (SaveColorMap_FORCE_SERIAL TRUE) # Uses inline edit popups +set (CategoricalAutomaticAnnotations_FORCE_SERIAL TRUE) # Seems to works better in serial set (CategoricalColors_FORCE_SERIAL TRUE) # Uses inline edit popups +set (CategoricalOpacities_FORCE_SERIAL TRUE) # Seems to works better in serial set (ChartAxisRangeAndLabels_FORCE_SERIAL TRUE) # Uses inline edit popups +set (ColorOpacityTableEditing_FORCE_SERIAL TRUE) # since this uses popup-menu set (ComparativeViewOverlay_FORCE_SERIAL TRUE) # Seems to works better in serial -set (CategoricalAutomaticAnnotations_FORCE_SERIAL TRUE) # Seems to works better in serial -set (CategoricalOpacities_FORCE_SERIAL TRUE) # Seems to works better in serial -set (LoadSaveStateVolume_FORCE_SERIAL TRUE) -set (ShaderReplacements_FORCE_SERIAL TRUE) +set (Contour_FORCE_SERIAL TRUE) # since this uses popup-menu set (CustomViewpoints_FORCE_SERIAL TRUE) +set (DefaultReadersSetting_FORCE_SERIAL TRUE) # since this uses popup-menu set (ExodusModeShapes_FORCE_SERIAL TRUE) +set (ExportFilteredColumnsSpreadsheet_FORCE_SERIAL TRUE) # since this uses popup-menu +set (ExpressionsDialog_FORCE_SERIAL TRUE) # since this uses popup-menu +set (FavoritesFilters_FORCE_SERIAL TRUE) set (LoadSaveStateAnimation_FORCE_SERIAL TRUE) -set(BlockContextMenu_FORCE_SERIAL TRUE) # requires context menu +set (LoadSaveStateVolume_FORCE_SERIAL TRUE) +set (LogColorMapToggle_FORCE_SERIAL TRUE) # since this pops up output window +set (LogColorMap_FORCE_SERIAL TRUE) # since this uses popup-menu +set (MathTextColumn_FORCE_SERIAL TRUE) # since this uses popup-menu +set (PolygonCellSelection_FORCE_SERIAL TRUE) +set (PolygonPointSelection_FORCE_SERIAL TRUE) +set (PropertyLink_FORCE_SERIAL TRUE) +set (ReadPartitionedCGNS_FORCE_SERIAL TRUE) # since this uses popup-menu +set (RecentFiles_FORCE_SERIAL TRUE) # use key events +set (SPTimeseries_FORCE_SERIAL TRUE) # since this uses popup-menu +set (SaveColorMap_FORCE_SERIAL TRUE) # Uses inline edit popups +set (SeriesPresetRegexp_FORCE_SERIAL TRUE) # since this uses popup-menu +set (SeriesPreset_FORCE_SERIAL TRUE) # since this uses popup-menu +set (ShaderReplacements_FORCE_SERIAL TRUE) +set (SimpleInteraction_FORCE_SERIAL TRUE) # since this uses popup-menu +set (TestIsoVolume_FORCE_SERIAL TRUE) # since this uses popup-menu +set (TooltipCopy_FORCE_SERIAL TRUE) # since this uses QTooltip and QShortcut +set (TestPythonView_FORCE_SERIAL TRUE) # Seems to work better in serial. +set (TraceMultiViews_FORCE_SERIAL TRUE) # Seems to works better in serial +set (glTFReaderAnimatedMorphing_FORCE_SERIAL TRUE) # since this uses popup-menu +set (glTFReaderToggleDeformation_FORCE_SERIAL TRUE) # since this uses popup-menu # We don't support volume rendering of image data in data server & render server mode set(AdaptiveResampleToImage_DISABLE_CRS TRUE) @@ -1708,9 +1862,10 @@ SET (ColorEditorVolumeControls_DISABLE_CS TRUE) SET (ColorEditorVolumeControls_DISABLE_CRS TRUE) -# ViewSettingsDialog and TextureUsages uses texture which are not supported in pvcrs mode. +# ViewSettingsDialog, TextureUsages and LogoSourcesInChartViews use texture which are not supported in pvcrs mode. SET (ViewSettingsDialog_DISABLE_CRS TRUE) SET (TextureUsages_DISABLE_CRS TRUE) +SET (LogoSourcesInChartViews_DISABLE_CRS TRUE) # MultiBlockAttributes1 requires selection which doesn't work on pvcrs SET (MultiBlockAttributes1_DISABLE_CRS TRUE) @@ -1720,6 +1875,14 @@ # We can remove this when issue #20657 is resolved SET (AnisotropyPBR_DISABLE_CRS TRUE) +## Disable ClientRenderServer tests for TransferFunction2D. This is done since +## image data delivery is not supported in render server mode +SET (TransferFunction2D_DISABLE_CRS TRUE) +SET (TransferFunction2DYScalars_DISABLE_CRS TRUE) +## The 2D transfer function editor baselines are different on different machines +SET (TransferFunction2D_THRESHOLD 300) +SET (TransferFunction2DYScalars_THRESHOLD 500) + # Plugins are only built as shared libraries. IF (NOT BUILD_SHARED_LIBS) SET (NiftiReaderWriterPlugin_DISABLE_C TRUE) @@ -1822,7 +1985,7 @@ endif() paraview_add_cave_tests(2 "${CMAKE_CURRENT_SOURCE_DIR}/LeftRight.pvx" - TEST_SCRIPTS TestCAVE.xml) + TEST_SCRIPTS TestCAVE.xml TestCAVEVolumeRendering.xml) #------------------------------------------------------------------ # Add tests that test command line arguments (among other things). @@ -1853,13 +2016,6 @@ ARGS "--state=${CMAKE_CURRENT_SOURCE_DIR}/Calculator54State.py" BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR} TEST_SCRIPTS Calculator54State.xml) - - # Test backwards compatibility for Glyph filter change in ParaView 5.6 - paraview_add_client_tests( - ARGS "--state=${CMAKE_CURRENT_SOURCE_DIR}/Glyph56State.py" - BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR} - TEST_SCRIPTS Glyph56State.xml - ) endif() #---------------------------------------------------------------------- @@ -1948,3 +2104,37 @@ endif() endforeach() endforeach() + +# Server Connection specific tests + +if(NOT WIN32) # On windows, QtTesting is not able to press the connection dialog buttons + paraview_add_client_tests( + SMTESTING_ALLOW_ERRORS + FORCE_SERIAL + TEST_SCRIPTS ServerConnectTimeout.xml) +endif() + +configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/configuredServer.pvsc.in" + "${CMAKE_CURRENT_BINARY_DIR}/configuredServer.pvsc" @ONLY) + +configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/ServerConnectConfigured.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/ServerConnectConfigured.xml" @ONLY) + +paraview_add_client_tests( + FORCE_SERIAL + TEST_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ServerConnectConfigured.xml) + +if (PARAVIEW_PLUGIN_ENABLE_ArrowGlyph) + configure_file ( + "${CMAKE_CURRENT_SOURCE_DIR}/ServerConnectPluginLoad.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/ServerConnectPluginLoad.xml" @ONLY) + + paraview_add_client_tests( + FORCE_SERIAL + TEST_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ServerConnectPluginLoad.xml) +endif () + +# Some tests can take a long time, increasing their timeout +set_property(TEST pvcrs.UndoRedo1 PROPERTY TIMEOUT 300) diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ColorByCellDataStringArray.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorByCellDataStringArray.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ColorByCellDataStringArray.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorByCellDataStringArray.xml 2022-09-01 19:52:20.000000000 +0000 @@ -9,10 +9,10 @@ - - + + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ColorLegendBackground.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorLegendBackground.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ColorLegendBackground.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorLegendBackground.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ColorOpacityTableEditorHistogram.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorOpacityTableEditorHistogram.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ColorOpacityTableEditorHistogram.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ColorOpacityTableEditorHistogram.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,12 +5,12 @@ - + - + @@ -25,7 +25,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -88,7 +88,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ComparativeVisPanel.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ComparativeVisPanel.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ComparativeVisPanel.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ComparativeVisPanel.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,7 +10,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ComputeConnectedSurfaceProperties.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ComputeConnectedSurfaceProperties.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ComputeConnectedSurfaceProperties.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ComputeConnectedSurfaceProperties.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/configuredServer.pvsc.in paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/configuredServer.pvsc.in --- paraview-5.10.1/Clients/ParaView/Testing/XML/configuredServer.pvsc.in 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/configuredServer.pvsc.in 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ContourCellData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ContourCellData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ContourCellData.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ContourCellData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -18,7 +18,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ContourRange.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ContourRange.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ContourRange.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ContourRange.xml 2022-09-01 19:52:20.000000000 +0000 @@ -24,4 +24,14 @@ + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CONVERGECFDReaderWithVisItBridge.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CONVERGECFDReaderWithVisItBridge.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CONVERGECFDReaderWithVisItBridge.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CONVERGECFDReaderWithVisItBridge.xml 2022-09-01 19:52:20.000000000 +0000 @@ -9,8 +9,8 @@ - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CONVERGECFDReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CONVERGECFDReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CONVERGECFDReader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CONVERGECFDReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,8 +8,8 @@ - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRBaseline.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRBaseline.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRBaseline.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRBaseline.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,8 +2,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRContour.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRContour.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRContour.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRContour.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,8 +2,9 @@ - - + + + @@ -12,8 +13,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRDualClip.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRDualClip.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRDualClip.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRDualClip.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,16 +2,18 @@ - - + + + - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRMaterialInterfaceFilter.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRMaterialInterfaceFilter.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CTHAMRMaterialInterfaceFilter.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHAMRMaterialInterfaceFilter.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,16 +2,18 @@ - - + + + - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CTHDerivedDensity2DClyinder.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHDerivedDensity2DClyinder.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CTHDerivedDensity2DClyinder.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CTHDerivedDensity2DClyinder.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,8 +2,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/CustomSourceProbe.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CustomSourceProbe.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/CustomSourceProbe.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/CustomSourceProbe.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,7 +21,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/DefaultReadersSetting.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DefaultReadersSetting.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/DefaultReadersSetting.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DefaultReadersSetting.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/DeleteSubtreePipelineBrowser.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DeleteSubtreePipelineBrowser.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/DeleteSubtreePipelineBrowser.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DeleteSubtreePipelineBrowser.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/DelimitedTextReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DelimitedTextReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/DelimitedTextReader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DelimitedTextReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,13 +3,13 @@ - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/DynamicFieldDataDomain.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DynamicFieldDataDomain.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/DynamicFieldDataDomain.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/DynamicFieldDataDomain.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,7 +12,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Ensemble.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Ensemble.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Ensemble.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Ensemble.xml 2022-09-01 19:52:20.000000000 +0000 @@ -26,9 +26,9 @@ - + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/EnSightTensorInversionBin.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/EnSightTensorInversionBin.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/EnSightTensorInversionBin.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/EnSightTensorInversionBin.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,7 +4,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/EnSightTensorInversion.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/EnSightTensorInversion.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/EnSightTensorInversion.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/EnSightTensorInversion.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,7 +4,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExodusModeShapes.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExodusModeShapes.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExodusModeShapes.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExodusModeShapes.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + @@ -28,7 +28,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExodusSingleTimeStep.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExodusSingleTimeStep.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExodusSingleTimeStep.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExodusSingleTimeStep.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,4 +11,6 @@ + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExpandSelection.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpandSelection.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExpandSelection.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpandSelection.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,9 +12,25 @@ + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportFilteredColumnsSpreadsheet.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportFilteredColumnsSpreadsheet.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportFilteredColumnsSpreadsheet.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportFilteredColumnsSpreadsheet.xml 2022-09-01 19:52:20.000000000 +0000 @@ -14,21 +14,21 @@ - + - - + + - + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportLinePlotToCSV.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportLinePlotToCSV.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportLinePlotToCSV.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportLinePlotToCSV.xml 2022-09-01 19:52:20.000000000 +0000 @@ -40,7 +40,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportLinePlotToTSV.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportLinePlotToTSV.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportLinePlotToTSV.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportLinePlotToTSV.xml 2022-09-01 19:52:20.000000000 +0000 @@ -40,7 +40,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView2.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView2.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView2.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView2.xml 2022-09-01 19:52:20.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetViewVerify.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetViewVerify.py --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetViewVerify.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetViewVerify.py 2022-09-01 19:52:20.000000000 +0000 @@ -9,16 +9,16 @@ expected_columns = [ '"Time"', - '"avg displ (Magnitude) ( block=2)"', - '"min displ (Magnitude) ( block=2)"', - '"max displ (Magnitude) ( block=2)"', - '"q1 displ (Magnitude) ( block=2)"', - '"q3 displ (Magnitude) ( block=2)"', - '"avg vel (Magnitude) ( block=2)"', - '"min vel (Magnitude) ( block=2)"', - '"max vel (Magnitude) ( block=2)"', - '"q1 vel (Magnitude) ( block=2)"', - '"q3 vel (Magnitude) ( block=2)"' + '"avg DISPL (Magnitude) ( block=2)"', + '"min DISPL (Magnitude) ( block=2)"', + '"max DISPL (Magnitude) ( block=2)"', + '"q1 DISPL (Magnitude) ( block=2)"', + '"q3 DISPL (Magnitude) ( block=2)"', + '"avg VEL (Magnitude) ( block=2)"', + '"min VEL (Magnitude) ( block=2)"', + '"max VEL (Magnitude) ( block=2)"', + '"q1 VEL (Magnitude) ( block=2)"', + '"q3 VEL (Magnitude) ( block=2)"' ] # Open CSV file written by the XML test and verify the column names. diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSceneSpreadSheetView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -13,12 +13,12 @@ - - + + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSelectionToCSV.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSelectionToCSV.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSelectionToCSV.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSelectionToCSV.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,6 +20,7 @@ + @@ -37,7 +38,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSpreadsheetFormatting.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSpreadsheetFormatting.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportSpreadsheetFormatting.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportSpreadsheetFormatting.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,12 +8,12 @@ - - + + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExportX3dPOVVRML.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportX3dPOVVRML.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExportX3dPOVVRML.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExportX3dPOVVRML.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,7 +4,7 @@ - + @@ -13,11 +13,11 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionChooser.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionChooser.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionChooser.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionChooser.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsDialog.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsDialog.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsDialog.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsDialog.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsExporter.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsExporter.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsExporter.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsExporter.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsSettings.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsSettings.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExpressionsSettings.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExpressionsSettings.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExTimeseries2.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExTimeseries2.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExTimeseries2.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExTimeseries2.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,7 +11,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExTimeseries.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExTimeseries.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExTimeseries.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExTimeseries.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,7 +8,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExtractCellsByType.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExtractCellsByType.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExtractCellsByType.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExtractCellsByType.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ExtractParticlesOverTime.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExtractParticlesOverTime.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ExtractParticlesOverTime.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ExtractParticlesOverTime.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/FidesReaderADIOS2.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FidesReaderADIOS2.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/FidesReaderADIOS2.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FidesReaderADIOS2.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,6 +20,7 @@ + + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/FindDataQueries.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FindDataQueries.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/FindDataQueries.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FindDataQueries.xml 2022-09-01 19:52:20.000000000 +0000 @@ -38,21 +38,21 @@ - + - + - + @@ -82,13 +82,13 @@ - + - + @@ -96,7 +96,7 @@ - + @@ -105,11 +105,11 @@ - + - + @@ -118,6 +118,6 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/FindDataTime.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FindDataTime.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/FindDataTime.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FindDataTime.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,7 +10,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ForceTimeDiamond.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ForceTimeDiamond.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ForceTimeDiamond.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ForceTimeDiamond.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,7 +10,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ForceTime.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ForceTime.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ForceTime.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ForceTime.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,11 +8,11 @@ - - - - - + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/FreezeQueryMultiblock.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FreezeQueryMultiblock.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/FreezeQueryMultiblock.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/FreezeQueryMultiblock.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,7 +10,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/GenerateTimeSteps.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GenerateTimeSteps.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/GenerateTimeSteps.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GenerateTimeSteps.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/glTFReaderAnimatedMorphing.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/glTFReaderAnimatedMorphing.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/glTFReaderAnimatedMorphing.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/glTFReaderAnimatedMorphing.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,8 +6,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/glTFReaderToggleDeformation.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/glTFReaderToggleDeformation.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/glTFReaderToggleDeformation.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/glTFReaderToggleDeformation.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,8 +5,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph3DRepresentation.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph3DRepresentation.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph3DRepresentation.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph3DRepresentation.xml 2022-09-01 19:52:20.000000000 +0000 @@ -22,8 +22,8 @@ - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph56State.py paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph56State.py --- paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph56State.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph56State.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -# trace generated using paraview version 5.5.2 - -#### import the simple module from the paraview -from paraview.simple import * - -# the compatibility information has to be manually set -paraview.compatibility.major = 5 -paraview.compatibility.minor = 5 - -#### disable automatic camera reset on 'Show' -paraview.simple._DisableFirstRenderCameraReset() - -# create a new 'Wavelet' -wavelet1 = Wavelet() - -# get active view -renderView1 = GetActiveViewOrCreate('RenderView') -# uncomment following to set a specific view size -# renderView1.ViewSize = [1436, 898] - -# show data in view -wavelet1Display = Show(wavelet1, renderView1) - -# trace defaults for the display properties. -wavelet1Display.Representation = 'Outline' -wavelet1Display.ColorArrayName = ['POINTS', ''] -wavelet1Display.OSPRayScaleArray = 'RTData' -wavelet1Display.OSPRayScaleFunction = 'PiecewiseFunction' -wavelet1Display.SelectOrientationVectors = 'None' -wavelet1Display.ScaleFactor = 2.0 -wavelet1Display.SelectScaleArray = 'RTData' -wavelet1Display.GlyphType = 'Arrow' -wavelet1Display.GlyphTableIndexArray = 'RTData' -wavelet1Display.GaussianRadius = 0.1 -wavelet1Display.SetScaleArray = ['POINTS', 'RTData'] -wavelet1Display.ScaleTransferFunction = 'PiecewiseFunction' -wavelet1Display.OpacityArray = ['POINTS', 'RTData'] -wavelet1Display.OpacityTransferFunction = 'PiecewiseFunction' -wavelet1Display.DataAxesGrid = 'GridAxesRepresentation' -wavelet1Display.SelectionCellLabelFontFile = '' -wavelet1Display.SelectionPointLabelFontFile = '' -wavelet1Display.PolarAxes = 'PolarAxesRepresentation' -wavelet1Display.ScalarOpacityUnitDistance = 1.7320508075688779 -wavelet1Display.IsosurfaceValues = [157.0909652709961] -wavelet1Display.Slice = 10 - -# init the 'PiecewiseFunction' selected for 'ScaleTransferFunction' -wavelet1Display.ScaleTransferFunction.Points = [37.35310363769531, 0.0, 0.5, 0.0, 276.8288269042969, 1.0, 0.5, 0.0] - -# init the 'PiecewiseFunction' selected for 'OpacityTransferFunction' -wavelet1Display.OpacityTransferFunction.Points = [37.35310363769531, 0.0, 0.5, 0.0, 276.8288269042969, 1.0, 0.5, 0.0] - -# init the 'GridAxesRepresentation' selected for 'DataAxesGrid' -wavelet1Display.DataAxesGrid.XTitleFontFile = '' -wavelet1Display.DataAxesGrid.YTitleFontFile = '' -wavelet1Display.DataAxesGrid.ZTitleFontFile = '' -wavelet1Display.DataAxesGrid.XLabelFontFile = '' -wavelet1Display.DataAxesGrid.YLabelFontFile = '' -wavelet1Display.DataAxesGrid.ZLabelFontFile = '' - -# init the 'PolarAxesRepresentation' selected for 'PolarAxes' -wavelet1Display.PolarAxes.PolarAxisTitleFontFile = '' -wavelet1Display.PolarAxes.PolarAxisLabelFontFile = '' -wavelet1Display.PolarAxes.LastRadialAxisTextFontFile = '' -wavelet1Display.PolarAxes.SecondaryRadialAxesTextFontFile = '' - -# reset view to fit data -renderView1.ResetCamera() - -# update the view to ensure updated data information -renderView1.Update() - -# create a new 'Gradient' -gradient1 = Gradient(Input=wavelet1) -gradient1.SelectInputScalars = ['POINTS', 'RTData'] - -# show data in view -gradient1Display = Show(gradient1, renderView1) - -# trace defaults for the display properties. -gradient1Display.Representation = 'Outline' -gradient1Display.ColorArrayName = ['POINTS', ''] -gradient1Display.OSPRayScaleArray = 'RTDataGradient' -gradient1Display.OSPRayScaleFunction = 'PiecewiseFunction' -gradient1Display.SelectOrientationVectors = 'None' -gradient1Display.ScaleFactor = 2.0 -gradient1Display.SelectScaleArray = 'RTDataGradient' -gradient1Display.GlyphType = 'Arrow' -gradient1Display.GlyphTableIndexArray = 'RTDataGradient' -gradient1Display.GaussianRadius = 0.1 -gradient1Display.SetScaleArray = ['POINTS', 'RTDataGradient'] -gradient1Display.ScaleTransferFunction = 'PiecewiseFunction' -gradient1Display.OpacityArray = ['POINTS', 'RTDataGradient'] -gradient1Display.OpacityTransferFunction = 'PiecewiseFunction' -gradient1Display.DataAxesGrid = 'GridAxesRepresentation' -gradient1Display.SelectionCellLabelFontFile = '' -gradient1Display.SelectionPointLabelFontFile = '' -gradient1Display.PolarAxes = 'PolarAxesRepresentation' -gradient1Display.ScalarOpacityUnitDistance = 1.7320508075688779 -gradient1Display.IsosurfaceValues = [1.0375213623046875] -gradient1Display.Slice = 10 - -# init the 'PiecewiseFunction' selected for 'ScaleTransferFunction' -gradient1Display.ScaleTransferFunction.Points = [-15.3538818359375, 0.0, 0.5, 0.0, 17.428924560546875, 1.0, 0.5, 0.0] - -# init the 'PiecewiseFunction' selected for 'OpacityTransferFunction' -gradient1Display.OpacityTransferFunction.Points = [-15.3538818359375, 0.0, 0.5, 0.0, 17.428924560546875, 1.0, 0.5, 0.0] - -# init the 'GridAxesRepresentation' selected for 'DataAxesGrid' -gradient1Display.DataAxesGrid.XTitleFontFile = '' -gradient1Display.DataAxesGrid.YTitleFontFile = '' -gradient1Display.DataAxesGrid.ZTitleFontFile = '' -gradient1Display.DataAxesGrid.XLabelFontFile = '' -gradient1Display.DataAxesGrid.YLabelFontFile = '' -gradient1Display.DataAxesGrid.ZLabelFontFile = '' - -# init the 'PolarAxesRepresentation' selected for 'PolarAxes' -gradient1Display.PolarAxes.PolarAxisTitleFontFile = '' -gradient1Display.PolarAxes.PolarAxisLabelFontFile = '' -gradient1Display.PolarAxes.LastRadialAxisTextFontFile = '' -gradient1Display.PolarAxes.SecondaryRadialAxesTextFontFile = '' - -# hide data in view -Hide(wavelet1, renderView1) - -# update the view to ensure updated data information -renderView1.Update() - -# create a new 'Glyph' -glyph1 = Glyph(Input=gradient1, - GlyphType='Arrow') -glyph1.Scalars = ['POINTS', 'None'] -glyph1.Vectors = ['POINTS', 'None'] -glyph1.ScaleFactor = 2.0 -glyph1.GlyphTransform = 'Transform2' - -# show data in view -glyph1Display = Show(glyph1, renderView1) - -# get color transfer function/color map for 'RTDataGradient' -rTDataGradientLUT = GetColorTransferFunction('RTDataGradient') - -# trace defaults for the display properties. -glyph1Display.Representation = 'Surface' -glyph1Display.ColorArrayName = ['POINTS', 'RTDataGradient'] -glyph1Display.LookupTable = rTDataGradientLUT -glyph1Display.OSPRayScaleArray = 'RTDataGradient' -glyph1Display.OSPRayScaleFunction = 'PiecewiseFunction' -glyph1Display.SelectOrientationVectors = 'None' -glyph1Display.ScaleFactor = 2.2 -glyph1Display.SelectScaleArray = 'RTDataGradient' -glyph1Display.GlyphType = 'Arrow' -glyph1Display.GlyphTableIndexArray = 'RTDataGradient' -glyph1Display.GaussianRadius = 0.11 -glyph1Display.SetScaleArray = ['POINTS', 'RTDataGradient'] -glyph1Display.ScaleTransferFunction = 'PiecewiseFunction' -glyph1Display.OpacityArray = ['POINTS', 'RTDataGradient'] -glyph1Display.OpacityTransferFunction = 'PiecewiseFunction' -glyph1Display.DataAxesGrid = 'GridAxesRepresentation' -glyph1Display.SelectionCellLabelFontFile = '' -glyph1Display.SelectionPointLabelFontFile = '' -glyph1Display.PolarAxes = 'PolarAxesRepresentation' - -# init the 'PiecewiseFunction' selected for 'ScaleTransferFunction' -glyph1Display.ScaleTransferFunction.Points = [-15.280296325683594, 0.0, 0.5, 0.0, 17.390480041503906, 1.0, 0.5, 0.0] - -# init the 'PiecewiseFunction' selected for 'OpacityTransferFunction' -glyph1Display.OpacityTransferFunction.Points = [-15.280296325683594, 0.0, 0.5, 0.0, 17.390480041503906, 1.0, 0.5, 0.0] - -# init the 'GridAxesRepresentation' selected for 'DataAxesGrid' -glyph1Display.DataAxesGrid.XTitleFontFile = '' -glyph1Display.DataAxesGrid.YTitleFontFile = '' -glyph1Display.DataAxesGrid.ZTitleFontFile = '' -glyph1Display.DataAxesGrid.XLabelFontFile = '' -glyph1Display.DataAxesGrid.YLabelFontFile = '' -glyph1Display.DataAxesGrid.ZLabelFontFile = '' - -# init the 'PolarAxesRepresentation' selected for 'PolarAxes' -glyph1Display.PolarAxes.PolarAxisTitleFontFile = '' -glyph1Display.PolarAxes.PolarAxisLabelFontFile = '' -glyph1Display.PolarAxes.LastRadialAxisTextFontFile = '' -glyph1Display.PolarAxes.SecondaryRadialAxesTextFontFile = '' - -# show color bar/color legend -glyph1Display.SetScalarBarVisibility(renderView1, True) - -# update the view to ensure updated data information -renderView1.Update() - -# Properties modified on glyph1 -glyph1.Vectors = ['POINTS', 'RTDataGradient'] - -# update the view to ensure updated data information -renderView1.Update() - -# hide data in view -Hide(gradient1, renderView1) - -# hide color bar/color legend -glyph1Display.SetScalarBarVisibility(renderView1, False) - -# Properties modified on glyph1 -glyph1.GlyphType = 'Cylinder' - -# update the view to ensure updated data information -renderView1.Update() - -#### saving camera placements for all active views - -# current camera placement for renderView1 -renderView1.CameraPosition = [0.0, 0.0, 66.92130429902464] -renderView1.CameraParallelScale = 17.320508075688775 - -#### uncomment the following to render all views -# RenderAllViews() -# alternatively, if you want to write images, you can use SaveScreenshot(...). diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph56State.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph56State.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Glyph56State.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Glyph56State.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/GlyphWithEmptyCells.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GlyphWithEmptyCells.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/GlyphWithEmptyCells.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GlyphWithEmptyCells.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/GridConnectivity.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GridConnectivity.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/GridConnectivity.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/GridConnectivity.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,7 +21,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/HistogramSelection.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/HistogramSelection.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/HistogramSelection.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/HistogramSelection.xml 2022-09-01 19:52:20.000000000 +0000 @@ -17,7 +17,7 @@ - + @@ -76,7 +76,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/HyperTreeGridMultiBlock.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/HyperTreeGridMultiBlock.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/HyperTreeGridMultiBlock.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/HyperTreeGridMultiBlock.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/IgnoreLogAxisWarning.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/IgnoreLogAxisWarning.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/IgnoreLogAxisWarning.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/IgnoreLogAxisWarning.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ImageDataToUniformGrid.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ImageDataToUniformGrid.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ImageDataToUniformGrid.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ImageDataToUniformGrid.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,7 +4,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ImageVolumeRendering.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ImageVolumeRendering.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ImageVolumeRendering.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ImageVolumeRendering.xml 2022-09-01 19:52:20.000000000 +0000 @@ -25,9 +25,9 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/IndexedLookupInitialization.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/IndexedLookupInitialization.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/IndexedLookupInitialization.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/IndexedLookupInitialization.xml 2022-09-01 19:52:20.000000000 +0000 @@ -15,7 +15,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LightToolbar.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LightToolbar.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LightToolbar.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LightToolbar.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LinkCameraFromView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LinkCameraFromView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LinkCameraFromView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LinkCameraFromView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,8 +1,9 @@ - + + @@ -26,4 +27,17 @@ + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LoadSaveStateVolume.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LoadSaveStateVolume.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LoadSaveStateVolume.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LoadSaveStateVolume.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,6 +4,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LoadStateMultiView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LoadStateMultiView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LoadStateMultiView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LoadStateMultiView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -7,14 +7,14 @@ - + + + + - - - - + @@ -38,8 +38,8 @@ - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LogColorMapToggle.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogColorMapToggle.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LogColorMapToggle.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogColorMapToggle.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,7 +3,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LogColorMap.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogColorMap.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LogColorMap.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogColorMap.xml 2022-09-01 19:52:20.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/LogoSourcesInChartViews.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogoSourcesInChartViews.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/LogoSourcesInChartViews.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/LogoSourcesInChartViews.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReaderMPI.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReaderMPI.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReaderMPI.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReaderMPI.xml 2022-09-01 19:52:20.000000000 +0000 @@ -16,17 +16,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -49,17 +49,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ManyTypesXMLWriterReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -16,18 +16,18 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -48,17 +48,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorCreateMaterials.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorCreateMaterials.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorCreateMaterials.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorCreateMaterials.xml 2022-09-01 19:52:20.000000000 +0000 @@ -63,7 +63,6 @@ - diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorLoadMaterials.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorLoadMaterials.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorLoadMaterials.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorLoadMaterials.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,10 +20,10 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorSaveMaterials.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorSaveMaterials.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MaterialEditorSaveMaterials.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MaterialEditorSaveMaterials.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MergeVectorComponents.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MergeVectorComponents.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MergeVectorComponents.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MergeVectorComponents.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,15 +6,15 @@ - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorExtractBlocks.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorExtractBlocks.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorExtractBlocks.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorExtractBlocks.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorSelection.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorSelection.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorSelection.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorSelection.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,18 +5,18 @@ - - + + - + - + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorWithoutSelectOnClickSetting.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorWithoutSelectOnClickSetting.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspectorWithoutSelectOnClickSetting.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspectorWithoutSelectOnClickSetting.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspector.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspector.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockInspector.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockInspector.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + @@ -23,5 +23,5 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockVolumeRendering.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockVolumeRendering.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiBlockVolumeRendering.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiBlockVolumeRendering.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,12 +6,12 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiSliceMultiBlock.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiSliceMultiBlock.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiSliceMultiBlock.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiSliceMultiBlock.xml 2022-09-01 19:52:20.000000000 +0000 @@ -15,16 +15,9 @@ - - - - - - - - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/MultiSliceWavelet.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiSliceWavelet.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/MultiSliceWavelet.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/MultiSliceWavelet.xml 2022-09-01 19:52:20.000000000 +0000 @@ -16,12 +16,6 @@ - - - - - - diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/OpacityWidgetRange.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OpacityWidgetRange.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/OpacityWidgetRange.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OpacityWidgetRange.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,7 +6,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/OpenVDBReader.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OpenVDBReader.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/OpenVDBReader.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OpenVDBReader.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/OrthographicView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OrthographicView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/OrthographicView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/OrthographicView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ParallelCoordinatesView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ParallelCoordinatesView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ParallelCoordinatesView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ParallelCoordinatesView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,20 +1,17 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PlotDataOverTime-NonDistributed.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PlotDataOverTime-NonDistributed.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PlotDataOverTime-NonDistributed.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PlotDataOverTime-NonDistributed.xml 2022-09-01 19:52:20.000000000 +0000 @@ -28,9 +28,9 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PlotOverTimeAutoApply.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PlotOverTimeAutoApply.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PlotOverTimeAutoApply.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PlotOverTimeAutoApply.xml 2022-09-01 19:52:20.000000000 +0000 @@ -15,8 +15,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PointCellDataConversion.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointCellDataConversion.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PointCellDataConversion.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointCellDataConversion.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,12 +6,12 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PointInterpolator.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointInterpolator.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PointInterpolator.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointInterpolator.xml 2022-09-01 19:52:20.000000000 +0000 @@ -14,7 +14,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PointVolumeInterpolator.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointVolumeInterpolator.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PointVolumeInterpolator.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PointVolumeInterpolator.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,4 +10,5 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion1.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion1.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion1.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion1.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,11 +12,11 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion3.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion3.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion3.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion3.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,7 +20,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion4.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion4.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion4.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion4.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,14 +6,14 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PropertyConversion.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PropertyConversion.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,13 +12,13 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PythonCalculatorInput.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonCalculatorInput.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PythonCalculatorInput.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonCalculatorInput.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PythonCalculator.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonCalculator.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PythonCalculator.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonCalculator.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,5 +5,6 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PythonEditorRun.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonEditorRun.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PythonEditorRun.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonEditorRun.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/PythonResetSessionMacro.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonResetSessionMacro.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/PythonResetSessionMacro.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/PythonResetSessionMacro.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ReadCGNSBCDataset.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadCGNSBCDataset.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ReadCGNSBCDataset.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadCGNSBCDataset.xml 2022-09-01 19:52:20.000000000 +0000 @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ReadIOHDFAMRMaxLevels.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadIOHDFAMRMaxLevels.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ReadIOHDFAMRMaxLevels.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadIOHDFAMRMaxLevels.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ReadIOHDFFileSeries.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadIOHDFFileSeries.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ReadIOHDFFileSeries.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadIOHDFFileSeries.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,7 +5,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ReadPartitionedCGNS.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadPartitionedCGNS.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ReadPartitionedCGNS.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ReadPartitionedCGNS.xml 2022-09-01 19:52:20.000000000 +0000 @@ -9,10 +9,14 @@ - - - - + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/RecentFiles.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RecentFiles.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/RecentFiles.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RecentFiles.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/RemoteRendering.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RemoteRendering.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/RemoteRendering.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RemoteRendering.xml 2022-09-01 19:52:20.000000000 +0000 @@ -24,6 +24,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid2DX.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid2DX.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid2DX.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid2DX.xml 2022-09-01 19:52:20.000000000 +0000 @@ -35,10 +35,10 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToHyperTreeGrid.xml 2022-09-01 19:52:20.000000000 +0000 @@ -17,7 +17,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -71,7 +71,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToLine.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToLine.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleToLine.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleToLine.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleWithDataset.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleWithDataset.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ResampleWithDataset.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ResampleWithDataset.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,7 +12,7 @@ - + @@ -42,17 +42,17 @@ - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/RescaleToTemporal.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RescaleToTemporal.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/RescaleToTemporal.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/RescaleToTemporal.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,7 +3,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SaveColorMap.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SaveColorMap.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SaveColorMap.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SaveColorMap.xml 2022-09-01 19:52:20.000000000 +0000 @@ -18,6 +18,10 @@ + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SaveLoadStatePython.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SaveLoadStatePython.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SaveLoadStatePython.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SaveLoadStatePython.xml 2022-09-01 19:52:20.000000000 +0000 @@ -7,7 +7,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ScalarBarRange.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ScalarBarRange.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ScalarBarRange.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ScalarBarRange.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionByArray.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionByArray.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionByArray.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionByArray.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,15 +1,50 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17,9 +52,14 @@ - + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionEditor.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionEditor.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionEditor.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionEditor.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionLinkScripting.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionLinkScripting.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SelectionLinkScripting.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SelectionLinkScripting.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,13 +4,11 @@ - - - - + + @@ -57,10 +55,13 @@ - + + + + @@ -70,7 +71,9 @@ + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SeparateOpacityArray.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeparateOpacityArray.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SeparateOpacityArray.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeparateOpacityArray.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,9 +3,10 @@ - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SeriesPresetRegexp.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeriesPresetRegexp.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SeriesPresetRegexp.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeriesPresetRegexp.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,8 +6,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SeriesPreset.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeriesPreset.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SeriesPreset.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SeriesPreset.xml 2022-09-01 19:52:20.000000000 +0000 @@ -7,6 +7,9 @@ + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectConfigured.xml.in paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectConfigured.xml.in --- paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectConfigured.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectConfigured.xml.in 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectDialog.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectDialog.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectDialog.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectDialog.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,11 +21,14 @@ - - - + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectPluginLoad.xml.in paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectPluginLoad.xml.in --- paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectPluginLoad.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectPluginLoad.xml.in 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectTimeout.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectTimeout.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ServerConnectTimeout.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ServerConnectTimeout.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ShowMultiPieceFieldData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ShowMultiPieceFieldData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ShowMultiPieceFieldData.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ShowMultiPieceFieldData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SliceAlongPolyline.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceAlongPolyline.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SliceAlongPolyline.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceAlongPolyline.xml 2022-09-01 19:52:20.000000000 +0000 @@ -58,6 +58,6 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SliceAlongSpline.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceAlongSpline.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SliceAlongSpline.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceAlongSpline.xml 2022-09-01 19:52:20.000000000 +0000 @@ -58,6 +58,6 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SliceWithPlaneMultiBlock.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceWithPlaneMultiBlock.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SliceWithPlaneMultiBlock.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SliceWithPlaneMultiBlock.xml 2022-09-01 19:52:20.000000000 +0000 @@ -27,10 +27,10 @@ - + + - - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/Slice.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Slice.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/Slice.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/Slice.xml 2022-09-01 19:52:20.000000000 +0000 @@ -192,7 +192,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SortLineChartData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SortLineChartData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SortLineChartData.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SortLineChartData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,10 +10,10 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheet3.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheet3.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheet3.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheet3.xml 2022-09-01 19:52:20.000000000 +0000 @@ -10,19 +10,19 @@ - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheetParallelData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheetParallelData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheetParallelData.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheetParallelData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -18,7 +18,5 @@ - - - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheetSelectedCellConnectivity.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheetSelectedCellConnectivity.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SpreadSheetSelectedCellConnectivity.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SpreadSheetSelectedCellConnectivity.xml 2022-09-01 19:52:20.000000000 +0000 @@ -15,9 +15,9 @@ - - - - + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/SPTimeseries.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SPTimeseries.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/SPTimeseries.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/SPTimeseries.xml 2022-09-01 19:52:20.000000000 +0000 @@ -3,8 +3,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/StreamTracerSurface.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/StreamTracerSurface.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/StreamTracerSurface.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/StreamTracerSurface.xml 2022-09-01 19:52:20.000000000 +0000 @@ -12,7 +12,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/StructuredGridCellBlanking.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/StructuredGridCellBlanking.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/StructuredGridCellBlanking.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/StructuredGridCellBlanking.xml 2022-09-01 19:52:20.000000000 +0000 @@ -9,10 +9,10 @@ - + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TestCAVEVolumeRendering.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestCAVEVolumeRendering.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TestCAVEVolumeRendering.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestCAVEVolumeRendering.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,13 @@ + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TestHiddenLineRemoval.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestHiddenLineRemoval.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TestHiddenLineRemoval.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestHiddenLineRemoval.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,10 +8,10 @@ - - + + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TestIsoVolume.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestIsoVolume.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TestIsoVolume.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestIsoVolume.xml 2022-09-01 19:52:20.000000000 +0000 @@ -38,7 +38,7 @@ - + @@ -48,13 +48,13 @@ - + - + @@ -64,8 +64,9 @@ - - + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TestPythonView.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestPythonView.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TestPythonView.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestPythonView.xml 2022-09-01 19:52:20.000000000 +0000 @@ -32,16 +32,16 @@ - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TestResampleHyperTreeGridWithSphere.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestResampleHyperTreeGridWithSphere.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TestResampleHyperTreeGridWithSphere.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TestResampleHyperTreeGridWithSphere.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TextSourceInteriorLines.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSourceInteriorLines.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TextSourceInteriorLines.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSourceInteriorLines.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TextSourcesInChartViews.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSourcesInChartViews.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TextSourcesInChartViews.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSourcesInChartViews.xml 2022-09-01 19:52:20.000000000 +0000 @@ -22,4 +22,22 @@ + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TextSource.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSource.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TextSource.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextSource.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,8 +11,13 @@ + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TextureUsages.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextureUsages.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TextureUsages.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TextureUsages.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,7 +20,8 @@ - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ThresholdTable.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ThresholdTable.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ThresholdTable.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ThresholdTable.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TooltipCopy.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TooltipCopy.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TooltipCopy.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TooltipCopy.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TraceExodus.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceExodus.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TraceExodus.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceExodus.xml 2022-09-01 19:52:20.000000000 +0000 @@ -21,7 +21,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TraceExportAndSaveData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceExportAndSaveData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TraceExportAndSaveData.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceExportAndSaveData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -19,7 +19,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TraceMultiViews.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceMultiViews.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TraceMultiViews.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TraceMultiViews.xml 2022-09-01 19:52:20.000000000 +0000 @@ -17,12 +17,12 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TransferFunction2D.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TransferFunction2D.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TransferFunction2D.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TransferFunction2D.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/TransferFunction2DYScalars.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TransferFunction2DYScalars.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/TransferFunction2DYScalars.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/TransferFunction2DYScalars.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/UniformInverseTransformSamplingGlyph.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UniformInverseTransformSamplingGlyph.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/UniformInverseTransformSamplingGlyph.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UniformInverseTransformSamplingGlyph.xml 2022-09-01 19:52:20.000000000 +0000 @@ -11,14 +11,14 @@ - - + + - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/UnstructuredVolumeRenderingVectorComponent.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UnstructuredVolumeRenderingVectorComponent.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/UnstructuredVolumeRenderingVectorComponent.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UnstructuredVolumeRenderingVectorComponent.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,7 +4,7 @@ - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/UpdateTransferFunctionRanges.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UpdateTransferFunctionRanges.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/UpdateTransferFunctionRanges.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/UpdateTransferFunctionRanges.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -17,28 +17,28 @@ - + - + - + - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VectorComponentHistogram.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VectorComponentHistogram.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VectorComponentHistogram.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VectorComponentHistogram.xml 2022-09-01 19:52:20.000000000 +0000 @@ -20,10 +20,10 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeCrop.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeCrop.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeCrop.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeCrop.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,6 +5,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeIsosurfaceBlendMode.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeIsosurfaceBlendMode.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeIsosurfaceBlendMode.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeIsosurfaceBlendMode.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,5 +5,6 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeNoMapScalars.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeNoMapScalars.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeNoMapScalars.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeNoMapScalars.xml 2022-09-01 19:52:20.000000000 +0000 @@ -14,6 +14,7 @@ + @@ -30,6 +31,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeRenderingScalarBarInitialization.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeRenderingScalarBarInitialization.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeRenderingScalarBarInitialization.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeRenderingScalarBarInitialization.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeReprTwoIndepComp.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeReprTwoIndepComp.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeReprTwoIndepComp.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeReprTwoIndepComp.xml 2022-09-01 19:52:20.000000000 +0000 @@ -6,6 +6,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeSliceBlendMode.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeSliceBlendMode.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/VolumeSliceBlendMode.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/VolumeSliceBlendMode.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,6 +5,7 @@ + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/XYHistogram.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/XYHistogram.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/XYHistogram.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/XYHistogram.xml 2022-09-01 19:52:20.000000000 +0000 @@ -36,8 +36,8 @@ - - + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomClosest.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomClosest.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomClosest.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomClosest.xml 2022-09-01 19:52:20.000000000 +0000 @@ -16,7 +16,7 @@ - + @@ -29,14 +29,14 @@ - + - + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomToData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomToData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomToData.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomToData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomToEmptyData.xml paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomToEmptyData.xml --- paraview-5.10.1/Clients/ParaView/Testing/XML/ZoomToEmptyData.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/ParaView/Testing/XML/ZoomToEmptyData.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff -Nru paraview-5.10.1/Clients/PythonCatalyst/FortranPythonAdaptorAPI.h paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/FortranPythonAdaptorAPI.h --- paraview-5.10.1/Clients/PythonCatalyst/FortranPythonAdaptorAPI.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/FortranPythonAdaptorAPI.h 2022-09-01 19:52:20.000000000 +0000 @@ -12,8 +12,8 @@ PURPOSE. See the above copyright notice for more information. =========================================================================*/ -#ifndef FortranAdaptorAPI_h -#define FortranAdaptorAPI_h +#ifndef FortranPythonAdaptorAPI_h +#define FortranPythonAdaptorAPI_h #include "FortranPythonAdaptorAPIMangling.h" #include "vtkPVPythonCatalystModule.h" diff -Nru paraview-5.10.1/Clients/PythonCatalyst/Testing/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/Testing/CMakeLists.txt --- paraview-5.10.1/Clients/PythonCatalyst/Testing/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/Testing/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -86,27 +86,22 @@ LiveOnly.py) endif() -if (NOT PARAVIEW_SERIAL_TESTS_USE_MPIEXEC) - # no need to add these non-MPI tests if serial tests are going to use MPI - # anyways. The have another `paraview_add_test_mpi` invocation right after this - # to handle it. - paraview_add_test( - PREFIX "Catalyst::WaveletMiniApp" - ARGS "$" --dr --sym -- -m paraview.demos.wavelet_miniapp -t 20 --size 21 -s - TEST_SCRIPTS ${simple_scripts}) +paraview_add_test( + PREFIX "Catalyst::WaveletMiniApp" + ARGS "$" --dr --sym -- -m paraview.demos.wavelet_miniapp -t 20 --size 21 -s + TEST_SCRIPTS ${simple_scripts}) - # Add test to test for adding the same pipeline script twice. - paraview_add_test( - PREFIX "Catalyst::WaveletMiniApp" - ARGS "$" --dr --sym -- -m paraview.demos.wavelet_miniapp -t 2 --size 21 +# Add test to test for adding the same pipeline script twice. +paraview_add_test( + PREFIX "Catalyst::WaveletMiniApp" + ARGS "$" --dr --sym -- -m paraview.demos.wavelet_miniapp -t 2 --size 21 --script-version 2 -s "${CMAKE_CURRENT_SOURCE_DIR}/repeated_pipeline.py" -s - TEST_SCRIPTS "repeated_pipeline.py" ) - set_tests_properties("Catalyst::WaveletMiniApp.repeated_pipeline" - PROPERTIES - PASS_REGULAR_EXPRESSION "Importing 'repeated_pipeline' for 2-th time!") -endif() + TEST_SCRIPTS "repeated_pipeline.py" ) +set_tests_properties("Catalyst::WaveletMiniApp.repeated_pipeline" + PROPERTIES + PASS_REGULAR_EXPRESSION "Importing 'repeated_pipeline' for 2-th time!") paraview_add_test_mpi( PREFIX "Catalyst::MPI::WaveletMiniApp" @@ -120,17 +115,17 @@ --script-version 2 -s "${CMAKE_CURRENT_SOURCE_DIR}/repeated_pipeline.py" -s - TEST_SCRIPTS "repeated_pipeline.py" ) -set_tests_properties("Catalyst::WaveletMiniApp.repeated_pipeline" - PROPERTIES - PASS_REGULAR_EXPRESSION "Importing 'repeated_pipeline' for 2-th time!") + TEST_SCRIPTS "repeated_pipeline.py" ) +if (PARAVIEW_USE_MPI) + set_tests_properties("Catalyst::MPI::WaveletMiniApp.repeated_pipeline" + PROPERTIES + PASS_REGULAR_EXPRESSION "Importing 'repeated_pipeline' for 2-th time!") +endif() foreach (tname IN LISTS scripts) - if (NOT PARAVIEW_SERIAL_TESTS_USE_MPIEXEC) - set_tests_properties("Catalyst::WaveletMiniApp.${tname}" - PROPERTIES - PASS_REGULAR_EXPRESSION "All ok") - endif() + set_tests_properties("Catalyst::WaveletMiniApp.${tname}" + PROPERTIES + PASS_REGULAR_EXPRESSION "All ok") if (PARAVIEW_USE_MPI) set_tests_properties("Catalyst::MPI::WaveletMiniApp.${tname}" PROPERTIES @@ -298,7 +293,7 @@ WaveletPhiThetaExtractsWithCinema.xml,CINEMA WaveletVolumeRenderWithCinema.xml,CINEMA) else () - message(AUTHOR_WARNING + message(STATUS "'pandas' is missing. Skipping Cinema tests") endif() diff -Nru paraview-5.10.1/Clients/PythonCatalyst/Testing/pipeline2.py paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/Testing/pipeline2.py --- paraview-5.10.1/Clients/PythonCatalyst/Testing/pipeline2.py 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/Testing/pipeline2.py 2022-09-01 19:52:20.000000000 +0000 @@ -154,10 +154,24 @@ from paraview import catalyst options = catalyst.Options() -# init the 'TimeStep' selected for 'GlobalTrigger' -options.GlobalTrigger.UseStartTimeStep = 1 -options.GlobalTrigger.StartTimeStep = 2 -options.GlobalTrigger.Frequency = 7 +# init the 'Python' selected for 'GlobalTrigger' +options.GlobalTrigger = 'Python' +options.GlobalTrigger.Script = """\ +def is_activated(controller): + from os.path import basename + from paraview import print_info + from paraview.catalyst import get_script_filename + timestep = controller.GetTimeStep() + time = controller.GetTime() + if timestep < 2: + # start from timestep 2 + return False + if (timestep - 2) % 7 != 0: + # frequency 7 + return False + print_info("'%s' activated for timestep %d." % (basename(get_script_filename()), timestep)) + return True +""" # ------------------------------------------------------------------------------ if __name__ == '__main__': diff -Nru paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonAdaptorAPI.h paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonAdaptorAPI.h --- paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonAdaptorAPI.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonAdaptorAPI.h 2022-09-01 19:52:20.000000000 +0000 @@ -34,7 +34,7 @@ protected: vtkCPPythonAdaptorAPI(); - ~vtkCPPythonAdaptorAPI(); + ~vtkCPPythonAdaptorAPI() override; private: vtkCPPythonAdaptorAPI(const vtkCPPythonAdaptorAPI&) = delete; diff -Nru paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptPipeline.h paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptPipeline.h --- paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptPipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptPipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -43,18 +43,18 @@ /// it fills in the FieldNames array that the coprocessor requires /// in order to fulfill all the coprocessing requests for this /// TimeStep/Time combination. - virtual int RequestDataDescription(vtkCPDataDescription* dataDescription) override; + int RequestDataDescription(vtkCPDataDescription* dataDescription) override; /// Execute the pipeline. Returns 1 for success and 0 for failure. - virtual int CoProcess(vtkCPDataDescription* dataDescription) override; + int CoProcess(vtkCPDataDescription* dataDescription) override; /// Finalize the pipeline before deleting it. A default no-op implementation /// is given. Returns 1 for success and 0 for failure. - virtual int Finalize() override; + int Finalize() override; protected: vtkCPPythonScriptPipeline(); - virtual ~vtkCPPythonScriptPipeline(); + ~vtkCPPythonScriptPipeline() override; /// Set/get macro functinos for setting PythonScriptName. vtkSetStringMacro(PythonScriptName); diff -Nru paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.cxx paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.cxx --- paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -270,6 +270,12 @@ } //---------------------------------------------------------------------------- +const std::string& vtkCPPythonScriptV2Helper::GetScriptFileName() const +{ + return this->Filename; +} + +//---------------------------------------------------------------------------- bool vtkCPPythonScriptV2Helper::IsImported() const { auto& internals = (*this->Internals); diff -Nru paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.h paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.h --- paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Helper.h 2022-09-01 19:52:20.000000000 +0000 @@ -46,6 +46,11 @@ bool PrepareFromScript(const std::string& fname); /** + * Returns the name of the script passed in to PrepareFromScript. + */ + const std::string& GetScriptFileName() const; + + /** * Returns if the package/module has been imported. */ bool IsImported() const; @@ -104,7 +109,7 @@ protected: vtkCPPythonScriptV2Helper(); - ~vtkCPPythonScriptV2Helper(); + ~vtkCPPythonScriptV2Helper() override; bool IsActivated(int timestep, double time); bool IsLiveActivated(); diff -Nru paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Pipeline.h paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Pipeline.h --- paraview-5.10.1/Clients/PythonCatalyst/vtkCPPythonScriptV2Pipeline.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/PythonCatalyst/vtkCPPythonScriptV2Pipeline.h 2022-09-01 19:52:20.000000000 +0000 @@ -64,7 +64,7 @@ protected: vtkCPPythonScriptV2Pipeline(); - ~vtkCPPythonScriptV2Pipeline(); + ~vtkCPPythonScriptV2Pipeline() override; private: vtkCPPythonScriptV2Pipeline(const vtkCPPythonScriptV2Pipeline&) = delete; diff -Nru paraview-5.10.1/Clients/Web/Testing/Cxx/TestDataEncoder.cxx paraview-5.11.0~rc1+dfsg/Clients/Web/Testing/Cxx/TestDataEncoder.cxx --- paraview-5.10.1/Clients/Web/Testing/Cxx/TestDataEncoder.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Web/Testing/Cxx/TestDataEncoder.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -44,7 +44,8 @@ vtkImageData* img = images[cc].GetPointer(); img->Register(nullptr); images[cc] = nullptr; - encoder->PushAndTakeReference(cc % 3, img, 100); + encoder->Push(cc % 3, img, 100); + img->UnRegister(nullptr); vtksys::SystemTools::Delay(10); // 0.2s } diff -Nru paraview-5.10.1/Clients/Web/vtkPVWebApplication.cxx paraview-5.11.0~rc1+dfsg/Clients/Web/vtkPVWebApplication.cxx --- paraview-5.10.1/Clients/Web/vtkPVWebApplication.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Web/vtkPVWebApplication.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -199,8 +199,7 @@ if (doThread || this->ImageEncoding) { - this->Internals->Encoder->PushAndTakeReference( - view->GetGlobalID(), image, quality, this->ImageEncoding); + this->Internals->Encoder->Push(view->GetGlobalID(), image, quality, this->ImageEncoding); assert(image == nullptr); if (value.Data == nullptr) diff -Nru paraview-5.10.1/Clients/Web/vtkPVWebApplication.h paraview-5.11.0~rc1+dfsg/Clients/Web/vtkPVWebApplication.h --- paraview-5.10.1/Clients/Web/vtkPVWebApplication.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Clients/Web/vtkPVWebApplication.h 2022-09-01 19:52:20.000000000 +0000 @@ -123,7 +123,7 @@ protected: vtkPVWebApplication(); - ~vtkPVWebApplication(); + ~vtkPVWebApplication() override; int ImageEncoding; int ImageCompression; diff -Nru paraview-5.10.1/CMake/FindGmsh.cmake paraview-5.11.0~rc1+dfsg/CMake/FindGmsh.cmake --- paraview-5.10.1/CMake/FindGmsh.cmake 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/FindGmsh.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,61 @@ +# - Find Gmsh library +# Find the Gmsh includes and library +# This module defines +# Gmsh_INCLUDE_DIRS: where to find GmshGlobal.h +# Gmsh_LIBRARIES: the Gmsh library +# Gmsh_FOUND: if false, do not try to use Gmsh +# Gmsh_VERSION: The found version of Gmsh +# Gmsh::Gmsh: Imported target for the Gmsh library + +find_path(Gmsh_INCLUDE_DIR + NAMES + gmsh.h + PATHS + /usr/local/include + /usr/include + DOC "Gmsh include directory") +mark_as_advanced(Gmsh_INCLUDE_DIR) + +find_library(Gmsh_LIBRARY + NAMES + gmsh libgmsh + DOC "Gmsh library path") +mark_as_advanced(Gmsh_LIBRARY) + +if (Gmsh_INCLUDE_DIR) + if (EXISTS "${Gmsh_INCLUDE_DIR}/gmsh.h") + file(STRINGS "${Gmsh_INCLUDE_DIR}/gmsh.h" _gmsh_version + REGEX "GMSH_") + string(REGEX REPLACE ".*GMSH_API_VERSION_MAJOR *\([0-9]*\).*" "\\1" _gmsh_major "${_gmsh_version}") + string(REGEX REPLACE ".*GMSH_API_VERSION_MINOR *\([0-9]*\).*" "\\1" _gmsh_minor "${_gmsh_version}") + string(REGEX REPLACE ".*GMSH_API_VERSION_PATCH *\([0-9]*\).*" "\\1" _gmsh_patch "${_gmsh_version}") + unset(_gmsh_version) + if (NOT _gmsh_major STREQUAL "" AND + NOT _gmsh_minor STREQUAL "" AND + NOT _gmsh_patch STREQUAL "") + set(Gmsh_VERSION "${_gmsh_major}.${_gmsh_minor}.${_gmsh_patch}") + endif () + unset(_gmsh_major) + unset(_gmsh_minor) + unset(_gmsh_patch) + else () + set(Gmsh_VERSION Gmsh_VERSION-NOTFOUND) + endif () +endif () + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Gmsh + REQUIRED_VARS Gmsh_LIBRARY Gmsh_INCLUDE_DIR + VERSION_VAR Gmsh_VERSION) + +if (Gmsh_FOUND) + set(Gmsh_LIBRARIES "${Gmsh_LIBRARY}") + set(Gmsh_INCLUDE_DIRS "${Gmsh_INCLUDE_DIR}") + if (NOT TARGET Gmsh::Gmsh) + add_library(Gmsh::Gmsh UNKNOWN IMPORTED) + set_target_properties(Gmsh::Gmsh + PROPERTIES + IMPORTED_LOCATION "${Gmsh_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${Gmsh_INCLUDE_DIR}") + endif () +endif () diff -Nru paraview-5.10.1/CMake/.gitattributes paraview-5.11.0~rc1+dfsg/CMake/.gitattributes --- paraview-5.10.1/CMake/.gitattributes 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/.gitattributes 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ParaViewDetermineVersion.cmake export-subst diff -Nru paraview-5.10.1/CMake/paraview_client_initializer.cxx.in paraview-5.11.0~rc1+dfsg/CMake/paraview_client_initializer.cxx.in --- paraview-5.10.1/CMake/paraview_client_initializer.cxx.in 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/paraview_client_initializer.cxx.in 2022-09-01 19:52:20.000000000 +0000 @@ -46,7 +46,6 @@ #include "pqPluginManager.h" #include "pqQtDeprecated.h" #include "pqSettings.h" -#include "vtkPVConfig.h" #include "vtkSmartPointer.h" #include "vtkRemotingCoreConfiguration.h" #include "vtkSMProxyManager.h" @@ -132,7 +131,7 @@ vtkVLogStartScopeF(PARAVIEW_LOG_PLUGIN_VERBOSITY(), "req-plugins", "load required plugins: `@_paraview_client_REQUIRED_PLUGINS@`"); QString plugin_string = "@_paraview_client_REQUIRED_PLUGINS@"; QStringList plugin_list = plugin_string.split(';',PV_QT_SKIP_EMPTY_PARTS); - foreach (const QString plugin_name, plugin_list) + Q_FOREACH (const QString plugin_name, plugin_list) { if (!loader->LoadPluginByName(plugin_name.toUtf8().data())) { @@ -146,7 +145,7 @@ vtkVLogStartScopeF(PARAVIEW_LOG_PLUGIN_VERBOSITY(), "opt-plugins", "load optional plugins: `@_paraview_client_OPTIONAL_PLUGINS@`"); plugin_string = "@_paraview_client_OPTIONAL_PLUGINS@"; plugin_list = plugin_string.split(';', PV_QT_SKIP_EMPTY_PARTS); - foreach (const QString plugin_name, plugin_list) + Q_FOREACH (const QString plugin_name, plugin_list) { if (!loader->LoadPluginByName(plugin_name.toUtf8().data())) { @@ -167,10 +166,13 @@ // given this too much thought. QDir dir2(":/@_paraview_client_NAME@/Configuration"); QStringList files = dir2.entryList(QDir::Files); - foreach (QString file, files) + Q_FOREACH (QString file, files) { this->PVApp->loadConfiguration(QString(":/@_paraview_client_NAME@/Configuration/") + file); } +#else + // NO XMLS provided, Reader and Writers still needs to be updated + this->PVApp->updateAvailableReadersAndWriters(); #endif #if _paraview_client_TITLE diff -Nru paraview-5.10.1/CMake/paraview_client_main.cxx.in paraview-5.11.0~rc1+dfsg/CMake/paraview_client_main.cxx.in --- paraview-5.10.1/CMake/paraview_client_main.cxx.in 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/paraview_client_main.cxx.in 2022-09-01 19:52:20.000000000 +0000 @@ -38,7 +38,7 @@ #include #include "pq@_paraview_client_NAME@Initializer.h" -#include "vtkPVConfig.h" +#include "pqQtWidgetsConfig.h" #if PARAVIEW_USE_QTWEBENGINE #include diff -Nru paraview-5.10.1/CMake/paraview-config.cmake.in paraview-5.11.0~rc1+dfsg/CMake/paraview-config.cmake.in --- paraview-5.10.1/CMake/paraview-config.cmake.in 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/paraview-config.cmake.in 2022-09-01 19:52:20.000000000 +0000 @@ -69,11 +69,6 @@ endif () unset(_paraview_use_external_vtk) -# Find Catalyst -find_package(catalyst REQUIRED QUIET - PATHS "${CMAKE_CURRENT_LIST_DIR}/catalyst" - NO_DEFAULT_PATH) - set(PARAVIEW_USE_QT "@PARAVIEW_USE_QT@") set(PARAVIEW_USE_MPI "@PARAVIEW_USE_MPI@") set(PARAVIEW_USE_PYTHON "@PARAVIEW_USE_PYTHON@") diff -Nru paraview-5.10.1/CMake/ParaViewDetermineVersion.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewDetermineVersion.cmake --- paraview-5.10.1/CMake/ParaViewDetermineVersion.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewDetermineVersion.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -30,7 +30,7 @@ # git_command : git executable # var_prefix : prefix for variables e.g. "PARAVIEW". function(determine_version source_dir git_command var_prefix) - if ("" STREQUAL "") + if ("$Format:$" STREQUAL "") # We are in an exported tarball and should use the shipped version # information. Just return here to avoid the warning message at the end of # this function. @@ -86,6 +86,9 @@ set(patch_extra ${CMAKE_MATCH_5}) set(branch "") if (patch_extra) + if (NOT source_dir) + set(source_dir "${ParaView_SOURCE_DIR}") + endif () execute_process( COMMAND ${git_command} name-rev diff -Nru paraview-5.10.1/CMake/ParaViewInstallCMakePackage.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewInstallCMakePackage.cmake --- paraview-5.10.1/CMake/ParaViewInstallCMakePackage.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewInstallCMakePackage.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -85,6 +85,12 @@ # Client Server vtkModuleWrapClientServer.cmake) +# From the `GmshIO` plugin. +if (TARGET GmshIO::vtkGmshIO) + list(APPEND paraview_cmake_module_files + FindGmsh.cmake) +endif () + set(paraview_cmake_files_to_install) foreach (paraview_cmake_module_file IN LISTS paraview_cmake_module_files) configure_file( diff -Nru paraview-5.10.1/CMake/ParaViewOptions.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewOptions.cmake --- paraview-5.10.1/CMake/ParaViewOptions.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewOptions.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -33,7 +33,8 @@ set(_vtk_module_reason_WANT_BY_DEFAULT "via `PARAVIEW_BUILD_ALL_MODULES`") -option(PARAVIEW_BUILD_EXAMPLES "Enable ParaView examples" OFF) +vtk_deprecated_setting(examples_default PARAVIEW_ENABLE_EXAMPLES PARAVIEW_BUILD_EXAMPLES "OFF") +option(PARAVIEW_ENABLE_EXAMPLES "Enable ParaView examples" "${examples_default}") set(PARAVIEW_BUILD_TESTING "OFF" CACHE STRING "Enable testing") set_property(CACHE PARAVIEW_BUILD_TESTING @@ -44,6 +45,9 @@ "PARAVIEW_BUILD_TESTING" OFF) option(PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION "Generate ParaView C++/Python docs" "${doc_default}") +option(PARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION "Forcefully disable XML documentation generation" OFF) +mark_as_advanced(PARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION) + set(PARAVIEW_BUILD_EDITION "CANONICAL" CACHE STRING "Enable ParaView components essential for requested capabilities.") set_property(CACHE PARAVIEW_BUILD_EDITION @@ -203,6 +207,8 @@ option(PARAVIEW_ENABLE_VISITBRIDGE "Enable VisIt readers." OFF) +option(PARAVIEW_ENABLE_CATALYST "Enable ParaViewCatalyst implementation" OFF) + # default to ON for CANONICAL builds, else OFF. set(xdmf2_default OFF) if (PARAVIEW_BUILD_CANONICAL AND PARAVIEW_ENABLE_NONESSENTIAL) @@ -216,8 +222,7 @@ option(PARAVIEW_ENABLE_FIDES "Enable Fides support." OFF) -cmake_dependent_option(PARAVIEW_ENABLE_FFMPEG "Enable FFMPEG Support." OFF - "UNIX" OFF) +option(PARAVIEW_ENABLE_FFMPEG "Enable FFMPEG Support." OFF) # If building on Unix with MPI enabled, we will present another option to # enable building of CosmoTools VTK extensions. This option is by default @@ -226,6 +231,16 @@ "Build ParaView with CosmoTools VTK Extensions" OFF "UNIX;PARAVIEW_USE_MPI" OFF) +# PARAVIEW_ENABLE_CGNS_* option is only shown when PARAVIEW_ENABLE_NONESSENTIAL is +# OFF and then it defaults to OFF. If PARAVIEW_ENABLE_NONESSENTIAL is ON, then +# PARAVIEW_ENABLE_CGNS_* is set to ON as well and presented to the user at all. +cmake_dependent_option(PARAVIEW_ENABLE_CGNS_READER + "Enable CGNS Reader Support" OFF + "NOT PARAVIEW_ENABLE_NONESSENTIAL" ON) +cmake_dependent_option(PARAVIEW_ENABLE_CGNS_WRITER + "Enable CGNS Reader Support" OFF + "NOT PARAVIEW_ENABLE_NONESSENTIAL" ON) + #======================================================================== # MISCELLANEOUS OPTIONS: # Options that are hard to classify. Keep this list minimal. @@ -252,7 +267,6 @@ vtk_obsolete_setting(PARAVIEW_FREEZE_PYTHON) vtk_obsolete_setting(PARAVIEW_USE_MPI_SSEND) vtk_obsolete_setting(PARAVIEW_USE_ICE_T) -vtk_obsolete_setting(PARAVIEW_ENABLE_CATALYST) #======================================================================================== # Build up list of required and rejected modules @@ -430,6 +444,21 @@ EXCLUSIVE) paraview_require_module( + CONDITION PARAVIEW_ENABLE_CGNS_READER + MODULES VTK::IOCGNSReader + EXCLUSIVE) + +paraview_require_module( + CONDITION PARAVIEW_ENABLE_CGNS_WRITER + MODULES ParaView::VTKExtensionsIOCGNSWriter + EXCLUSIVE) + +paraview_require_module( + CONDITION PARAVIEW_ENABLE_CGNS_WRITER AND PARAVIEW_USE_MPI + MODULES ParaView::VTKExtensionsIOParallelCGNSWriter + EXCLUSIVE) + +paraview_require_module( CONDITION PARAVIEW_ENABLE_WEB AND PARAVIEW_USE_PYTHON MODULES VTK::WebCore VTK::WebPython @@ -477,7 +506,6 @@ paraview_require_module( CONDITION PARAVIEW_BUILD_CANONICAL AND PARAVIEW_ENABLE_NONESSENTIAL MODULES VTK::IOAMR - VTK::IOCGNSReader VTK::IOCityGML VTK::IOCONVERGECFD VTK::IOIOSS @@ -513,7 +541,7 @@ paraview_require_module( CONDITION PARAVIEW_USE_MPI AND PARAVIEW_BUILD_CANONICAL AND PARAVIEW_ENABLE_NONESSENTIAL - MODULES VTK::IOParallelNetCDF) + MODULES VTK::IOParallelNetCDF) paraview_require_module( CONDITION PARAVIEW_BUILD_CANONICAL AND PARAVIEW_ENABLE_RENDERING AND PARAVIEW_ENABLE_NONESSENTIAL @@ -527,17 +555,29 @@ CONDITION PARAVIEW_USE_PYTHON MODULES ParaView::CinemaPython) +paraview_require_module( + CONDITION PARAVIEW_ENABLE_CATALYST + MODULES VTK::IOCatalystConduit + EXCLUSIVE) + if (NOT PARAVIEW_ENABLE_NONESSENTIAL) # This ensures that we don't ever enable certain problematic # modules when PARAVIEW_ENABLE_NONESSENTIAL is OFF. set(nonessential_modules - VTK::cgns - VTK::hdf5 VTK::netcdf VTK::ogg VTK::theora VTK::xdmf2 VTK::xdmf3) + + # PARAVIEW_ENABLE_CGNS_* are the only options that can force the need for cgns and + # hdf5 TPLs when PARAVIEW_ENABLE_NONESSENTIAL is true. + if (NOT PARAVIEW_ENABLE_CGNS_READER AND NOT PARAVIEW_ENABLE_CGNS_WRITER) + list(APPEND nonessential_modules + VTK::cgns + VTK::hdf5) + endif() + list(APPEND paraview_rejected_modules ${nonessential_modules}) foreach (nonessential_module IN LISTS nonessential_modules) diff -Nru paraview-5.10.1/CMake/ParaViewPlugin.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewPlugin.cmake --- paraview-5.10.1/CMake/ParaViewPlugin.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewPlugin.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -295,7 +295,8 @@ [LIBRARY_SUBDIRECTORY ] [ADD_INSTALL_RPATHS ] - [PLUGINS_FILE_NAME ]) + [PLUGINS_FILE_NAME ] + [DISABLE_XML_DOCUMENTATION ]) ``` * `PLUGINS`: (Required) The list of plugins to build. May be empty. @@ -331,11 +332,13 @@ built plugins. This file will be placed under `/`. It will be installed with the `plugin` component. + * `DISABLE_XML_DOCUMENTATION`: (Defaults to `OFF`) Whether to forcefully + disable XML documentation or not. #]==] function (paraview_plugin_build) cmake_parse_arguments(_paraview_build "" - "HEADERS_DESTINATION;RUNTIME_DESTINATION;LIBRARY_DESTINATION;LIBRARY_SUBDIRECTORY;TARGET;PLUGINS_FILE_NAME;INSTALL_EXPORT;CMAKE_DESTINATION;PLUGINS_COMPONENT;TARGET_COMPONENT;ADD_INSTALL_RPATHS;INSTALL_HEADERS" + "HEADERS_DESTINATION;RUNTIME_DESTINATION;LIBRARY_DESTINATION;LIBRARY_SUBDIRECTORY;TARGET;PLUGINS_FILE_NAME;INSTALL_EXPORT;CMAKE_DESTINATION;PLUGINS_COMPONENT;TARGET_COMPONENT;ADD_INSTALL_RPATHS;INSTALL_HEADERS;DISABLE_XML_DOCUMENTATION" "PLUGINS;AUTOLOAD" ${ARGN}) @@ -364,6 +367,10 @@ set(_paraview_build_LIBRARY_SUBDIRECTORY "") endif () + if (NOT _paraview_build_DISABLE_XML_DOCUMENTATION) + set(_paraview_build_DISABLE_XML_DOCUMENTATION OFF) + endif () + if (NOT DEFINED _paraview_build_INSTALL_HEADERS) set(_paraview_build_INSTALL_HEADERS ON) endif () @@ -904,6 +911,10 @@ [PYTHON_MODULES ...] + [INITIALIZERS ...] + + [EXTRA_INCLUDES ...] + [REQUIRED_PLUGINS ...] [EULA ] @@ -935,6 +946,12 @@ * `UI_RESOURCES`: Qt resource files to include with the plugin. * `UI_FILES`: Qt `.ui` files to include with the plugin. * `PYTHON_MODULES`: Python modules to embed into the plugin. + * `INITIALIZERS`: An ordered list of free functions (declared in `EXTRA_INCLUDES` + if needed) to be invoked when the plugin is loaded. Each function must be + callable with no arguments. + * `EXTRA_INCLUDES`: Headers needed by the generated plugin code (such as `INITIALIZERS`). + Filename paths passed without quotes will be double-quoted (e.g., `#include "foo.h"`), + while paths that start with angle- or double-quotes will not be. * `REQUIRED_PLUGINS`: Plugins which must be loaded for this plugin to function. These plugins do not need to be available at build time and are therefore their existence is not checked here. @@ -965,7 +982,7 @@ cmake_parse_arguments(_paraview_add_plugin "REQUIRED_ON_SERVER;REQUIRED_ON_CLIENT" "VERSION;EULA;EXPORT;MODULE_INSTALL_EXPORT;XML_DOCUMENTATION;DOCUMENTATION_DIR;FORCE_STATIC;DOCUMENTATION_TOC" - "REQUIRED_PLUGINS;SERVER_MANAGER_XML;SOURCES;MODULES;UI_INTERFACES;UI_RESOURCES;UI_FILES;PYTHON_MODULES;MODULE_FILES;MODULE_ARGS;DOCUMENTATION_ADD_PATTERNS;DOCUMENTATION_DEPENDENCIES" + "REQUIRED_PLUGINS;SERVER_MANAGER_XML;SOURCES;MODULES;UI_INTERFACES;UI_RESOURCES;UI_FILES;PYTHON_MODULES;MODULE_FILES;MODULE_ARGS;DOCUMENTATION_ADD_PATTERNS;DOCUMENTATION_DEPENDENCIES;INITIALIZERS;EXTRA_INCLUDES" ${ARGN}) if (_paraview_add_plugin_UNPARSED_ARGUMENTS) @@ -982,17 +999,19 @@ if (NOT DEFINED _paraview_add_plugin_XML_DOCUMENTATION) set(_paraview_add_plugin_XML_DOCUMENTATION ON) endif () - - if (NOT DEFINED _paraview_add_plugin_FORCE_STATIC) - set(_paraview_add_plugin_FORCE_STATIC OFF) - endif () - if (DEFINED _paraview_add_plugin_DOCUMENTATION_DIR AND NOT _paraview_add_plugin_XML_DOCUMENTATION) message(FATAL_ERROR "Specifying `DOCUMENTATION_DIR` and turning off `XML_DOCUMENTATION` " "makes no sense.") endif () + if (_paraview_build_DISABLE_XML_DOCUMENTATION) + set(_paraview_add_plugin_XML_DOCUMENTATION OFF) + endif () + + if (NOT DEFINED _paraview_add_plugin_FORCE_STATIC) + set(_paraview_add_plugin_FORCE_STATIC OFF) + endif () if (DEFINED _paraview_add_plugin_EXPORT) message(FATAL_ERROR @@ -1128,6 +1147,16 @@ set(_paraview_add_plugin_includes) set(_paraview_add_plugin_required_libraries) + if (_paraview_add_plugin_EXTRA_INCLUDES) + foreach (_include IN LISTS _paraview_add_plugin_EXTRA_INCLUDES) + if ((${_include} MATCHES "^\".*\"$") OR (${_include} MATCHES "^<.*>$")) + string(APPEND _paraview_add_plugin_includes "#include ${_include}\n") + else () + string(APPEND _paraview_add_plugin_includes "#include \"${_include}\"\n") + endif () + endforeach () + endif () + set(_paraview_add_plugin_module_xmls) set(_paraview_add_plugin_with_xml 0) if (_paraview_add_plugin_MODULES) @@ -1268,6 +1297,17 @@ ParaView::pqComponents) endif () + set(_paraview_add_plugin_with_initializers 0) + if (_paraview_add_plugin_INITIALIZERS) + set(_paraview_add_plugin_with_initializers 1) + set(_paraview_add_plugin_invoke_initializers) + + foreach (_paraview_add_plugin_initializer IN LISTS _paraview_add_plugin_INITIALIZERS) + string(APPEND _paraview_add_plugin_invoke_initializers + " ${_paraview_add_plugin_initializer}();\n") + endforeach () + endif () + set(_paraview_add_plugin_with_resources 0) set(_paraview_add_plugin_resources_init) if (_paraview_add_plugin_UI_RESOURCES) diff -Nru paraview-5.10.1/CMake/paraview_plugin.cxx.in paraview-5.11.0~rc1+dfsg/CMake/paraview_plugin.cxx.in --- paraview-5.10.1/CMake/paraview_plugin.cxx.in 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/paraview_plugin.cxx.in 2022-09-01 19:52:20.000000000 +0000 @@ -101,6 +101,14 @@ #endif //----------------------------------------------------------------------------- +#if _paraview_add_plugin_with_initializers +void @_paraview_build_plugin@Plugin::Initialize() +{ + @_paraview_add_plugin_invoke_initializers@ +} +#endif + +//----------------------------------------------------------------------------- #if _paraview_add_plugin_with_python @_paraview_add_plugin_python_includes@ void @_paraview_build_plugin@Plugin::GetPythonSourceList(std::vector& modules, @@ -124,7 +132,7 @@ package_flags.push_back(packageFlags[cc]); // free allocated memory. - delete moduleSources[cc]; + delete[] moduleSources[cc]; moduleSources[cc] = nullptr; } } diff -Nru paraview-5.10.1/CMake/paraview_plugin.h.in paraview-5.11.0~rc1+dfsg/CMake/paraview_plugin.h.in --- paraview-5.10.1/CMake/paraview_plugin.h.in 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/paraview_plugin.h.in 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ #cmakedefine01 _paraview_add_plugin_built_shared +#cmakedefine01 _paraview_add_plugin_with_initializers #cmakedefine01 _paraview_add_plugin_with_python #cmakedefine01 _paraview_add_plugin_with_ui #cmakedefine01 _paraview_add_plugin_with_xml @@ -21,6 +22,10 @@ #include "vtkPVPythonPluginInterface.h" #endif +#if _paraview_add_plugin_with_initializers +#include "vtkPVDynamicInitializerPluginInterface.h" +#endif + class @_paraview_build_plugin@Plugin : #if _paraview_add_plugin_with_ui public QObject, @@ -29,6 +34,9 @@ public vtkPVPlugin +#if _paraview_add_plugin_with_initializers + , public vtkPVDynamicInitializerPluginInterface +#endif #if _paraview_add_plugin_with_xml , public vtkPVServerManagerPluginInterface #endif @@ -120,4 +128,8 @@ std::vector& sources, std::vector& package_flags) override; #endif + +#if _paraview_add_plugin_with_initializers + void Initialize() override; +#endif }; diff -Nru paraview-5.10.1/CMake/ParaViewServerManager.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewServerManager.cmake --- paraview-5.10.1/CMake/ParaViewServerManager.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewServerManager.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -280,7 +280,7 @@ #include #include -void ${_paraview_sm_process_files_TARGET}_initialize(std::vector& xmls) +inline void ${_paraview_sm_process_files_TARGET}_initialize(std::vector& xmls) {\n (void)xmls;\n") foreach (_paraview_sm_process_files_file IN LISTS _paraview_sm_process_files_FILES) get_filename_component(_paraview_sm_process_files_name "${_paraview_sm_process_files_file}" NAME_WE) diff -Nru paraview-5.10.1/CMake/ParaViewTesting.cmake paraview-5.11.0~rc1+dfsg/CMake/ParaViewTesting.cmake --- paraview-5.10.1/CMake/ParaViewTesting.cmake 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMake/ParaViewTesting.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -31,7 +31,7 @@ function (_paraview_add_tests function) cmake_parse_arguments(_paraview_add_tests - "FORCE_SERIAL;FORCE_LOCK" + "FORCE_SERIAL;FORCE_LOCK;SMTESTING_ALLOW_ERRORS" "LOAD_PLUGIN;PLUGIN_PATH;CLIENT;TEST_DIRECTORY;TEST_DATA_TARGET;PREFIX;SUFFIX;_ENABLE_SUFFIX;_DISABLE_SUFFIX;BASELINE_DIR;DATA_DIRECTORY;NUMPROCS" "_COMMAND_PATTERN;LOAD_PLUGINS;PLUGIN_PATHS;TEST_SCRIPTS;TEST_NAME;ENVIRONMENT;ARGS;CLIENT_ARGS" ${ARGN}) @@ -63,8 +63,14 @@ endif () if (NOT DEFINED _paraview_add_tests_TEST_DIRECTORY) - set(_paraview_add_tests_TEST_DIRECTORY - "${CMAKE_BINARY_DIR}/Testing/Temporary") + if (NOT DEFINED PARAVIEW_TEST_DIR) + set(_paraview_add_tests_TEST_DIRECTORY + "${CMAKE_BINARY_DIR}/Testing/Temporary") + else() + set(_paraview_add_tests_TEST_DIRECTORY + "${PARAVIEW_TEST_DIR}") + set(_vtk_build_TEST_OUTPUT_DIRECTORY "${PARAVIEW_TEST_DIR}") + endif() endif () if (NOT DEFINED _paraview_add_tests_DATA_DIRECTORY AND DEFINED _paraview_add_tests_default_data_directory) @@ -147,6 +153,12 @@ endif () endif () + # Build arguments to pass to smTestDriver + set(_paraview_add_tests_smtesting_args "") + if (_paraview_add_tests_SMTESTING_ALLOW_ERRORS) + list(APPEND _paraview_add_tests_smtesting_args "--allow-errors") + endif () + # Build arguments to pass to the clients. set(_paraview_add_tests_client_args "--test-directory=${_paraview_add_tests_TEST_DIRECTORY}" @@ -205,6 +217,9 @@ string(REPLACE "__paraview_test_name__" "${_paraview_add_tests_name_base}" _paraview_add_tests_script_args "${_paraview_add_tests_script_args}") + string(REPLACE "__paraview_smtesting_args__" "${_paraview_add_tests_smtesting_args}" + _paraview_add_tests_script_args + "${_paraview_add_tests_script_args}") set(testArgs NAME "${_paraview_add_tests_PREFIX}.${_paraview_add_tests_name}" @@ -275,6 +290,7 @@ PREFIX "${chosen_prefix}" _DISABLE_SUFFIX "_DISABLE_C" _COMMAND_PATTERN + __paraview_smtesting_args__ --client __paraview_client__ --enable-bt __paraview_args__ @@ -291,6 +307,7 @@ PREFIX "${chosen_prefix}" _DISABLE_SUFFIX "_DISABLE_CS" _COMMAND_PATTERN + __paraview_smtesting_args__ --server "$" --enable-bt __paraview_args__ @@ -310,6 +327,7 @@ PREFIX "${chosen_prefix}" _DISABLE_SUFFIX "_DISABLE_CRS" _COMMAND_PATTERN + __paraview_smtesting_args__ --data-server "$" --enable-bt __paraview_args__ @@ -332,6 +350,7 @@ PREFIX "${chosen_prefix}" SUFFIX "-${count}" _COMMAND_PATTERN + __paraview_smtesting_args__ --test-multi-servers "${count}" --server "$" --enable-bt @@ -362,6 +381,7 @@ SMTESTDRIVER_MPI_NUMPROCS=${_paraview_add_tile_display_cpu_count} NUMPROCS "${_paraview_add_tile_display_cpu_count}" _COMMAND_PATTERN + __paraview_smtesting_args__ --server "$" --enable-bt --tdx=${width} @@ -395,6 +415,7 @@ SMTESTDRIVER_MPI_NUMPROCS=${num_ranks} NUMPROCS "${num_ranks}" _COMMAND_PATTERN + __paraview_smtesting_args__ --server "$" --enable-bt # using offscreen to avoid clobbering display (although should not be @@ -422,6 +443,7 @@ _paraview_add_tests("paraview_add_test" PREFIX "${chosen_prefix}" _COMMAND_PATTERN + __paraview_smtesting_args__ --client __paraview_args__ __paraview_scriptpath__ @@ -437,6 +459,7 @@ PREFIX "${chosen_prefix}" NUMPROCS 2 # See Utilities/TestDriver/CMakeLists.txt (PARAVIEW_MPI_MAX_NUMPROCS) _COMMAND_PATTERN + __paraview_smtesting_args__ --client-mpi __paraview_args__ __paraview_scriptpath__ diff -Nru paraview-5.10.1/CMakeLists.txt paraview-5.11.0~rc1+dfsg/CMakeLists.txt --- paraview-5.10.1/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -35,7 +35,8 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) message(FATAL_ERROR "ParaView requires an out-of-source build. Please create a separate " - "binary directory and run CMake there.") + "binary directory and run CMake command there giving " + "in parameter the ParaView source directory.") endif () #------------------------------------------------------------------------------ @@ -102,6 +103,27 @@ include(ParaViewOptions) include(ParaViewMigrations) +# Some flags are really bad for caching. Replace them with better variants. +if (paraview_replace_uncacheable_flags) + get_property(is_multiconfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if (is_multiconfig) + string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" build_types) + else () + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_types) + endif () + foreach (lang IN ITEMS C CXX Fortran) + foreach (prefix IN ITEMS - /) + foreach (flag IN ITEMS Zi ZI) + string(REPLACE "${prefix}${flag}" "-Z7" "CMAKE_${lang}_FLAGS" "${CMAKE_${lang}_FLAGS}") + + foreach (build_type IN LISTS build_types) + string(REPLACE "${prefix}${flag}" "-Z7" "CMAKE_${lang}_FLAGS_${build_type}" "${CMAKE_${lang}_FLAGS_${build_type}}") + endforeach () + endforeach () + endforeach () + endforeach () +endif () + #------------------------------------------------------------------------------ # Choose static or shared libraries. set(BUILD_SHARED_LIBS "${PARAVIEW_BUILD_SHARED_LIBS}") @@ -258,7 +280,6 @@ AnalyzeNIfTIReaderWriter ArrowGlyph BagPlotViewsAndFilters - CDIReader Datamine DigitalRockPhysics EULATestPlugin @@ -271,14 +292,15 @@ GMVReader HyperTreeGridADR LagrangianParticleTracker + LANLX3DReader LegacyExodusReader Moments MooseXfemClip - NetCDFTimeAnnotationPlugin NodeEditor NonOrthogonalSource PacMan PanoramicProjectionView + ParametricSurfaces # ParFlow - Because of dependency to nlohmann_json SaveStateAndScreenshot SLACTools @@ -514,6 +536,12 @@ "${vtk_required_modules};${vtk_unrecognized_modules}.") endif () + # Handle the requirement of `sqlitebin` for `proj`. + set(vtk_sqlite_build_binary 0) + if ("VTK::libproj" IN_LIST vtk_modules) + set(vtk_sqlite_build_binary 1) + endif () + if (PARAVIEW_USE_PYTHON) find_package("Python3" 3.3 QUIET REQUIRED COMPONENTS Interpreter) set(PYTHON_VERSION_MAJOR "${Python3_VERSION_MAJOR}") @@ -526,6 +554,7 @@ set(VTK_BUILD_QT_DESIGNER_PLUGIN OFF) set(VTK_INSTALL_PYTHON_EXES OFF) + set(VTK_QT_VERSION 5) cmake_dependent_option(VTK_NO_PYTHON_THREADS "Disable Python Threads support" ON "PARAVIEW_USE_PYTHON" OFF) @@ -542,6 +571,15 @@ mark_as_advanced(PARAVIEW_WINDOWS_PYTHON_DEBUGGABLE) set(VTK_WINDOWS_PYTHON_DEBUGGABLE ${PARAVIEW_WINDOWS_PYTHON_DEBUGGABLE}) + cmake_dependent_option(PARAVIEW_SKIP_CLANG_TIDY_FOR_VTK "Skip `clang-tidy` rules for VTK source" ON + "CMAKE_C_CLANG_TIDY OR CMAKE_CXX_CLANG_TIDY" OFF) + if (PARAVIEW_SKIP_CLANG_TIDY_FOR_VTK) + set(CMAKE_C_CLANG_TIDY_save "${CMAKE_C_CLANG_TIDY}") + set(CMAKE_CXX_CLANG_TIDY_save "${CMAKE_CXX_CLANG_TIDY}") + set(CMAKE_C_CLANG_TIDY "") + set(CMAKE_CXX_CLANG_TIDY "") + endif () + vtk_module_build( MODULES ${vtk_modules} KITS ${vtk_kits} @@ -560,7 +598,13 @@ USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}" ENABLE_WRAPPING ON TEST_INPUT_DATA_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing" - TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing") + TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing" + TEST_OUTPUT_DIRECTORY "${PARAVIEW_TEST_DIR}") + + if (PARAVIEW_SKIP_CLANG_TIDY_FOR_VTK) + set(CMAKE_C_CLANG_TIDY "${CMAKE_C_CLANG_TIDY_save}") + set(CMAKE_CXX_CLANG_TIDY "${CMAKE_CXX_CLANG_TIDY_save}") + endif () install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Copyright.txt" @@ -604,37 +648,8 @@ BUILD_WITH_KITS "${PARAVIEW_BUILD_WITH_KITS}" USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}" TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" - TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") - -# Catalyst sanity check. See `ThirdParty/catalyst/CMakeLists.txt` for details. -if (TARGET ParaView::vtkcatalyst) - get_property(catalyst_dir_primary GLOBAL PROPERTY paraview_catalyst_dir_primary) - set(catalyst_using_modules) - foreach (catalyst_using_module IN LISTS catalyst_using_modules) - get_property(catalyst_dir_module GLOBAL PROPERTY "paraview_catalyst_dir_${catalyst_using_module}") - if (NOT catalyst_using_module) - continue () - endif () - - if (NOT catalyst_dir_primary) - message(FATAL_ERROR - "ParaView's `catalyst` module is using its internal catalyst but the " - "`${catalyst_using_module}` is using a copy from " - "`${catalyst_dir_module}`. Due to the way `libcatalyst` works, all " - "modules which use it must agree on a single installation of it. " - "Either ParaView must use an external catalyst (using " - "`VTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst`) or external packages " - "must be configured without `libcatalyst` support.") - elseif (NOT catalyst_dir_primary STREQUAL catalyst_dir_module) - message(FATAL_ERROR - "ParaView's `catalyst` module is using an external catalyst from " - "`${catalyst_dir_primary}` but the `${catalyst_using_module}` found " - "its copy at `${catalyst_dir_module}`. Due to the way `libcatalyst` " - "works, all modules which use it must agree on a single installation " - "of it.") - endif () - endforeach () -endif () + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}" + TEST_OUTPUT_DIRECTORY "${PARAVIEW_TEST_DIR}") vtk_module_build( MODULES ${paraview_client_modules} @@ -653,7 +668,29 @@ BUILD_WITH_KITS "${PARAVIEW_BUILD_WITH_KITS}" USE_EXTERNAL "${PARAVIEW_BUILD_WITH_EXTERNAL}" TEST_INPUT_DATA_DIRECTORY "${paraview_test_data_directory_input}" - TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}" + TEST_OUTPUT_DIRECTORY "${PARAVIEW_TEST_DIR}") + +# Catalyst sanity check. Ensure every module is using the same Catalyst dependency. +if (PARAVIEW_ENABLE_CATALYST) + get_property(catalyst_dir_primary GLOBAL PROPERTY vtk_catalyst_dir_primary) + set(catalyst_using_modules ClientsInSitu) + foreach (catalyst_using_module IN LISTS catalyst_using_modules) + get_property(catalyst_dir_module GLOBAL PROPERTY "vtk_catalyst_dir_${catalyst_using_module}") + if (NOT catalyst_using_module) + continue () + endif () + + if (NOT catalyst_dir_primary STREQUAL catalyst_dir_module) + message(FATAL_ERROR + "ParaView's `catalyst` module is using an external catalyst from " + "`${catalyst_dir_primary}` but the `${catalyst_using_module}` found " + "its copy at `${catalyst_dir_module}`. Due to the way `libcatalyst` " + "works, all modules which use it must agree on a single installation " + "of it.") + endif () + endforeach () +endif () include(vtkModuleJson) vtk_module_json( @@ -695,7 +732,8 @@ TARGET_COMPONENT "development" PLUGINS_COMPONENT "plugins" PLUGINS ${paraview_plugins} - AUTOLOAD ${autoload_plugins}) + AUTOLOAD ${autoload_plugins} + DISABLE_XML_DOCUMENTATION "${PARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION}") set(CMAKE_INSTALL_RPATH "${_paraview_CMAKE_INSTALL_RPATH_save}") @@ -897,6 +935,6 @@ COMPONENT "license") #----------------------------------------------------------------------------- -if (PARAVIEW_BUILD_EXAMPLES) +if (PARAVIEW_ENABLE_EXAMPLES) add_subdirectory(Examples) endif () diff -Nru paraview-5.10.1/debian/changelog paraview-5.11.0~rc1+dfsg/debian/changelog --- paraview-5.10.1/debian/changelog 2022-07-19 13:04:37.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/changelog 2022-08-31 09:47:18.000000000 +0000 @@ -1,8 +1,18 @@ -paraview (5.10.1-2build1) kinetic; urgency=medium +paraview (5.11.0~rc1+dfsg-1) unstable; urgency=medium - * No-change rebuild against libavcodec59 + * New upstream release. Closes: #1010027, #1014787 + Closes: #998119, #1017349, #641839 + * Build -O0 to avoid segfaults in c++ + * Not shipping some catalyst files + * Standards-Version: 4.6.1 + * Point vcs-git: to debian/latest branch + * Include patch from Vagrant Cascadian for reproducibility. + Closes: #983584 + * F3D packaged by François Mazen. Closes: #962728 + * Closing bug fixed in upstream, Closes: #985009 + * Lintian: drop dep on python3-minimal in favour of python3 - -- Steve Langasek Tue, 19 Jul 2022 13:04:37 +0000 + -- Alastair McKinstry Wed, 31 Aug 2022 10:47:18 +0100 paraview (5.10.1-2) unstable; urgency=medium diff -Nru paraview-5.10.1/debian/control paraview-5.11.0~rc1+dfsg/debian/control --- paraview-5.10.1/debian/control 2022-07-19 13:04:37.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/control 2022-08-31 09:47:18.000000000 +0000 @@ -1,6 +1,5 @@ Source: paraview -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Team +Maintainer: Debian Science Team Uploaders: Alastair McKinstry Section: science Priority: optional @@ -38,7 +37,6 @@ libxext-dev, doxygen, graphviz, - gnuplot, libtiff-dev, libpng-dev, libjpeg-dev, @@ -66,9 +64,9 @@ python3-mpi4py, python3-six, python3-twisted -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/science-team/paraview -Vcs-Git: https://salsa.debian.org/science-team/paraview.git +Vcs-Git: https://salsa.debian.org/science-team/paraview.git -b debian/latest Homepage: https://www.paraview.org/ Package: paraview @@ -109,7 +107,7 @@ Depends: qttools5-dev-tools, ${shlibs:Depends}, ${misc:Depends}, - python3:any | python3-minimal:any, + python3:any, paraview (= ${binary:Version}), libeigen3-dev Description: Parallel Visualization Application. Development header files diff -Nru paraview-5.10.1/debian/paraview-dev.install paraview-5.11.0~rc1+dfsg/debian/paraview-dev.install --- paraview-5.10.1/debian/paraview-dev.install 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/paraview-dev.install 2022-08-31 09:47:18.000000000 +0000 @@ -5,7 +5,7 @@ usr/lib/*/cmake/paraview*/*.in usr/lib/*/cmake/paraview*/*.xsl usr/lib/*/cmake/paraview*/*.cmake -usr/lib/*/cmake/paraview*/catalyst/* +# usr/lib/*/cmake/paraview*/catalyst/* usr/lib/*/cmake/paraview*/vtk/vtkm/* usr/lib/*/cmake/paraview*/vtk/patches/*/* usr/lib/*/cmake/paraview*/vtk/* diff -Nru paraview-5.10.1/debian/paraview.install paraview-5.11.0~rc1+dfsg/debian/paraview.install --- paraview-5.10.1/debian/paraview.install 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/paraview.install 2022-08-31 09:47:18.000000000 +0000 @@ -7,20 +7,20 @@ usr/bin/pvserver usr/lib/*/*.so.* usr/lib/*/*.so -usr/lib/*/catalyst/*.so +# usr/lib/*/catalyst/*.so usr/lib/*/paraview*/plugins usr/share/icons/hicolor/* usr/share/applications/org.paraview.ParaView.desktop usr/share/metainfo/org.paraview.ParaView.appdata.xml -usr/share/vtk-pv5.10/proj/* -usr/bin/smTestDriver-pv5.10 -usr/bin/vtkParseJava-pv5.10 -usr/bin/vtkProbeOpenGLVersion-pv5.10 -usr/bin/vtkProcessXML-pv5.10 -usr/bin/vtkWrapHierarchy-pv5.10 -usr/bin/vtkWrapJava-pv5.10 -usr/bin/vtkWrapPython-pv5.10 -usr/bin/vtkWrapPythonInit-pv5.10 -usr/bin/vtkprotoc-pv5.10 -usr/share/paraview-5.10/xmls/ParaViewFilters.xml -usr/share/paraview-5.10/xmls/ParaViewSources.xml +usr/share/vtk-pv5.11/proj/* +usr/bin/smTestDriver-pv5.11 +usr/bin/vtkParseJava-pv5.11 +usr/bin/vtkProbeOpenGLVersion-pv5.11 +usr/bin/vtkProcessXML-pv5.11 +usr/bin/vtkWrapHierarchy-pv5.11 +usr/bin/vtkWrapJava-pv5.11 +usr/bin/vtkWrapPython-pv5.11 +usr/bin/vtkWrapPythonInit-pv5.11 +usr/bin/vtkprotoc-pv5.11 +usr/share/paraview-5.11/xmls/ParaViewFilters.xml +usr/share/paraview-5.11/xmls/ParaViewSources.xml diff -Nru paraview-5.10.1/debian/paraview.lintian-overrides paraview-5.11.0~rc1+dfsg/debian/paraview.lintian-overrides --- paraview-5.10.1/debian/paraview.lintian-overrides 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/paraview.lintian-overrides 2022-08-31 09:47:18.000000000 +0000 @@ -1,8 +1,6 @@ # These embedded libraries, seems, have different versions than in repository. # The code is incompatible with repo-versions. paraview: embedded-library usr/lib/paraview/libvtkftgl.so.1: ftgl -paraview: postinst-has-useless-call-to-ldconfig -paraview: postrm-has-useless-call-to-ldconfig paraview: binary-or-shlib-defines-rpath # Seems this issue due to --as-needed flag diff -Nru paraview-5.10.1/debian/patches/110_vtk9_netcdf.patch paraview-5.11.0~rc1+dfsg/debian/patches/110_vtk9_netcdf.patch --- paraview-5.10.1/debian/patches/110_vtk9_netcdf.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/110_vtk9_netcdf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Fix FTBFS with new netcdf -Author: Anton Gladky -Bug-Debian: https://bugs.debian.org/1012703 -Last-Update: 2022-06-19 - ---- vtk9-9.1.0+really9.1.0+dfsg2.orig/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -+++ vtk9-9.1.0+really9.1.0+dfsg2/VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in - */ - - /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ -- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ -+ // const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ - /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ - const int SZIP_PIXELS_PER_BLOCK = - file->compression_level == 0 ? 32 : file->compression_level; diff -Nru paraview-5.10.1/debian/patches/ffmpeg.patch paraview-5.11.0~rc1+dfsg/debian/patches/ffmpeg.patch --- paraview-5.10.1/debian/patches/ffmpeg.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/ffmpeg.patch 2022-08-31 09:47:18.000000000 +0000 @@ -11,23 +11,10 @@ 4 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 Documentation/release/dev/ffmpeg-5.0.md -diff --git a/VTK/IO/FFMPEG/CMakeLists.txt b/VTK/IO/FFMPEG/CMakeLists.txt -index f6900843ac0..ed43978cfc6 100644 --- a/VTK/IO/FFMPEG/CMakeLists.txt +++ b/VTK/IO/FFMPEG/CMakeLists.txt -@@ -6,7 +6,9 @@ vtk_module_find_package( - avformat - avcodec - avutil -- swscale) -+ swscale -+ OPTIONAL_COMPONENTS -+ swresample) - - set(classes - vtkFFMPEGWriter) -@@ -21,6 +23,17 @@ if (NOT FFMPEG_VERSION VERSION_LESS "3.1") - vtkFFMPEGVideoSource) +@@ -34,6 +34,17 @@ + FFMPEG::swresample) endif () +set(ffmpeg_libraries) @@ -44,67 +31,9 @@ vtk_module_add_module(VTK::IOFFMPEG CLASSES ${classes}) vtk_module_link(VTK::IOFFMPEG -@@ -28,4 +41,5 @@ vtk_module_link(VTK::IOFFMPEG - FFMPEG::avformat - FFMPEG::avcodec - FFMPEG::avutil -- FFMPEG::swscale) -+ FFMPEG::swscale -+ ${ffmpeg_libraries}) -diff --git a/VTK/IO/FFMPEG/vtkFFMPEGVideoSource.cxx b/VTK/IO/FFMPEG/vtkFFMPEGVideoSource.cxx -index 45900ee02bc..f3169d3545d 100644 ---- a/VTK/IO/FFMPEG/vtkFFMPEGVideoSource.cxx -+++ b/VTK/IO/FFMPEG/vtkFFMPEGVideoSource.cxx -@@ -205,7 +205,7 @@ void vtkFFMPEGVideoSource::Initialize() - - this->Internal->VideoStream = fcontext->streams[this->Internal->VideoStreamIndex]; - -- AVCodec* dec = avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id); -+ const AVCodec* dec = avcodec_find_decoder(this->Internal->VideoStream->codecpar->codec_id); - if (!dec) - { - vtkErrorMacro("Failed to find codec for video"); -@@ -271,7 +271,7 @@ void vtkFFMPEGVideoSource::Initialize() - { - this->Internal->AudioStream = fcontext->streams[this->Internal->AudioStreamIndex]; - -- AVCodec* adec = avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id); -+ const AVCodec* adec = avcodec_find_decoder(this->Internal->AudioStream->codecpar->codec_id); - if (!adec) - { - vtkErrorMacro("Failed to find codec for audio"); -diff --git a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx -index 5011b40f579..5d284b088ed 100644 --- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx +++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx -@@ -21,10 +21,17 @@ - - extern "C" - { -+#include - #include - #include - } - -+#if LIBAVFORMAT_VERSION_MAJOR < 59 -+#define vtk_ff_const59 -+#else -+#define vtk_ff_const59 const -+#endif -+ - #if defined(LIBAVFORMAT_VERSION_MAJOR) && LIBAVFORMAT_VERSION_MAJOR >= 57 - extern "C" - { -@@ -51,7 +58,7 @@ private: - - AVFormatContext* avFormatContext; - -- AVOutputFormat* avOutputFormat; -+ vtk_ff_const59 AVOutputFormat* avOutputFormat; - - AVStream* avStream; - -@@ -115,15 +122,9 @@ int vtkFFMPEGWriterInternal::Start() +@@ -409,15 +409,9 @@ return 0; } @@ -121,28 +50,5 @@ + ? AV_CODEC_ID_MJPEG // choose a codec that is easily playable on windows + : AV_CODEC_ID_RAWVIDEO; - // create the format context that wraps all of the media output structures - if (avformat_alloc_output_context2( -@@ -133,8 +134,8 @@ int vtkFFMPEGWriterInternal::Start() - return 0; - } - -- AVCodec* codec; -- if (!(codec = avcodec_find_encoder(this->avOutputFormat->video_codec))) -+ vtk_ff_const59 AVCodec* codec; -+ if (!(codec = avcodec_find_encoder(video_codec))) - { - vtkGenericWarningMacro(<< "Failed to get video codec."); - return 0; -@@ -155,7 +156,7 @@ int vtkFFMPEGWriterInternal::Start() - return 0; - } - -- this->avStream->codecpar->codec_id = static_cast(this->avOutputFormat->video_codec); -+ this->avStream->codecpar->codec_id = video_codec; - this->avStream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - this->avStream->codecpar->width = this->Dim[0]; - this->avStream->codecpar->height = this->Dim[1]; --- -GitLab - + // assign the format to the context + this->avFormatContext->oformat = this->avOutputFormat; diff -Nru paraview-5.10.1/debian/patches/fix.patch paraview-5.11.0~rc1+dfsg/debian/patches/fix.patch --- paraview-5.10.1/debian/patches/fix.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/fix.patch 2022-08-31 09:47:18.000000000 +0000 @@ -5,39 +5,12 @@ --- a/VTK/ThirdParty/ioss/vtkioss/Ioss_CodeTypes.h +++ b/VTK/ThirdParty/ioss/vtkioss/Ioss_CodeTypes.h -@@ -59,10 +59,11 @@ - #ifndef MPI_COMM_SELF - #define MPI_COMM_SELF 0 - #endif --#ifndef MPI_COMM_WORLD --#define MPI_COMM_WORLD 0 --using MPI_Comm = int; --#endif -+#include -+//#ifndef MPI_COMM_WORLD -+////#define MPI_COMM_WORLD 0 -+////using MPI_Comm = int; -+//#endif - #endif - - #ifdef SEACAS_HAVE_KOKKOS ---- a/Qt/ApplicationComponents/pqChartSelectionReaction.cxx -+++ b/Qt/ApplicationComponents/pqChartSelectionReaction.cxx -@@ -81,7 +81,7 @@ - } +@@ -14,6 +14,8 @@ + #include + #include - if (update_modifier && -- (selectionModifier < vtkContextScene::SELECTION_NONE || -+ (selectionModifier < vtkContextScene::SELECTION_DEFAULT || - selectionModifier > vtkContextScene::SELECTION_TOGGLE)) - { - qWarning() << "Invalid selection modifier " << selectionModifier -@@ -166,7 +166,7 @@ - return vtkContextScene::SELECTION_TOGGLE; - break; - default: -- return vtkContextScene::SELECTION_NONE; -+ return vtkContextScene::SELECTION_DEFAULT; - break; - } - } ++#include ++ + #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || \ + defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__) + #define __IOSS_WINDOWS__ 1 diff -Nru paraview-5.10.1/debian/patches/fix_path_paraview.patch paraview-5.11.0~rc1+dfsg/debian/patches/fix_path_paraview.patch --- paraview-5.10.1/debian/patches/fix_path_paraview.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/fix_path_paraview.patch 2022-08-31 09:47:18.000000000 +0000 @@ -2,18 +2,15 @@ Author: Anton Gladky Last-Update: 2020-11-12 -Index: paraview-5.9.0~rc1/Wrapping/Python/paraview/__init__.py -=================================================================== ---- paraview-5.9.0~rc1.orig/Wrapping/Python/paraview/__init__.py -+++ paraview-5.9.0~rc1/Wrapping/Python/paraview/__init__.py -@@ -18,6 +18,10 @@ ParaView modules to force backwards comp +--- a/Wrapping/Python/paraview/__init__.py.in ++++ b/Wrapping/Python/paraview/__init__.py.in +@@ -18,6 +18,9 @@ """ from __future__ import absolute_import +import sys +sys.path.append('/usr/lib/python3/dist-packages/paraview') + -+ - #============================================================================== - # - # Program: ParaView + __version__ = '@PARAVIEW_VERSION_MAJOR@.@PARAVIEW_VERSION_MINOR@.@PARAVIEW_VERSION_PATCH@' + __version_full__ = '@PARAVIEW_VERSION_FULL@' + diff -Nru paraview-5.10.1/debian/patches/libatomic.patch paraview-5.11.0~rc1+dfsg/debian/patches/libatomic.patch --- paraview-5.10.1/debian/patches/libatomic.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/libatomic.patch 2022-08-31 09:47:18.000000000 +0000 @@ -1,8 +1,6 @@ -Index: paraview-5.9.0~rc1/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -=================================================================== ---- paraview-5.9.0~rc1.orig/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -+++ paraview-5.9.0~rc1/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt -@@ -310,10 +310,16 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") +--- a/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt ++++ b/ThirdParty/protobuf/vtkprotobuf/src/CMakeLists.txt +@@ -313,10 +313,16 @@ endif () endif () diff -Nru paraview-5.10.1/debian/patches/reproducible.patch paraview-5.11.0~rc1+dfsg/debian/patches/reproducible.patch --- paraview-5.10.1/debian/patches/reproducible.patch 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/reproducible.patch 2022-08-31 09:47:18.000000000 +0000 @@ -0,0 +1,41 @@ +Author: Vagrant Cascadian +Description: Do not embed the kernel version of the build machine. +Last-Updated: 2022-07-30 +Forwarded: no + +Use CMAKE_SYSTEM_NAME instead of CMAKE_SYSTEM to avoid embedding the +kernel version of the build machine.--- a/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in + + ++++ b/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in +@@ -33,7 +33,7 @@ + #cmakedefine CONDUIT_GIT_SHA1_ABBREV "${CONDUIT_GIT_SHA1_ABBREV}" + #cmakedefine CONDUIT_GIT_TAG "${CONDUIT_GIT_TAG}" + +-#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM@" ++#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@" + + #define CONDUIT_CPP_COMPILER "@CMAKE_CXX_COMPILER@" + +--- a/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in ++++ b/ThirdParty/catalyst/vtkcatalyst/catalyst/thirdparty/conduit/conduit/conduit_config.h.in +@@ -33,7 +33,7 @@ + #cmakedefine CONDUIT_GIT_SHA1_ABBREV "${CONDUIT_GIT_SHA1_ABBREV}" + #cmakedefine CONDUIT_GIT_TAG "${CONDUIT_GIT_TAG}" + +-#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM@" ++#define CONDUIT_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@" + + #define CONDUIT_CPP_COMPILER "@CMAKE_CXX_COMPILER@" + +--- a/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in ++++ b/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfConfig.h.in +@@ -32,7 +32,7 @@ + #define XDMF_BYTE_ORDER_LITTLE + #endif + +-#define XDMF_SYSTEM ${CMAKE_SYSTEM} ++#define XDMF_SYSTEM ${CMAKE_SYSTEM_NAME} + + #cmakedefine XDMF_VOID_VALID + #ifndef XDMF_VOID_VALID diff -Nru paraview-5.10.1/debian/patches/series paraview-5.11.0~rc1+dfsg/debian/patches/series --- paraview-5.10.1/debian/patches/series 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/series 2022-08-31 09:47:18.000000000 +0000 @@ -3,6 +3,6 @@ vtk-cmake-findffmpeg-cmake.patch sqlite.patch fix.patch -vector-header.patch -110_vtk9_netcdf.patch ffmpeg.patch +vector-header.patch +# reproducible.patch diff -Nru paraview-5.10.1/debian/patches/vtk-cmake-findffmpeg-cmake.patch paraview-5.11.0~rc1+dfsg/debian/patches/vtk-cmake-findffmpeg-cmake.patch --- paraview-5.10.1/debian/patches/vtk-cmake-findffmpeg-cmake.patch 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/patches/vtk-cmake-findffmpeg-cmake.patch 2022-08-31 09:47:18.000000000 +0000 @@ -4,8 +4,8 @@ Forwarded: no Last-Updated: 2021-11-10 ---- paraview-5.7.0.orig/VTK/CMake/FindFFMPEG.cmake 2019-10-09 12:24:09.000000000 +0200 -+++ paraview-5.7.0/VTK/CMake/FindFFMPEG.cmake 2020-08-05 16:57:39.946570358 +0200 +--- a/VTK/CMake/FindFFMPEG.cmake ++++ b/VTK/CMake/FindFFMPEG.cmake @@ -154,6 +154,7 @@ file(STRINGS "${_ffmpeg_version_header_path}" _ffmpeg_version REGEX "FFMPEG_VERSION") diff -Nru paraview-5.10.1/debian/rules paraview-5.11.0~rc1+dfsg/debian/rules --- paraview-5.10.1/debian/rules 2022-04-09 12:01:36.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/debian/rules 2022-08-31 09:47:18.000000000 +0000 @@ -14,19 +14,10 @@ export QT_SELECT=qt5 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wall -pedantic -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wall -pedantic +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -O0 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed -# Following variables not used. -# Eigen_DIR -# PARAVIEW_BUILD_PLUGIN_EyeDomeLighting -# PARAVIEW_BUILD_PLUGIN_MobileRemoteControl - -# Needs testing: -# -DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON -# -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=ON -# -DEigen_DIR=/usr/include/eigen3 # Investigate: Pixie Needs ADIOS1 # -DPARAVIEW_PLUGIN_ENABLE_AdiosReaderPixie=ON # -DPARAVIEW_PLUGIN_ENABLE_AdiosReaderStaging=ON @@ -35,8 +26,9 @@ # Explicit settings of MPI_* is required see # http://www.vtk.org/Bug/view.php?id=12572 extra_flags += -Wno-dev \ - -DCMAKE_BUILD_TYPE=Release \ - -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF \ + -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_BUILD_TYPE=DEBUG \ + -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=ON \ -DCMAKE_INSTALL_RPATH=/usr/lib/paraview \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \ @@ -44,16 +36,9 @@ -DPARAVIEW_ENABLE_WEB=ON \ -DPARAVIEW_BUILD_SHARED_LIBS=ON \ -DVTK_SOURCE_DIR=$(CURDIR)/VTK \ - -DHDF5_INCLUDE_DIRS="/usr/include/hdf5/openmpi" \ - -DHDF5_IS_PARALLEL=ON \ - -DVTK_INSTALL_LIBRARY_DIR="lib/paraview" \ - -DVTK_INSTALL_ARCHIVE_DIR="lib/paraview" \ - -DVTK_INSTALL_INCLUDE_DIR="include/paraview" \ - -DVTK_INSTALL_DATA_DIR="share/paraview" \ - -DVTK_INSTALL_DOC_DIR="share/doc/paraview" \ - -DVTK_INSTALL_PACKAGE_DIR="lib/cmake/paraview" \ + -DHDF5_ROOT=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/hdf5/openmpi \ + -DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON \ -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX="lib/python3/dist-packages" \ - -DVTK_PYTHON_OPTIONAL_LINK=OFF \ -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON \ @@ -77,7 +62,6 @@ -DPARAVIEW_ENABLE_GDAL=ON \ -DPARAVIEW_ENABLE_XDMF3=ON \ -DPARAVIEW_ENABLE_MOTIONFX=ON \ - -DPARAVIEW_PLUGIN_ENABLE_EyeDomeLighting=ON \ -DDEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_clean: diff -Nru paraview-5.10.1/Documentation/dev/build.md paraview-5.11.0~rc1+dfsg/Documentation/dev/build.md --- paraview-5.10.1/Documentation/dev/build.md 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Documentation/dev/build.md 2022-09-01 19:52:20.000000000 +0000 @@ -1,11 +1,13 @@ # Building ParaView This page describes how to build and install ParaView. It covers building for -development, on both Unix-type systems (Linux, HP-UX, Solaris, macOS), and -Windows. Note that Unix-like environments such as Cygwin and MinGW are not -officially supported. However, patches to fix problems with these platforms -will be considered for inclusion. ParaView builds on x86_64, PowerPC, and ARM -architectures. +development, on both Linux and Windows. Please Note that Linux (x86_64), Windows (x86_64) +and macOS (x86_64 and arm64) version are built and tested by our continuous +integration system and are considered supported environments. + +Any other environnements and architecture (including Cygwin, MingGW, PowerPC) are considered +non-officially supported, however, patches to fix problems with these platforms will +be considered for inclusion. ParaView depends on several open source tools and libraries such as Python, Qt, CGNS, HDF5, etc. Some of these are included in the ParaView source itself @@ -67,7 +69,7 @@ ninja ``` -To build a specific ParaView version, eg: v5.6.0 , please run the following commands in a terminal while replacing "tag" by the version you want to build +To build a specific ParaView version, eg: v5.9.1, please run the following commands in a terminal while replacing "tag" by the version you want to build ```sh git clone https://gitlab.kitware.com/paraview/paraview.git mkdir paraview_build @@ -88,17 +90,19 @@ ### Windows -Note: the following steps concerning Visual Studio 2015 can also be applied to Visual Studio 2017 and 2019. -If so, be sure to use the msvc2017_64/msvc2019_64 Qt Version and the Developer Command Prompt for VS 2017/2019. +Note: The following steps concerning Visual Studio 2019 can also be applied to newer versions. +If so, be sure to use the respective Qt Version (e.g. for VS 2022, use msvc2022_64) and the Native Tools Command Prompt. #### Dependencies * Download and install [git bash for windows][gitforwindows] * Download and install [cmake][cmake-download] - * Download and install [Visual Studio 2015 Community Edition][visual-studio] + * Download and install [Visual Studio 2019 Community Edition][visual-studio] * Download [ninja-build][ninja] and drop `ninja.exe` in `C:\Windows\` * Download and install both `msmpisetup.exe` and `msmpisdk.msi` from [Microsoft MPI][msmpi] - * Download and install [Python for windows][pythonwindows], make sure to add the path to your Python installation folder to the `PATH` environnement variable. - * Download and install [Qt 5.12.3][qt-download-5.12.3] for Windows, make sure to check the MSVC 2015 64-bit component during installation, make sure to add `C:\Qt\Qt5.12.3\5.12.3\msvc2015_64\bin` to your `PATH` environment variable. + * Download and install [Python for Windows][pythonwindows], make sure to add the path to your Python installation folder to the `PATH` environnement variable. + * Download and install [Qt 5.15.3][qt-download-5.15.3] for Windows, make sure to check the MSVC 2019 64-bit component during installation. + * Make sure to add `C:\Qt\Qt5.15.3\5.15.3\msvc2019_64\bin` to your `PATH` environment variable. + * You may also need to add an environment variable `QT_QPA_PLATFORM_PLUGIN_PATH`: `C:\Qt\Qt5.15.3\5.15.3\msvc2019_64\plugins\platforms`. #### Recover the source * Open git bash @@ -113,7 +117,7 @@ mkdir pvb ``` - * Or, to build a specific ParaView version, eg: v5.6.0 , please run the following commands while replacing "tag" by the version you want to build + * Or, to build a specific ParaView version, eg: v5.9.1, please run the following commands while replacing "tag" by the version you want to build ```sh cd C: @@ -129,16 +133,18 @@ #### Build - * Open VS2015 x64 Native Tools Command Prompt and run the following commands + * Open VS2019 x64 Native Tools Command Prompt and run the following commands ```sh cd C:\pv\pvb -cmake -GNinja -DPARAVIEW_USE_PYTHON=ON -DPARAVIEW_USE_MPI=ON -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DCMAKE_BUILD_TYPE=Release ..\pv +cmake -GNinja -DPARAVIEW_USE_PYTHON=ON -DPARAVIEW_USE_MPI=ON -DVTK_SMP_IMPLEMENTATION_TYPE=STDThread -DCMAKE_BUILD_TYPE=Release ..\pv ninja ``` +Note: If you want to build ParaView with `CMAKE_BUILD_TYPE=Debug` you also need to add the option `-DPARAVIEW_WINDOWS_PYTHON_DEBUGGABLE=ON`. + #### Run - * Double click on the `C:\pv\pvb\bin\paraview` executable + * Double click on the `C:\pv\pvb\bin\paraview.exe` executable ## Complete Compilation Guide @@ -172,14 +178,14 @@ - IBM XL 16.1 or newer - Clang 4 or newer - Xcode 9 or newer - - Visual Studio 2015 or newer + - Visual Studio 2019 or newer Optional dependencies: * [Python][python] - At least 3.3 is required * [Qt5][qt] - - Version 5.12 or newer + - Version 5.12 or newer. Qt6 is not supported. ##### Installing CMake @@ -253,7 +259,7 @@ #### Windows - * [Visual Studio 2015 Community Edition][visual-studio] + * [Visual Studio 2019 Community Edition][visual-studio] * Use "x64 Native Tools Command Prompt" for the installed Visual Studio version to configure with CMake and to build with ninja. * Get [ninja][ninja]. Unzip the binary and put it in `PATH`. @@ -287,7 +293,6 @@ ParaView has a number of settings available for its build. These are categorized as build options, capability options, feature options and miscellaneous options. - #### Build Options Options that impact the build begin with the prefix `PARAVIEW_BUILD_`. @@ -301,10 +306,13 @@ * `PARAVIEW_BUILD_EDITION` (default `CANONICAL`): Choose which features to enable in this build. This is useful to generate ParaView builds with limited features. More on this later. - * `PARAVIEW_BUILD_EXAMPLES` (default `OFF`): If set, ParaView's example code - will be added as tests to the ParaView test suite. + * `PARAVIEW_ENABLE_EXAMPLES` (default `OFF`): If set, ParaView's example code + will be added as tests to the ParaView test suite. These tests may be built + and run using the `paraview-examples` target. * `PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION` (default `OFF`): If set, the HTML documentation for ParaView's C++, Python, and proxies will be generated. + * `PARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION` (default `OFF`): Whether + plugin XML documentation is forcefully disabled. * `PARAVIEW_BUILD_TESTING` (default `OFF`): Whether to build tests or not. Valid values are `OFF` (no testing), `WANT` (enable tests as possible), and `ON` (enable all tests; may error out if features otherwise disabled are @@ -312,6 +320,8 @@ * `PARAVIEW_BUILD_VTK_TESTING` (default `OFF`): Whether to build tests for the VTK codebase built by ParaView. Valid values are same as `PARAVIEW_BUILD_TESTING`. + * `PARAVIEW_ENABLE_CATALYST` (default `OFF`): Whether to build the ParaView + implementation of Catalyst. More advanced build options are: @@ -387,7 +397,15 @@ * `PARAVIEW_ENABLE_COSMOTOOLS` (default `OFF`; requires `PARAVIEW_USE_MPI` and not available on Windows): Enable support for CosmoTools which includes GenericIO readers and writers as well as some point cloud algorithms. - + * `PARAVIEW_ENABLE_CGNS_READER` (default `ON` for CANONICAL builds, `OFF` for + non-CANONICAL builds): Enable support for reading CGNS files. When building + ParaView for e.g. CATALYST, this option allows building support for reading + CGNS files. It will also build CGNSReader dependencies: HDF5 and CGNS. + * `PARAVIEW_ENABLE_CGNS_WRITER` (default `ON` for CANONICAL builds, `OFF` for + non-CANONICAL builds): Enable support for writing CGNS files. When building + ParaView for e.g. CATALYST, this option allows building support for writing + CGNS files. It will also build CGNSReader dependencies: HDF5 and CGNS. If + `PARAVIEW_ENABLE_MPI` is `ON`, the parallel CGNS writer will also be built. #### Plugin settings @@ -453,10 +471,18 @@ build-machine-specific paths in the install tree. * `PARAVIEW_SERIAL_TESTS_USE_MPIEXEC` (default `OFF`): Used on HPC to run serial tests on compute nodes. If set, it prefixes serial tests with - "${MPIEXEC_EXECUTABLE}" "${MPIEXEC_NUMPROC_FLAG}" "1" ${MPIEXEC_PREFLAGS} + "${MPIEXEC_EXECUTABLE}" "${MPIEXEC_NUMPROC_FLAG}" "1" ${MPI_PREFLAGS} + * `PARAVIEW_SKIP_CLANG_TIDY_FOR_VTK` (defaults `ON`; requires + `CMAKE__CLANG_TIDY`): If set, any `clang-tidy` settings will be + cleared for the internal VTK build. + * `PARAVIEW_TEST_DIR`: Used on HPC to set the test directory (default is + "${CMAKE_BINARY_DIR}/Testing/Temporary") to a location that is writable from + the compute nodes. Typically the user home directory is not. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru paraview-5.10.1/Examples/CustomApplications/Clone2/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/Clone2/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -26,7 +26,6 @@ myMainWindow.ui) set(xml_files ParaViewFilters.xml - #ParaViewReaders.xml ParaViewSources.xml) paraview_client_add( @@ -34,11 +33,6 @@ VERSION "1.1.1" SOURCES ${sources} ${ui_files} APPLICATION_XMLS ${xml_files} - MAIN_WINDOW_CLASS myMainWindow - ORGANIZATION "Kitware, Inc." TITLE "ParaView (ReVisEd)") -target_link_libraries(paraview_clone2 - PRIVATE - ParaView::pqApplicationComponents) diff -Nru paraview-5.10.1/Examples/CustomApplications/Clone2/myMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/myMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/Clone2/myMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/myMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -32,27 +32,26 @@ #include "myMainWindow.h" #include "ui_myMainWindow.h" -#include "pqAlwaysConnectedBehavior.h" -#include "pqApplicationCore.h" -#include "pqApplyBehavior.h" -#include "pqAutoLoadPluginXMLBehavior.h" -#include "pqDefaultViewBehavior.h" -#include "pqHelpReaction.h" -#include "pqInterfaceTracker.h" -#include "pqParaViewBehaviors.h" -#include "pqParaViewMenuBuilders.h" -#include "pqStandardViewFrameActionsImplementation.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include "pqAxesToolbar.h" -#include "pqLoadDataReaction.h" -#include "pqMainControlsToolbar.h" -#include "pqRepresentationToolbar.h" -#include "pqSetName.h" - class myMainWindow::pqInternals : public Ui::pqClientMainWindow { }; @@ -122,7 +121,7 @@ // Final step, define application behaviors. Since we want some paraview behaviors // we can use static method to configure the pqParaViewBehaviors and select // only the components we want - pqParaViewBehaviors::setEnableStandardPropertyWidgets(false); + pqParaViewBehaviors::setEnableStandardPropertyWidgets(true); pqParaViewBehaviors::setEnableStandardRecentlyUsedResourceLoader(false); pqParaViewBehaviors::setEnableDataTimeStepBehavior(false); pqParaViewBehaviors::setEnableSpreadSheetVisibilityBehavior(false); @@ -164,7 +163,7 @@ pqApplyBehavior* applyBehavior = new pqApplyBehavior(this); // Register panels - foreach (pqPropertiesPanel* ppanel, this->findChildren()) + Q_FOREACH (pqPropertiesPanel* ppanel, this->findChildren()) { applyBehavior->registerPanel(ppanel); } diff -Nru paraview-5.10.1/Examples/CustomApplications/Clone2/myMainWindow.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/myMainWindow.h --- paraview-5.10.1/Examples/CustomApplications/Clone2/myMainWindow.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/myMainWindow.h 2022-09-01 19:52:20.000000000 +0000 @@ -34,7 +34,7 @@ #include -/// MainWindow for the default ParaView application. +// MainWindow for the default ParaView application. class myMainWindow : public QMainWindow { Q_OBJECT diff -Nru paraview-5.10.1/Examples/CustomApplications/Clone2/ParaViewFilters.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/ParaViewFilters.xml --- paraview-5.10.1/Examples/CustomApplications/Clone2/ParaViewFilters.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/ParaViewFilters.xml 2022-09-01 19:52:20.000000000 +0000 @@ -114,7 +114,6 @@ - diff -Nru paraview-5.10.1/Examples/CustomApplications/Clone2/ParaViewReaders.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/ParaViewReaders.xml --- paraview-5.10.1/Examples/CustomApplications/Clone2/ParaViewReaders.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Clone2/ParaViewReaders.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo0/DemoApp0.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo0/DemoApp0.cxx --- paraview-5.10.1/Examples/CustomApplications/Demo0/DemoApp0.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo0/DemoApp0.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,36 @@ -#include "pqApplicationCore.h" +/*========================================================================= + + Program: ParaView + Module: DemoApp0.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include + #include #include diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo1/DemoApp1.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo1/DemoApp1.cxx --- paraview-5.10.1/Examples/CustomApplications/Demo1/DemoApp1.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo1/DemoApp1.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -1,5 +1,38 @@ +/*========================================================================= + + Program: ParaView + Module: DemoApp1.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ #include "myMainWindow.h" -#include "pqPVApplicationCore.h" + +#include + #include int main(int argc, char** argv) diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo1/myMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo1/myMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/Demo1/myMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo1/myMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -32,11 +32,11 @@ #include "myMainWindow.h" #include "ui_myMainWindow.h" -#include "pqActiveObjects.h" -#include "pqApplicationCore.h" -#include "pqObjectBuilder.h" -#include "pqRenderView.h" -#include "pqServerResource.h" +#include +#include +#include +#include +#include //----------------------------------------------------------------------------- myMainWindow::myMainWindow(QWidget* parentObject, Qt::WindowFlags wflags) diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/Demo2/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.8) +project(Demo2) + +find_package(ParaView REQUIRED) + +if (NOT PARAVIEW_USE_QT) + message(STATUS + "Skipping example: ${CMAKE_PROJECT_NAME} example requires PARAVIEW_USE_QT " + "to be enabled. Please rebuild ParaView (or point to a different build of " + "ParaView) with PARAVIEW_USE_QT set to TRUE") + return () +endif() + +include(GNUInstallDirs) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") + +find_package(Qt5 REQUIRED COMPONENTS Widgets) + +set(CMAKE_AUTOMOC 1) +set(CMAKE_AUTOUIC 1) + +set(sources + myMainWindow.cxx + myMainWindow.h + myMainWindow.ui) + +add_executable(DemoApp2 DemoApp2.cxx ${sources}) +target_link_libraries(DemoApp2 + PRIVATE + ParaView::pqApplicationComponents + Qt5::Widgets) + +configure_file(ParaViewFilters.xml ${CMAKE_BINARY_DIR} COPYONLY) diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/DemoApp2.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/DemoApp2.cxx --- paraview-5.10.1/Examples/CustomApplications/Demo2/DemoApp2.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/DemoApp2.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,52 @@ +/*========================================================================= + + Program: ParaView + Module: DemoApp2.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "myMainWindow.h" + +#include + +#include + +int main(int argc, char** argv) +{ + QApplication app(argc, argv); + pqPVApplicationCore appCore(argc, argv); + + // Create the window which initialize all paraview behaviors + myMainWindow window; + window.setWindowTitle("Demo App"); + + // Load a configuration XML in order to have access to filters and readers + appCore.loadConfiguration(qApp->applicationDirPath() + "/../ParaViewFilters.xml"); + + window.show(); + return app.exec(); +} diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,109 @@ +/*========================================================================= + + Program: ParaView + Module: myMainWindow.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "myMainWindow.h" +#include "ui_myMainWindow.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//----------------------------------------------------------------------------- +class myMainWindow::pqInternals : public Ui::pqClientMainWindow +{ +}; + +//----------------------------------------------------------------------------- +myMainWindow::myMainWindow() + : Internals(new pqInternals()) +{ + // Setup default GUI layout. + this->Internals->setupUi(this); + + // Setup the dock window corners to give the vertical docks more room. + this->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + this->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + + // Setup color editor + // Provide access to the color-editor panel for the application and hide it + pqApplicationCore::instance()->registerManager( + "COLOR_EDITOR_PANEL", this->Internals->colorMapEditorDock); + this->Internals->colorMapEditorDock->hide(); + + // Create a custom file menu with only Open and close + QList actionList = this->Internals->menu_File->actions(); + QAction* action = actionList.at(0); + new pqLoadDataReaction(action); + QObject::connect( + actionList.at(1), SIGNAL(triggered()), QApplication::instance(), SLOT(closeAllWindows())); + + // Build the filters menu + pqParaViewMenuBuilders::buildFiltersMenu(*this->Internals->menuFilters, this); + + // Setup the context menu for the pipeline browser. + pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( + *this->Internals->pipelineBrowser->contextMenu()); + + // Add the ColorToolbar + QToolBar* colorToolbar = new pqColorToolbar(this); + colorToolbar->layout()->setSpacing(0); + this->addToolBar(colorToolbar); + + // Add the Representation Toolbar + QToolBar* reprToolbar = new pqRepresentationToolbar(this); + reprToolbar->setObjectName("Representation"); + reprToolbar->layout()->setSpacing(0); + this->addToolBar(reprToolbar); + + // Enable help from the properties panel. + // This is not really working as the documentation is not built in this app + QObject::connect(this->Internals->proxyTabWidget, &pqPropertiesPanel::helpRequested, + &pqHelpReaction::showProxyHelp); + + // hook delete to pqDeleteReaction. + QAction* tempDeleteAction = new QAction(this); + pqDeleteReaction* handler = new pqDeleteReaction(tempDeleteAction); + handler->connect(this->Internals->proxyTabWidget, SIGNAL(deleteRequested(pqProxy*)), + SLOT(deleteSource(pqProxy*))); + + // Final step, define application behaviors. Since we want all ParaView + // behaviors, we use this convenience method. + new pqParaViewBehaviors(this, this); +} + +//----------------------------------------------------------------------------- +myMainWindow::~myMainWindow() = default; diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.h --- paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,60 @@ +/*========================================================================= + + Program: ParaView + Module: myMainWindow.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ + +/** + * A main window class copied from SimpleParaView example + * Make sure to propagate any changes mades + */ + +#ifndef myMainWindow_h +#define myMainWindow_h + +#include +#include + +class myMainWindow : public QMainWindow +{ + Q_OBJECT + typedef QMainWindow Superclass; + +public: + myMainWindow(); + ~myMainWindow() override; + +private: + Q_DISABLE_COPY(myMainWindow) + + class pqInternals; + QScopedPointer Internals; +}; + +#endif diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.ui paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.ui --- paraview-5.10.1/Examples/CustomApplications/Demo2/myMainWindow.ui 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/myMainWindow.ui 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,150 @@ + + + pqClientMainWindow + + + + 0 + 0 + 970 + 700 + + + + MainWindow + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + 970 + 19 + + + + + &File + + + + + + + &Filters + + + + + + + + Open + + + + + Quit + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Pipeline Browser + + + 1 + + + + Qt::DefaultContextMenu + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Color Map Editor + + + 2 + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Properties + + + 1 + + + + + + + pqPipelineBrowserWidget + QWidget +
pqPipelineBrowserWidget.h
+ 1 + + + pqDataInformationWidget + QWidget +
pqDataInformationWidget.h
+ 1 + + + pqStatusBar + QStatusBar +
pqStatusBar.h
+ + + pqPropertiesPanel + QWidget +
pqPropertiesPanel.h
+ 1 + + + pqViewManager + QWidget +
pqViewManager.h
+ 1 + + + pqColorMapEditor + QWidget +
pqColorMapEditor.h
+ 1 + + + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/Demo2/ParaViewFilters.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/ParaViewFilters.xml --- paraview-5.10.1/Examples/CustomApplications/Demo2/ParaViewFilters.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Demo2/ParaViewFilters.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/MultiServerClient/MultiServerClientMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/MultiServerClient/MultiServerClientMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/MultiServerClient/MultiServerClientMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/MultiServerClient/MultiServerClientMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -32,20 +32,19 @@ #include "MultiServerClientMainWindow.h" #include "ui_MultiServerClientMainWindow.h" -#include "pqActiveObjects.h" -#include "pqApplicationCore.h" -#include "pqObjectBuilder.h" -#include "pqParaViewBehaviors.h" -#include "pqParaViewMenuBuilders.h" -#include "pqPipelineBrowserWidget.h" -#include "pqServer.h" -#include "pqServerConfiguration.h" -#include "pqServerConnectReaction.h" -#include "pqServerManagerModel.h" - -#include "vtkProcessModule.h" -#include "vtkSMSession.h" -#include "vtkSession.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,22 @@ +set(CMAKE_AUTOMOC 1) +set(CMAKE_AUTOUIC 1) + +set(sources + myMainWindow.cxx + myMainWindow.h) +set(ui_files + myMainWindow.ui) +set(xml_files + ParaViewFilters.xml) + +# The main cmake macro to create a paraview based application +paraview_client_add( + NAME simple_paraview + VERSION "1.0.1" + SOURCES ${sources} ${ui_files} + PLUGINS_TARGETS simple_paraview_plugins + REQUIRED_PLUGINS SimpleParaViewCustomFilters + APPLICATION_XMLS ${xml_files} + MAIN_WINDOW_CLASS myMainWindow + ORGANIZATION "Kitware SAS." + TITLE "Simple ParaView") diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,109 @@ +/*========================================================================= + + Program: ParaView + Module: myMainWindow.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "myMainWindow.h" +#include "ui_myMainWindow.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//----------------------------------------------------------------------------- +class myMainWindow::pqInternals : public Ui::pqClientMainWindow +{ +}; + +//----------------------------------------------------------------------------- +myMainWindow::myMainWindow() + : Internals(new pqInternals()) +{ + // Setup default GUI layout. + this->Internals->setupUi(this); + + // Setup the dock window corners to give the vertical docks more room. + this->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + this->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + + // Setup color editor + // Provide access to the color-editor panel for the application and hide it + pqApplicationCore::instance()->registerManager( + "COLOR_EDITOR_PANEL", this->Internals->colorMapEditorDock); + this->Internals->colorMapEditorDock->hide(); + + // Create a custom file menu with only Open and close + QList actionList = this->Internals->menu_File->actions(); + QAction* action = actionList.at(0); + new pqLoadDataReaction(action); + QObject::connect( + actionList.at(1), SIGNAL(triggered()), QApplication::instance(), SLOT(closeAllWindows())); + + // Build the filters menu + pqParaViewMenuBuilders::buildFiltersMenu(*this->Internals->menuFilters, this); + + // Setup the context menu for the pipeline browser. + pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( + *this->Internals->pipelineBrowser->contextMenu()); + + // Add the ColorToolbar + QToolBar* colorToolbar = new pqColorToolbar(this); + colorToolbar->layout()->setSpacing(0); + this->addToolBar(colorToolbar); + + // Add the Representation Toolbar + QToolBar* reprToolbar = new pqRepresentationToolbar(this); + reprToolbar->setObjectName("Representation"); + reprToolbar->layout()->setSpacing(0); + this->addToolBar(reprToolbar); + + // Enable help from the properties panel. + // This is not really working as the documentation is not built in this app + QObject::connect(this->Internals->proxyTabWidget, &pqPropertiesPanel::helpRequested, + &pqHelpReaction::showProxyHelp); + + // hook delete to pqDeleteReaction. + QAction* tempDeleteAction = new QAction(this); + pqDeleteReaction* handler = new pqDeleteReaction(tempDeleteAction); + handler->connect(this->Internals->proxyTabWidget, SIGNAL(deleteRequested(pqProxy*)), + SLOT(deleteSource(pqProxy*))); + + // Final step, define application behaviors. Since we want all ParaView + // behaviors, we use this convenience method. + new pqParaViewBehaviors(this, this); +} + +//----------------------------------------------------------------------------- +myMainWindow::~myMainWindow() = default; diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.h --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,66 @@ +/*========================================================================= + + Program: ParaView + Module: myMainWindow.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ + +/** + * An example of a very simple ParaView based application. + * It still contains all of ParaView features, but only a subset of features + * is shown to the user. + * + * It shows how to : + * * Only expose a handful of filters + * * Define your own menus and use only specific menus + * * Choose which toolbar and dockwidget to show + */ + +#ifndef myMainWindow_h +#define myMainWindow_h + +#include +#include + +class myMainWindow : public QMainWindow +{ + Q_OBJECT + typedef QMainWindow Superclass; + +public: + myMainWindow(); + ~myMainWindow() override; + +private: + Q_DISABLE_COPY(myMainWindow) + + class pqInternals; + QScopedPointer Internals; +}; + +#endif diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.ui paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.ui --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/myMainWindow.ui 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/myMainWindow.ui 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,150 @@ + + + pqClientMainWindow + + + + 0 + 0 + 970 + 700 + + + + MainWindow + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + 970 + 19 + + + + + &File + + + + + + + &Filters + + + + + + + + Open + + + + + Quit + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Pipeline Browser + + + 1 + + + + Qt::DefaultContextMenu + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Color Map Editor + + + 2 + + + + + + Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea + + + Properties + + + 1 + + + + + + + pqPipelineBrowserWidget + QWidget +
pqPipelineBrowserWidget.h
+ 1 + + + pqDataInformationWidget + QWidget +
pqDataInformationWidget.h
+ 1 + + + pqStatusBar + QStatusBar +
pqStatusBar.h
+ + + pqPropertiesPanel + QWidget +
pqPropertiesPanel.h
+ 1 + + + pqViewManager + QWidget +
pqViewManager.h
+ 1 + + + pqColorMapEditor + QWidget +
pqColorMapEditor.h
+ 1 + + + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/ParaViewFilters.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/ParaViewFilters.xml --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/client/ParaViewFilters.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/client/ParaViewFilters.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,7 @@ + + + + + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -16,22 +16,5 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") -set(CMAKE_AUTOMOC 1) -set(CMAKE_AUTOUIC 1) - -set(sources - myMainWindow.cxx - myMainWindow.h) -set(ui_files - myMainWindow.ui) -set(xml_files - ParaViewFilters.xml) - -paraview_client_add( - NAME simple_paraview - VERSION "1.0.0" - SOURCES ${sources} ${ui_files} - APPLICATION_XMLS ${xml_files} - MAIN_WINDOW_CLASS myMainWindow - ORGANIZATION "Kitware SAS." - TITLE "Simple ParaView") +add_subdirectory(plugins) +add_subdirectory(client) diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.cxx 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: myMainWindow.cxx - - Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. - All rights reserved. - - ParaView is a free software; you can redistribute it and/or modify it - under the terms of the ParaView license version 1.2. - - See License_v1.2.txt for the full ParaView license. - A copy of this license can be obtained by contacting - Kitware Inc. - 28 Corporate Drive - Clifton Park, NY 12065 - USA - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -========================================================================*/ -#include "myMainWindow.h" -#include "ui_myMainWindow.h" - -#include "pqApplicationCore.h" -#include "pqCategoryToolbarsBehavior.h" -#include "pqColorToolbar.h" -#include "pqLoadDataReaction.h" -#include "pqParaViewBehaviors.h" -#include "pqParaViewMenuBuilders.h" -#include "pqRepresentationToolbar.h" - -//----------------------------------------------------------------------------- -class myMainWindow::pqInternals : public Ui::pqClientMainWindow -{ -}; - -//----------------------------------------------------------------------------- -myMainWindow::myMainWindow() -{ - // Setup default GUI layout. - this->Internals = new pqInternals(); - this->Internals->setupUi(this); - - // Setup the dock window corners to give the vertical docks more room. - this->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - this->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - - // Setup color editor - // Provide access to the color-editor panel for the application and hide it - pqApplicationCore::instance()->registerManager( - "COLOR_EDITOR_PANEL", this->Internals->colorMapEditorDock); - this->Internals->colorMapEditorDock->hide(); - - // Create a custom file menu with only Open and close - QList qa = this->Internals->menu_File->actions(); - QAction* mqa = qa.at(0); - new pqLoadDataReaction(mqa); - QObject::connect( - qa.at(1), SIGNAL(triggered()), QApplication::instance(), SLOT(closeAllWindows())); - - // Build the filters menu - pqParaViewMenuBuilders::buildFiltersMenu(*this->Internals->menuFilters, this); - - // Setup the context menu for the pipeline browser. - pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( - *this->Internals->pipelineBrowser->contextMenu()); - - // Add the ColorToolbar - QToolBar* colorToolbar = new pqColorToolbar(this); - colorToolbar->layout()->setSpacing(0); - this->addToolBar(colorToolbar); - - // Add the Representation Toolbar - QToolBar* reprToolbar = new pqRepresentationToolbar(this); - reprToolbar->setObjectName("Representation"); - reprToolbar->layout()->setSpacing(0); - this->addToolBar(reprToolbar); - - // Final step, define application behaviors. Since we want all ParaView - // behaviors, we use this convenience method. - new pqParaViewBehaviors(this, this); -} - -//----------------------------------------------------------------------------- -myMainWindow::~myMainWindow() -{ - delete this->Internals; -} diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.h --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/*========================================================================= - - Program: ParaView - Module: myMainWindow.h - - Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. - All rights reserved. - - ParaView is a free software; you can redistribute it and/or modify it - under the terms of the ParaView license version 1.2. - - See License_v1.2.txt for the full ParaView license. - A copy of this license can be obtained by contacting - Kitware Inc. - 28 Corporate Drive - Clifton Park, NY 12065 - USA - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -========================================================================*/ - -/** - * An example of a very simple ParaView based application. - * It still contains all of ParaView features, but only a subset of features - * is shown to the user. - * - * It shows how to : - * * Only expose a handful of filters - * * Define your own menus and use only specific menus - * * Choose which toolbar and dockwidget to show - */ - -#ifndef myMainWindow_h -#define myMainWindow_h - -#include - -class myMainWindow : public QMainWindow -{ - Q_OBJECT - typedef QMainWindow Superclass; - -public: - myMainWindow(); - ~myMainWindow() override; - -private: - Q_DISABLE_COPY(myMainWindow) - - class pqInternals; - pqInternals* Internals; -}; - -#endif diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.ui paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.ui --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/myMainWindow.ui 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/myMainWindow.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ - - - pqClientMainWindow - - - - 0 - 0 - 970 - 700 - - - - MainWindow - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 0 - 0 - 970 - 19 - - - - - &File - - - - - - - &Filters - - - - - - - - Open - - - - - Quit - - - - - - Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - - - Pipeline Browser - - - 1 - - - - Qt::DefaultContextMenu - - - - - - Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - - - Color Map Editor - - - 2 - - - - - - Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea - - - Properties - - - 1 - - - - - - - pqPipelineBrowserWidget - QWidget -
pqPipelineBrowserWidget.h
- 1 - - - pqDataInformationWidget - QWidget -
pqDataInformationWidget.h
- 1 - - - pqStatusBar - QStatusBar -
pqStatusBar.h
- - - pqPropertiesPanel - QWidget -
pqPropertiesPanel.h
- 1 - - - pqViewManager - QWidget -
pqViewManager.h
- 1 - - - pqColorMapEditor - QWidget -
pqColorMapEditor.h
- 1 - - - - - diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/ParaViewFilters.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/ParaViewFilters.xml --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/ParaViewFilters.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/ParaViewFilters.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - - - - - - - diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,22 @@ +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + +# Classic plugin scan/build +# Each plugin should be listed in the PLUGIN_FILES arg of paraview_plugin_scan + +paraview_plugin_scan( + PLUGIN_FILES + SimpleParaViewCustomFilters/paraview.plugin + PROVIDES_PLUGINS plugins + ENABLE_BY_DEFAULT ON + HIDE_PLUGINS_FROM_CACHE ON) + +paraview_plugin_build( + RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY_SUBDIRECTORY "${PARAVIEW_PLUGIN_SUBDIR}" + PLUGINS_FILE_NAME "SimpleParaView.xml" + INSTALL_EXPORT SimpleParaViewPlugins + CMAKE_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SimpleParaView + LIBRARY_SUBDIRECTORY "SimpleParaView" + PLUGINS ${plugins} + TARGET simple_paraview_plugins) diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,4 @@ +paraview_add_plugin(SimpleParaViewCustomFilters + VERSION "1.0" + MODULES ElevationFilters + MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ElevationFilters/vtk.module") diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,9 @@ +set(classes + vtkMyElevationFilter) + +vtk_module_add_module(ElevationFilters + FORCE_STATIC # Using FORCE_STATIC build the vtk module statically into the plugin library, to avoid confusion when loading + CLASSES ${classes}) + +paraview_add_server_manager_xmls( + XMLS MyElevationFilter.xml) diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/MyElevationFilter.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/MyElevationFilter.xml --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/MyElevationFilter.xml 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/MyElevationFilter.xml 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + The Elevation filter generates point scalar values for an input data + set along a specified direction vector. The Input menu allows the user + to select the data set to which this filter will be applied. The Low + Point and High Point define a line onto which each point of the data + set is projected. The minimum scalar value is associated with the Low + Point, and the maximum scalar value is associated with the High Point. + The scalar value for each point in the data set is determined by the + location along the line to which that point projects. + + The line can be specified interactively using the 3D line widget. See + section 7.4 for more information about this widget. + + + + + + + + + + + + + + + + + + + Define one end of the line (small scalar values). Default is (0,0,0). + + + + + + + + + + + Define other end of the line (large scalar values). Default is (0,0,1). + + + + + + + + + + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtk.module paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtk.module --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtk.module 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtk.module 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,6 @@ +NAME + ElevationFilters +DEPENDS + VTK::FiltersCore +PRIVATE_DEPENDS + VTK::CommonCore diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.cxx --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,31 @@ +/*========================================================================= + + Program: ParaView + Module: vtkMyElevationFilter.cxx + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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 "vtkMyElevationFilter.h" + +#include + +vtkStandardNewMacro(vtkMyElevationFilter); + +//---------------------------------------------------------------------------- +vtkMyElevationFilter::vtkMyElevationFilter() = default; + +//---------------------------------------------------------------------------- +vtkMyElevationFilter::~vtkMyElevationFilter() = default; + +//---------------------------------------------------------------------------- +void vtkMyElevationFilter::PrintSelf(ostream& os, vtkIndent indent) +{ + this->Superclass::PrintSelf(os, indent); +} diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.h --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/ElevationFilters/vtkMyElevationFilter.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,46 @@ +/*========================================================================= + + Program: ParaView + Module: vtkMyElevationFilter.h + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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. + +=========================================================================*/ +// .NAME vtkMyElevationFilter - generate scalars along a specified direction +// .SECTION Description +// vtkMyElevationFilter is a filter to generate scalar values from a +// dataset. The scalar values lie within a user specified range, and +// are generated by computing a projection of each dataset point onto +// a line. The line can be oriented arbitrarily. A typical example is +// to generate scalars based on elevation or height above a plane. + +#ifndef vtkMyElevationFilter_h +#define vtkMyElevationFilter_h + +#include + +#include "ElevationFiltersModule.h" // for export macro + +class ELEVATIONFILTERS_EXPORT vtkMyElevationFilter : public vtkElevationFilter +{ +public: + static vtkMyElevationFilter* New(); + vtkTypeMacro(vtkMyElevationFilter, vtkElevationFilter); + void PrintSelf(ostream& os, vtkIndent indent) override; + +protected: + vtkMyElevationFilter(); + ~vtkMyElevationFilter(); + +private: + vtkMyElevationFilter(const vtkMyElevationFilter&) = delete; + void operator=(const vtkMyElevationFilter&) = delete; +}; + +#endif diff -Nru paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/paraview.plugin paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/paraview.plugin --- paraview-5.10.1/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/paraview.plugin 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/SimpleParaView/plugins/SimpleParaViewCustomFilters/paraview.plugin 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,8 @@ +NAME + SimpleParaViewCustomFilters +DESCRIPTION + An example paraview plugin to be loaded in SimpleParaview + Copied from ElevationFilters example +REQUIRES_MODULES + VTK::CommonCore + VTK::FiltersCore diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/CMakeLists.txt --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,61 +1,41 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.8) project(SpreadSheet) find_package(ParaView REQUIRED) -include(${PARAVIEW_USE_FILE}) + if (NOT PARAVIEW_USE_QT) - message(FATAL_ERROR + message(STATUS "Skipping example: ${CMAKE_PROJECT_NAME} example requires PARAVIEW_USE_QT " "to be enabled. Please rebuild ParaView (or point to a different build of " "ParaView) with PARAVIEW_USE_QT set to TRUE") + return () endif() -# Set a consistent MACOSX_RPATH default across all CMake versions. -# When CMake 2.8.12 is required, change this default to 1. -# When CMake 3.0.0 is required, remove this block (see CMP0042). -if(NOT DEFINED CMAKE_MACOSX_RPATH) - set(CMAKE_MACOSX_RPATH 0) -endif() - -# Variables that need to be set for installation code to work correctly. -SET (BUILD_SHARED_LIBS ${PARAVIEW_BUILD_SHARED_LIBS}) # enable shared builds. - -SET (SOURCE_FILES +include(GNUInstallDirs) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") + +set(CMAKE_AUTOMOC 1) +set(CMAKE_AUTOUIC 1) + +set(sources + pqSpreadsheetLoadDataReaction.cxx + pqSpreadsheetLoadDataReaction.h SpreadSheetMainWindow.cxx - SpreadSheetMainWindow.h -) - -pv_qt_wrap_cpp(MOC_SRCS SpreadSheetMainWindow.h) -pv_qt_wrap_ui(UI_BUILT_SOURCES SpreadSheetMainWindow.ui) - -########################################################################## -## Add resources (icons etc.) -SET (UI_RESOURCES - SpreadSheet.qrc -) - -pv_qt_add_resources(RCS_BUILT_SOURCES ${UI_RESOURCES}) - -SOURCE_GROUP("Resources" FILES - ${UI_RESOURCES}) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) - - -#------------------------------------------------------------------------------ -include(ParaViewBranding) - -# Build the client -build_paraview_client(spreadsheet - TITLE "Raw Data Viewer (ParaView-based Example Application)" - ORGANIZATION "Kitware Inc" - VERSION_MAJOR 1 - VERSION_MINOR 0 - VERSION_PATCH 0 - PVMAIN_WINDOW SpreadSheetMainWindow - PVMAIN_WINDOW_INCLUDE SpreadSheetMainWindow.h - GUI_CONFIGURATION_XMLS - ${CMAKE_CURRENT_SOURCE_DIR}/SupportedReader.xml - SOURCES ${SOURCE_FILES} ${MOC_SRCS} ${UI_BUILT_SOURCES} ${RCS_BUILT_SOURCES} -) + SpreadSheetMainWindow.h) +set(ui_files + SpreadSheetMainWindow.ui) + +# The main cmake macro to create a paraview based application +paraview_client_add( + NAME spreadsheet_paraview + VERSION "1.0.1" + SOURCES ${sources} ${ui_files} + MAIN_WINDOW_CLASS SpreadSheetMainWindow + ORGANIZATION "Kitware SAS." + TITLE "Spreadsheet ParaView") + +target_link_libraries(spreadsheet_paraview + PRIVATE + ParaView::RemotingSettings) diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.cxx --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,53 @@ +/*========================================================================= + + Program: ParaView + Module: pqSpreadsheetLoadDataReaction.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqSpreadsheetLoadDataReaction.h" + +#include + +//----------------------------------------------------------------------------- +pqSpreadsheetLoadDataReaction::pqSpreadsheetLoadDataReaction(QAction* parentObject) + : Superclass(parentObject) +{ +} + +//----------------------------------------------------------------------------- +void pqSpreadsheetLoadDataReaction::onTriggered() +{ + ReaderSet readerSet{ { "sources", "XMLPolyDataReader" }, { "sources", "LegacyVTKFileReader" }, + { "sources", "PVDReader" } }; + QList sources = pqLoadDataReaction::loadData(readerSet); + + Q_FOREACH (pqPipelineSource* source, sources) + { + Q_EMIT this->loadedData(source); + } +} diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.h --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/pqSpreadsheetLoadDataReaction.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,55 @@ +/*========================================================================= + + Program: ParaView + Module: pqSpreadsheetLoadDataReaction.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqSpreadsheetLoadDataReaction_h +#define pqSpreadsheetLoadDataReaction_h + +#include + +/** + * A Load data reaction loading only .vtp, .pvd and .vtk. + */ +class pqSpreadsheetLoadDataReaction : public pqLoadDataReaction +{ + Q_OBJECT + typedef pqLoadDataReaction Superclass; + +public: + pqSpreadsheetLoadDataReaction(QAction* parent); + +protected: + void onTriggered() override; + +private: + Q_DISABLE_COPY(pqSpreadsheetLoadDataReaction) +}; + +#endif diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/README.txt paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/README.txt --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/README.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -This example demonstrates how to use the ParaView application framework for -developing custom applications with work-flow different from that of ParaView's. - -This is a simple spreadsheet application that can be used to inspect raw data. -The user loads a supported datafile and we immediately allow the user to look at -the data attributes. - -This example demonstrates the following: -* Building user inferface by subclassing QMainWindow - - Interface does not use pipeline-browser/object-inspector framework at at - all. -* Unlike standard ParaView, we are not allowing user to split views or create - different types of views i.e. the central widget in the MainWindow is - custom-built. diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.cxx paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.cxx --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -32,32 +32,41 @@ #include "SpreadSheetMainWindow.h" #include "ui_SpreadSheetMainWindow.h" -#include "pqActiveObjects.h" -#include "pqAlwaysConnectedBehavior.h" -#include "pqApplicationCore.h" -#include "pqLoadDataReaction.h" -#include "pqObjectBuilder.h" -#include "pqOutputPort.h" -#include "pqPersistentMainWindowStateBehavior.h" -#include "pqPipelineSource.h" -#include "pqRecentFilesMenu.h" -#include "pqSpreadSheetView.h" -#include "pqSpreadSheetViewDecorator.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pqSpreadsheetLoadDataReaction.h" + +//----------------------------------------------------------------------------- +class SpreadSheetMainWindow::pqInternals : public Ui::pqClientMainWindow +{ +}; //----------------------------------------------------------------------------- -SpreadSheetMainWindow::SpreadSheetMainWindow(QWidget* parentObject, Qt::WindowFlags wflags) - : Superclass(parentObject, wflags) +SpreadSheetMainWindow::SpreadSheetMainWindow() + : Internals(new pqInternals()) { - Ui::SpreadSheetMainWindow ui; - ui.setupUi(this); + // Setup default GUI layout. + this->Internals->setupUi(this); - // Define default behaviors - create only small subset, since this application - // is not really a ParaView-like application at all. - new pqAlwaysConnectedBehavior(this); - new pqPersistentMainWindowStateBehavior(this); + // Create a custom file menu with only Open and close + QList qa = this->Internals->menu_File->actions(); + QAction* mqa = qa.at(0); + new pqSpreadsheetLoadDataReaction(mqa); + new pqRecentFilesMenu(*this->Internals->menuRecent_Files, this->Internals->menuRecent_Files); + QObject::connect( + qa.at(2), SIGNAL(triggered()), QApplication::instance(), SLOT(closeAllWindows())); + + new pqParaViewBehaviors(this, this); - /// We do need the recent files menu, so set it up. - new pqRecentFilesMenu(*ui.menuRecent_Datasets, ui.menuRecent_Datasets); + // Use auto apply to show data automatically + vtkPVGeneralSettings::GetInstance()->SetAutoApply(true); // Create spread-sheet view and set it as the central Widget. pqSpreadSheetView* view = @@ -65,33 +74,7 @@ pqSpreadSheetView::spreadsheetViewType(), pqActiveObjects::instance().activeServer())); this->setCentralWidget(view->widget()); new pqSpreadSheetViewDecorator(view); - - pqActiveObjects::instance().setActiveView(view); - - // Reactions - new pqLoadDataReaction(ui.action_Open_Dataset); - QObject::connect( - ui.action_Exit, SIGNAL(triggered()), pqApplicationCore::instance(), SLOT(quit())); - - // We need to destroy the previously opened source and show the new one - // every time a new source is created. - QObject::connect(pqApplicationCore::instance()->getObjectBuilder(), - SIGNAL(sourceCreated(pqPipelineSource*)), this, SLOT(showData(pqPipelineSource*))); } //----------------------------------------------------------------------------- SpreadSheetMainWindow::~SpreadSheetMainWindow() = default; - -//----------------------------------------------------------------------------- -void SpreadSheetMainWindow::showData(pqPipelineSource* source) -{ - pqActiveObjects& activeObjects = pqActiveObjects::instance(); - - if (activeObjects.activeSource()) - { - pqApplicationCore::instance()->getObjectBuilder()->destroy(activeObjects.activeSource()); - } - activeObjects.setActiveSource(source); - pqApplicationCore::instance()->getDisplayPolicy()->setRepresentationVisibility( - source->getOutputPort(0), activeObjects.activeView(), true); -} diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.h paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.h --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.h 2022-09-01 19:52:20.000000000 +0000 @@ -1,7 +1,7 @@ /*========================================================================= Program: ParaView - Module: SpreadSheetMainWindow.h + Module: SpreadSheetMainWindow.h Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. All rights reserved. @@ -31,24 +31,27 @@ ========================================================================*/ #ifndef SpreadSheetMainWindow_h #define SpreadSheetMainWindow_h -#include -class pqPipelineSource; +#include +#include +/** + * An example of a paraview main window showing only data in a spreadsheet. + */ class SpreadSheetMainWindow : public QMainWindow { Q_OBJECT typedef QMainWindow Superclass; public: - SpreadSheetMainWindow(QWidget* parent = 0, Qt::WindowFlags flags = 0); - ~SpreadSheetMainWindow(); - -protected Q_SLOTS: - void showData(pqPipelineSource*); + SpreadSheetMainWindow(); + ~SpreadSheetMainWindow() override; private: Q_DISABLE_COPY(SpreadSheetMainWindow) + + class pqInternals; + QScopedPointer Internals; }; #endif diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.ui paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.ui --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.ui 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheetMainWindow.ui 2022-09-01 19:52:20.000000000 +0000 @@ -1,75 +1,68 @@ - SpreadSheetMainWindow - + pqClientMainWindow + 0 0 - 559 - 518 + 970 + 700 MainWindow - - - :/SpreadSheet_Icons/ss_icon.png:/SpreadSheet_Icons/ss_icon.png - 0 0 - 559 - 26 + 970 + 19 - + - &File + Recent Files - - - Recent Datasets - - - - - - + - &Help + &File + + + - - - + - &Open Dataset - - - - - &Exit - - - Ctrl+Q + Open - + - fo + Quit + - - - + + + pqStatusBar + QStatusBar +
pqStatusBar.h
+ + + pqViewManager + QWidget +
pqViewManager.h
+ 1 + + + diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheet.qrc paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheet.qrc --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SpreadSheet.qrc 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SpreadSheet.qrc 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - - - ss_icon.png - - Binary files /tmp/tmp0l0mjshu/fHU049Mzb1/paraview-5.10.1/Examples/CustomApplications/Spreadsheet/ss_icon.png and /tmp/tmp0l0mjshu/lSFwnZM_LD/paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/ss_icon.png differ diff -Nru paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SupportedReader.xml paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SupportedReader.xml --- paraview-5.10.1/Examples/CustomApplications/Spreadsheet/SupportedReader.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/CustomApplications/Spreadsheet/SupportedReader.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ - - - - - diff -Nru paraview-5.10.1/Examples/Plugins/AddPQProxy/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/AddPQProxy/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/AddPQProxy/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/AddPQProxy/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -17,6 +17,8 @@ ${proxy_sources}) paraview_add_plugin(AddPQProxy + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" XML_DOCUMENTATION OFF SERVER_MANAGER_XML AddPQProxy.xml diff -Nru paraview-5.10.1/Examples/Plugins/AddToProxyGroupXMLOnly/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/AddToProxyGroupXMLOnly/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/AddToProxyGroupXMLOnly/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/AddToProxyGroupXMLOnly/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(AddToProxyGroupXMLOnly - VERSION "1.0" + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER + VERSION "1.0" SERVER_MANAGER_XML AddToProxyGroupXMLOnly.xml) diff -Nru paraview-5.10.1/Examples/Plugins/Autostart/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/Autostart/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/Autostart/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/Autostart/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -15,6 +15,7 @@ ${autostart_sources}) paraview_add_plugin(Autostart + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources}) diff -Nru paraview-5.10.1/Examples/Plugins/ComplexPluginArchitecture/ComplexGUIMyToolBar/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ComplexPluginArchitecture/ComplexGUIMyToolBar/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ComplexPluginArchitecture/ComplexGUIMyToolBar/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ComplexPluginArchitecture/ComplexGUIMyToolBar/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -13,6 +13,7 @@ ${toolbar_sources}) paraview_add_plugin(ComplexGUIMyToolBar + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources}) diff -Nru paraview-5.10.1/Examples/Plugins/ComplexPluginArchitecture/ComplexModuleArchitecture/ParaViewPlugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ComplexPluginArchitecture/ComplexModuleArchitecture/ParaViewPlugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ComplexPluginArchitecture/ComplexModuleArchitecture/ParaViewPlugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ComplexPluginArchitecture/ComplexModuleArchitecture/ParaViewPlugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,16 +1,18 @@ paraview_add_plugin(ComplexModuleArchitecture + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" SERVER_MANAGER_XML filters.xml MODULES ComplexPluginArchitecture::Shared - ComplexModuleArchitecture::Core + ComplexModuleArchitecture::Core ComplexModuleArchitecture::Filters - MODULE_FILES + MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../Core/vtk.module" "${CMAKE_CURRENT_SOURCE_DIR}/../Filters/vtk.module") -target_link_libraries(ComplexModuleArchitecture - PRIVATE - ComplexPluginArchitecture::Shared - ComplexModuleArchitecture::Core - ComplexModuleArchitecture::Filters) +target_link_libraries(ComplexModuleArchitecture + PRIVATE + ComplexPluginArchitecture::Shared + ComplexModuleArchitecture::Core + ComplexModuleArchitecture::Filters) diff -Nru paraview-5.10.1/Examples/Plugins/ContextMenu/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ContextMenu/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ContextMenu/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ContextMenu/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -7,6 +7,7 @@ ) paraview_add_plugin(ContextMenu + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources} diff -Nru paraview-5.10.1/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -21,6 +21,7 @@ "${CMAKE_CURRENT_SOURCE_DIR}/UIs") paraview_add_plugin(ExampleDockPanel + REQUIRED_ON_CLIENT VERSION "1.0" UI_FILES UIs/ExampleDockPanel.ui UI_INTERFACES ${interfaces} diff -Nru paraview-5.10.1/Examples/Plugins/DynamicInitializer/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/DynamicInitializer/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,32 @@ +cmake_minimum_required(VERSION 3.8) +project(DynamicInitializer) + +find_package(ParaView REQUIRED) + +option(BUILD_SHARED_LIBS "Build shared libraries" ON) + +include(GNUInstallDirs) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") + +set("_paraview_plugin_default_${CMAKE_PROJECT_NAME}" ON) +paraview_plugin_scan( + PLUGIN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Plugin/paraview.plugin" + PROVIDES_PLUGINS plugins + REQUIRES_MODULES required_modules) + +foreach (module IN LISTS required_modules) + if (NOT TARGET "${module}") + message(#FATAL_ERROR + "Skipping example ${CMAKE_PROJECT_NAME}: Missing required module: " + "${module}") + return () + endif () +endforeach () + +paraview_plugin_build( + RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY_SUBDIRECTORY "${PARAVIEW_PLUGIN_SUBDIR}" + PLUGINS ${plugins}) diff -Nru paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,12 @@ +set(sources + Initializer.h + Initializer.cxx +) + +paraview_add_plugin(DynamicInitializer + REQUIRED_ON_CLIENT + VERSION "1.0" + INITIALIZERS run_me # Function to call upon load + EXTRA_INCLUDES Initializer.h # Header declaring function + SOURCES ${sources} +) diff -Nru paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/Initializer.cxx paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/Initializer.cxx --- paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/Initializer.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/Initializer.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,34 @@ +/*========================================================================= + + Program: ParaView + Module: Initializer.cxx + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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 "Initializer.h" + +#include +#include + +/// We cannot guarantee that static initializers will be invoked on +/// all platforms, so instead we provide a function (run_me) that +/// initializes the variable. +/// +/// In practice, this variable is usually initialized with a value +/// provided by a third-party library as a result of registering +/// some new functionality that will affect the user interface +/// through code outside the plugin. +static std::shared_ptr example; + +void run_me() +{ + std::cout << "Running dynamic initializer for \"example\"\n"; + example = std::make_shared(42); +} diff -Nru paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/Initializer.h paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/Initializer.h --- paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/Initializer.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/Initializer.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,30 @@ +/*========================================================================= + + Program: ParaView + Module: Initializer.h + + Copyright (c) Kitware, Inc. + All rights reserved. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html 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. + +=========================================================================*/ +/** + * @class Initializer + * + * This header demonstrates how to guarantee the initialization of a + * static variable (in Initializer.cxx) upon plugin load, even when + * an operating system performs lazy evaluation of static variables + * (i.e., avoids initialization until they are first referenced). To + * ensure the variable is initialized, we have the plugin call a + * function to dynamically initialize the variable. + */ +#ifndef PluginDynamicInitializer_h +#define PluginDynamicInitializer_h + +void run_me(); + +#endif diff -Nru paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/paraview.plugin paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/paraview.plugin --- paraview-5.10.1/Examples/Plugins/DynamicInitializer/Plugin/paraview.plugin 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/DynamicInitializer/Plugin/paraview.plugin 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,8 @@ +NAME + DynamicInitializer +DESCRIPTION + An example dynamic-initializer plugin. This type of plugin is + useful if the plugin only includes side effects (such as registering + new classes with existing third-party libraries). +REQUIRES_MODULES + ParaView::RemotingCore diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -14,6 +14,8 @@ ") paraview_add_plugin(ElevationFilter + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Documentation" DOCUMENTATION_ADD_PATTERNS diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/MyElevationFilter.xml paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/MyElevationFilter.xml --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/MyElevationFilter.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/MyElevationFilter.xml 2022-09-01 19:52:20.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.cxx paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.cxx --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -1,11 +1,11 @@ /*========================================================================= - Program: Visualization Toolkit + Program: ParaView Module: vtkMyElevationFilter.cxx - Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen + Copyright (c) Kitware, Inc. All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -14,7 +14,7 @@ =========================================================================*/ #include "vtkMyElevationFilter.h" -#include "vtkObjectFactory.h" +#include vtkStandardNewMacro(vtkMyElevationFilter); diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.h paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.h --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.h 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/ElevationFilters/vtkMyElevationFilter.h 2022-09-01 19:52:20.000000000 +0000 @@ -1,11 +1,11 @@ /*========================================================================= - Program: Visualization Toolkit + Program: ParaView Module: vtkMyElevationFilter.h - Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen + Copyright (c) Kitware, Inc. All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. + See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -23,8 +23,9 @@ #ifndef vtkMyElevationFilter_h #define vtkMyElevationFilter_h +#include + #include "ElevationFiltersModule.h" // for export macro -#include "vtkElevationFilter.h" class ELEVATIONFILTERS_EXPORT vtkMyElevationFilter : public vtkElevationFilter { diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/Testing/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,10 +1,14 @@ +# This tests shows how to use either +# inline compares and baseline compares if (TARGET ParaView::paraview) + set(DATA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/Data) set (TestXML_USES_DIRECT_DATA ON) paraview_add_client_tests( LOAD_PLUGIN ElevationFilter PLUGIN_PATH $ BASELINE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline TEST_SCRIPTS TestXML.xml) + set_tests_properties(pv.TestXML PROPERTIES ENVIRONMENT "PARAVIEW_DATA_ROOT=${DATA_ROOT}") endif() if (PARAVIEW_USE_PYTHON) diff -Nru paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/Testing/TestXML.xml paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/Testing/TestXML.xml --- paraview-5.10.1/Examples/Plugins/ElevationFilter/Plugin/Testing/TestXML.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ElevationFilter/Plugin/Testing/TestXML.xml 2022-09-01 19:52:20.000000000 +0000 @@ -8,4 +8,5 @@ + diff -Nru paraview-5.10.1/Examples/Plugins/GUIMyToolBar/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/GUIMyToolBar/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/GUIMyToolBar/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/GUIMyToolBar/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -26,6 +26,7 @@ ${toolbar_sources}) paraview_add_plugin(GUIMyToolBar + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources}) diff -Nru paraview-5.10.1/Examples/Plugins/LagrangianIntegrationModel/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/LagrangianIntegrationModel/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/LagrangianIntegrationModel/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/LagrangianIntegrationModel/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,6 @@ paraview_add_plugin(LagrangianIntegrationModel + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" MODULES LagrangianExample MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/LagrangianExample/vtk.module") diff -Nru paraview-5.10.1/Examples/Plugins/MyPNGReader/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/MyPNGReader/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/MyPNGReader/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/MyPNGReader/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -4,6 +4,8 @@ # but gives it another identity in the Server Manager. Adding your own reader # to ParaView would mean the SourceProxy class points to your class. paraview_add_plugin(MyPNGReader + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" REQUIRED_ON_SERVER SERVER_MANAGER_XML readers.xml) diff -Nru paraview-5.10.1/Examples/Plugins/MyTiffWriter/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/MyTiffWriter/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/MyTiffWriter/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/MyTiffWriter/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,6 @@ paraview_add_plugin(MyTiffWriter + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" REQUIRED_ON_SERVER SERVER_MANAGER_XML writers.xml) diff -Nru paraview-5.10.1/Examples/Plugins/OverrideXMLOnly/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/OverrideXMLOnly/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/OverrideXMLOnly/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/OverrideXMLOnly/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(OverrideXMLOnly + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER VERSION "1.0" SERVER_MANAGER_XML OverrideXMLOnly.xml diff -Nru paraview-5.10.1/Examples/Plugins/PropertyWidgets/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/PropertyWidgets/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/PropertyWidgets/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/PropertyWidgets/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -41,6 +41,7 @@ ${property_sources}) paraview_add_plugin(PropertyWidgets + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources} diff -Nru paraview-5.10.1/Examples/Plugins/PythonOnlyExample/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/PythonOnlyExample/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,37 @@ +if (PARAVIEW_USE_PYTHON) + set(python_modules + helloworld.py + ) + + paraview_add_plugin( + PythonOnlyExample + REQUIRED_ON_SERVER + REQUIRED_ON_CLIENT + VERSION "1.0" + PYTHON_MODULES ${python_modules} + ) + + set(python_copied_modules) + foreach (python_file IN LISTS python_modules) + set(output_python_file + "${CMAKE_BINARY_DIR}/${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}/${python_file}") + add_custom_command( + OUTPUT "${output_python_file}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${python_file}" + COMMAND "${CMAKE_COMMAND}" -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/${python_file}" + "${output_python_file}" + COMMENT "Copying ${python_file} to the binary directory") + get_filename_component(python_file_directory "${python_file}" DIRECTORY) + install( + FILES "${python_file}" + DESTINATION "${PARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX}/${python_file_directory}" + COMPONENT "python" + ) + list(APPEND python_copied_modules "${output_python_file}") + endforeach () + add_custom_target(PythonOnlyExample_copy ALL + DEPENDS + ${python_copied_modules} + ) +endif() diff -Nru paraview-5.10.1/Examples/Plugins/PythonOnlyExample/helloworld.py paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/helloworld.py --- paraview-5.10.1/Examples/Plugins/PythonOnlyExample/helloworld.py 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/helloworld.py 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,29 @@ +from paraview.util.vtkAlgorithm import * + +@smproxy.filter() +@smproperty.input(name="Input") +@smdomain.datatype(dataTypes=["vtkDataSet"], composite_data_supported=False) +class PreserveInputTypeFilter(VTKPythonAlgorithmBase): + """ + Example filter demonstrating how to write a filter that preserves the input + dataset type. + """ + def __init__(self): + super().__init__(nInputPorts=1, nOutputPorts=1, outputType="vtkDataSet") + + def RequestDataObject(self, request, inInfo, outInfo): + inData = self.GetInputData(inInfo, 0, 0) + outData = self.GetOutputData(outInfo, 0) + assert inData is not None + if outData is None or (not outData.IsA(inData.GetClassName())): + outData = inData.NewInstance() + outInfo.GetInformationObject(0).Set(outData.DATA_OBJECT(), outData) + return super().RequestDataObject(request, inInfo, outInfo) + + def RequestData(self, request, inInfo, outInfo): + inData = self.GetInputData(inInfo, 0, 0) + outData = self.GetOutputData(outInfo, 0) + print("input type =", inData.GetClassName()) + print("output type =", outData.GetClassName()) + assert outData.IsA(inData.GetClassName()) + return 1 diff -Nru paraview-5.10.1/Examples/Plugins/PythonOnlyExample/paraview.plugin paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/paraview.plugin --- paraview-5.10.1/Examples/Plugins/PythonOnlyExample/paraview.plugin 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/paraview.plugin 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,6 @@ +NAME + PythonOnlyExample +DESCRIPTION + Example python-only plugin. +REQUIRES_MODULES + VTK::CommonCore diff -Nru paraview-5.10.1/Examples/Plugins/PythonOnlyExample/readme.md paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/readme.md --- paraview-5.10.1/Examples/Plugins/PythonOnlyExample/readme.md 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/PythonOnlyExample/readme.md 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,3 @@ +# PythonOnlyExample plugin + +Simple example of a python-only plugin for ParaView diff -Nru paraview-5.10.1/Examples/Plugins/ReaderXMLOnly/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/ReaderXMLOnly/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/ReaderXMLOnly/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/ReaderXMLOnly/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(ReaderXMLOnly VERSION "1.0" + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER SERVER_MANAGER_XML ReaderXMLOnly.xml) diff -Nru paraview-5.10.1/Examples/Plugins/Representation/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/Representation/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/Representation/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/Representation/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,6 @@ paraview_add_plugin(Representation + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" MODULES GeometryRepresentations MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/GeometryRepresentations/vtk.module" diff -Nru paraview-5.10.1/Examples/Plugins/RepresentationBehavior/pqSurfaceRepresentationBehavior.cxx paraview-5.11.0~rc1+dfsg/Examples/Plugins/RepresentationBehavior/pqSurfaceRepresentationBehavior.cxx --- paraview-5.10.1/Examples/Plugins/RepresentationBehavior/pqSurfaceRepresentationBehavior.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/RepresentationBehavior/pqSurfaceRepresentationBehavior.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -76,7 +76,7 @@ // Set a representation type based on a priority int priority = 0; std::string finalValue; - foreach (QVariant v, list) + Q_FOREACH (QVariant v, list) { if (v.toString() == "Surface" && priority < 1) { diff -Nru paraview-5.10.1/Examples/Plugins/SMMyProxy/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/SMMyProxy/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/SMMyProxy/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/SMMyProxy/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,6 @@ paraview_add_plugin(SMMyProxy + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" MODULES MyProxy MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/MyProxy/vtk.module" diff -Nru paraview-5.10.1/Examples/Plugins/SMParametricSource/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/SMParametricSource/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/SMParametricSource/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/SMParametricSource/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,3 +1,5 @@ paraview_add_plugin(SMParametricSource + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.0" SERVER_MANAGER_XML ParametricSource.xml) diff -Nru paraview-5.10.1/Examples/Plugins/SourceToolbar/Plugin/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Examples/Plugins/SourceToolbar/Plugin/CMakeLists.txt --- paraview-5.10.1/Examples/Plugins/SourceToolbar/Plugin/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Examples/Plugins/SourceToolbar/Plugin/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -14,6 +14,7 @@ ${action_sources}) paraview_add_plugin(SourceToolbar + REQUIRED_ON_CLIENT VERSION "1.0" UI_INTERFACES ${interfaces} SOURCES ${sources}) diff -Nru paraview-5.10.1/Plugins/AcceleratedAlgorithms/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/AcceleratedAlgorithms/CMakeLists.txt --- paraview-5.10.1/Plugins/AcceleratedAlgorithms/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AcceleratedAlgorithms/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(AcceleratedAlgorithms + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER VERSION "1.0" SERVER_MANAGER_XML AcceleratedAlgorithms.xml) diff -Nru paraview-5.10.1/Plugins/AdiosReaderPixie/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/AdiosReaderPixie/CMakeLists.txt --- paraview-5.10.1/Plugins/AdiosReaderPixie/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AdiosReaderPixie/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -2,6 +2,8 @@ "${CMAKE_CURRENT_SOURCE_DIR}/cmake") paraview_add_plugin(AdiosReaderPixie + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.4" MODULES AdiosReaderPixie::Pixie MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Pixie/vtk.module") diff -Nru paraview-5.10.1/Plugins/AdiosReaderStaging/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/AdiosReaderStaging/CMakeLists.txt --- paraview-5.10.1/Plugins/AdiosReaderStaging/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AdiosReaderStaging/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -2,6 +2,8 @@ "${CMAKE_CURRENT_SOURCE_DIR}/cmake") paraview_add_plugin(AdiosReaderStaging + REQUIRED_ON_CLIENT + REQUIRED_ON_SERVER VERSION "1.4" MODULES AdiosReaderStaging::Staging MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Staging/vtk.module") diff -Nru paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/CMakeLists.txt --- paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(AnalyzeNIfTIReaderWriter + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER VERSION "1.0" MODULES AnalyzeNIfTIIO::NIfTIIO diff -Nru paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/.gitattributes paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/.gitattributes --- paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/.gitattributes 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/.gitattributes 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -vtknifti1* -format.clang-format -vtkznzlib* -format.clang-format diff -Nru paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/ThirdParty/.clang-tidy paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/ThirdParty/.clang-tidy --- paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/ThirdParty/.clang-tidy 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/ThirdParty/.clang-tidy 2022-09-01 19:52:20.000000000 +0000 @@ -4,6 +4,8 @@ Checks: "-*,\ bugprone-*,\ -bugprone-branch-clone,\ +-bugprone-easily-swappable-parameters,\ +-bugprone-implicit-widening-of-multiplication-result,\ -bugprone-narrowing-conversions,\ -bugprone-not-null-terminated-result,\ -bugprone-reserved-identifier,\ diff -Nru paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/Testing/AnalyzeReaderWriterPlugin.xml paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/Testing/AnalyzeReaderWriterPlugin.xml --- paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/Testing/AnalyzeReaderWriterPlugin.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/Testing/AnalyzeReaderWriterPlugin.xml 2022-09-01 19:52:20.000000000 +0000 @@ -5,6 +5,7 @@ + diff -Nru paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/Testing/NiftiReaderWriterPlugin.xml paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/Testing/NiftiReaderWriterPlugin.xml --- paraview-5.10.1/Plugins/AnalyzeNIfTIReaderWriter/Testing/NiftiReaderWriterPlugin.xml 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/AnalyzeNIfTIReaderWriter/Testing/NiftiReaderWriterPlugin.xml 2022-09-01 19:52:20.000000000 +0000 @@ -4,6 +4,7 @@ + diff -Nru paraview-5.10.1/Plugins/ArrowGlyph/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/ArrowGlyph/CMakeLists.txt --- paraview-5.10.1/Plugins/ArrowGlyph/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/ArrowGlyph/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -1,4 +1,5 @@ paraview_add_plugin(ArrowGlyph + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER VERSION "1.0" MODULES ArrowGlyph::ArrowGlyphFilter diff -Nru paraview-5.10.1/Plugins/BagPlotViewsAndFilters/BagPlot/vtkPVBagChartRepresentation.cxx paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/BagPlot/vtkPVBagChartRepresentation.cxx --- paraview-5.10.1/Plugins/BagPlotViewsAndFilters/BagPlot/vtkPVBagChartRepresentation.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/BagPlot/vtkPVBagChartRepresentation.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -332,7 +332,7 @@ p50LinePlot->GetPen()->SetWidth(this->GridLineThickness); p50LinePlot->GetPen()->SetLineType(this->GridLineStyle); - p50LinePlot->SetColor(this->P50Color[0], this->P50Color[1], this->P50Color[2]); + p50LinePlot->SetColorF(this->P50Color[0], this->P50Color[1], this->P50Color[2]); p50LinePlot->SetOpacity(this->Opacity); vtkNew pUserContour; @@ -347,7 +347,7 @@ pUserLinePlot->GetPen()->SetWidth(this->GridLineThickness); pUserLinePlot->GetPen()->SetLineType(this->GridLineStyle); - pUserLinePlot->SetColor(this->PUserColor[0], this->PUserColor[1], this->PUserColor[2]); + pUserLinePlot->SetColorF(this->PUserColor[0], this->PUserColor[1], this->PUserColor[2]); pUserLinePlot->SetOpacity(this->Opacity); p50LinePlot->SetVisible(medianTable->GetNumberOfRows() >= 2); diff -Nru paraview-5.10.1/Plugins/BagPlotViewsAndFilters/BagPlot/vtkSMFunctionalBagChartSeriesSelectionDomain.cxx paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/BagPlot/vtkSMFunctionalBagChartSeriesSelectionDomain.cxx --- paraview-5.10.1/Plugins/BagPlotViewsAndFilters/BagPlot/vtkSMFunctionalBagChartSeriesSelectionDomain.cxx 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/BagPlot/vtkSMFunctionalBagChartSeriesSelectionDomain.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -63,7 +63,7 @@ else if (vtksys::SystemTools::StringEndsWith(name, "_median")) { vtksys::SystemTools::ReplaceString(name, "_median", ""); - name = "Median (" + name + ")"; + name = "Higher density (" + name + ")"; } values.push_back(name.c_str()); return values; diff -Nru paraview-5.10.1/Plugins/BagPlotViewsAndFilters/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/CMakeLists.txt --- paraview-5.10.1/Plugins/BagPlotViewsAndFilters/CMakeLists.txt 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -6,6 +6,7 @@ endif () paraview_add_plugin(BagPlotViewsAndFilters + REQUIRED_ON_CLIENT REQUIRED_ON_SERVER VERSION "1.0" SERVER_MANAGER_XML BagPlotViewsAndFilters.xml diff -Nru paraview-5.10.1/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView_A.png.sha512 paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView_A.png.sha512 --- paraview-5.10.1/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView_A.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView_A.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -e44475b6f4f05c57aeda3319b0b557eafc47b4236a283a1cc15b15fda48c344587442ac2584a2c38434e1ab9760a249f5457fdf4cfc9dbfe30ae47ff17516cd0 +b79cb543837dabbda8d69eb6f37fa9e8227319bdef828f94e78fbea6464d3b2cf099300a48c1d97a6ed229839c8b645c973b585bdc3061a9a613f2e03a0bfffd diff -Nru paraview-5.10.1/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView.png.sha512 paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView.png.sha512 --- paraview-5.10.1/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView.png.sha512 2022-03-18 12:18:58.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/BagPlotViewsAndFilters/Testing/Data/Baseline/BagPlotMatrixView.png.sha512 2022-09-01 19:52:20.000000000 +0000 @@ -1 +1 @@ -76def5b99091252ba360420e24be9b91bf648042098f04f182578b40b0de7024493f383aef5b83a79cd6d9dec1fa3f4f8e7c43a2c8980bac5f201fc6c1131c41 +976a7f20169ff57e85c1548b4116cf502d713b971fe5cb7840a7b56436df4cd33d41dd58b8d532d5d7deee2fc56ed8523e0bc741a45c0eae5a6f66484720afd1 diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/cmake/FindVRPN.cmake paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/cmake/FindVRPN.cmake --- paraview-5.10.1/Plugins/CAVEInteraction/cmake/FindVRPN.cmake 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/cmake/FindVRPN.cmake 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,60 @@ +find_path(VRPN_INCLUDE_DIR + NAMES vrpn_Tracker.h + DOC "VRPN include directory") +mark_as_advanced(VRPN_INCLUDE_DIR) + +find_library(VRPN_LIBRARY + NAMES vrpn + DOC "VRPN library") +mark_as_advanced(VRPN_LIBRARY) + +set(_vrpn_extra_params) +set(_vrpn_required_vars) + +if (VRPN_LIBRARY) + set(VRPN_INCLUDE_DIRS "${VRPN_INCLUDE_DIR}") + set(VRPN_LIBRARIES "${VRPN_LIBRARY}") + + vtk_detect_library_type(_vrpn_libtype PATH "${VRPN_LIBRARY}") + + if (NOT _vrpn_libtype STREQUAL "SHARED") + # In static mode, one should also link with quat library which is + # built beside vrpn. + find_library(VRPN_QUAT_LIBRARY + NAMES quat + DOC "VRPN quat library") + mark_as_advanced(VRPN_QUAT_LIBRARY) + list(APPEND VRPN_LIBRARIES "${VRPN_QUAT_LIBRARY}") + list(APPEND _vrpn_required_vars "VRPN_QUAT_LIBRARY") + + if (VRPN_QUAT_LIBRARY) + if (NOT TARGET VRPN::QUAT) + add_library(VRPN::QUAT UNKNOWN IMPORTED) + set_target_properties(VRPN::QUAT + PROPERTIES + IMPORTED_LOCATION "${VRPN_QUAT_LIBRARY}") + set(_vrpn_extra_params INTERFACE_LINK_LIBRARIES "VRPN::QUAT") + endif () + endif () + endif () + + if (NOT TARGET VRPN::VRPN) + add_library(VRPN::VRPN UNKNOWN IMPORTED) + set_target_properties(VRPN::VRPN + PROPERTIES + IMPORTED_LOCATION "${VRPN_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${VRPN_INCLUDE_DIR}" + ${_vrpn_extra_params}) + endif () + + unset(_vrpn_libtype) + unset(_vrpn_extra_params) +endif () + +# TODO: Version variable? It appears as though it is only in a +# source file in the repository. +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(VRPN + REQUIRED_VARS VRPN_INCLUDE_DIR VRPN_LIBRARY ${_vrpn_required_vars}) + +unset(_vrpn_required_vars) diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/CMakeLists.txt paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/CMakeLists.txt --- paraview-5.10.1/Plugins/CAVEInteraction/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/CMakeLists.txt 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,142 @@ +find_package(Qt5 QUIET REQUIRED COMPONENTS Network) + +list(INSERT CMAKE_MODULE_PATH 0 + "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +option(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN "Build CAVEInteraction plugin with VRPN support" OFF) +mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) +option(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI "Build CAVEInteraction plugin with VRUI support" OFF) +mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI) + +find_package(Qt5 REQUIRED COMPONENTS Network) + +# TODO: Should something be done with the files in samples/? + +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVVRConfig.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/vtkPVVRConfig.h" + @ONLY) + +set(sources + pqVRAddConnectionDialog.cxx + pqVRAddConnectionDialog.h + pqVRAddStyleDialog.cxx + pqVRAddStyleDialog.h + pqVRConnectionManager.cxx + pqVRConnectionManager.h + pqVRDockPanel.cxx + pqVRDockPanel.h + pqVRQueueHandler.cxx + pqVRQueueHandler.h + pqVRStarter.cxx + pqVRStarter.h + vtkVRControlSliceOrientationStyle.cxx + vtkVRControlSliceOrientationStyle.h + vtkVRControlSlicePositionStyle.cxx + vtkVRControlSlicePositionStyle.h + vtkVRGrabPointStyle.cxx + vtkVRGrabPointStyle.h + vtkVRGrabTransformStyle.cxx + vtkVRGrabTransformStyle.h + vtkVRGrabWorldStyle.cxx + vtkVRGrabWorldStyle.h + vtkVRInteractorStyle.cxx + vtkVRInteractorStyle.h + vtkVRInteractorStyleFactory.cxx + vtkVRInteractorStyleFactory.h + vtkVRMovePointStyle.cxx + vtkVRMovePointStyle.h + vtkVRQueue.cxx + vtkVRQueue.h + vtkVRSkeletonStyle.cxx + vtkVRSkeletonStyle.h + vtkVRSpaceNavigatorGrabWorldStyle.cxx + vtkVRSpaceNavigatorGrabWorldStyle.h + vtkVRStylusStyle.cxx + vtkVRStylusStyle.h + vtkVRTrackStyle.cxx + vtkVRTrackStyle.h + vtkVRVirtualHandStyle.cxx + vtkVRVirtualHandStyle.h + "${CMAKE_CURRENT_BINARY_DIR}/vtkPVVRConfig.h") + + +if (PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) + find_package(VRPN REQUIRED) + list(APPEND sources + pqVRPNConnection.cxx + pqVRPNConnection.h + pqVRPNEventListener.cxx + pqVRPNEventListener.h + vtkVRPNCallBackHandlers.cxx + vtkVRPNCallBackHandlers.h) +endif () + +if (PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI) + list(APPEND sources + pqVRUIConnection.cxx + pqVRUIConnection.h + vtkVRUIPipe.cxx + vtkVRUIPipe.h + vtkVRUIServerState.cxx + vtkVRUIServerState.h + vtkVRUITrackerState.cxx + vtkVRUITrackerState.h) +endif () + +set(ui_files + pqVRAddConnectionDialog.ui + pqVRAddStyleDialog.ui + pqVRDockPanel.ui) + +set(interfaces) +paraview_plugin_add_auto_start( + CLASS_NAME "pqVRStarter" + STARTUP onStartup + SHUTDOWN onShutdown + INTERFACES autostart_interface + SOURCES autostart_sources) +list(APPEND interfaces + ${autostart_interface}) +list(APPEND sources + ${autostart_sources}) + +paraview_plugin_add_dock_window( + CLASS_NAME pqVRDockPanel + DOCK_AREA Left + INTERFACES dock_interfaces + SOURCES dock_sources) +list(APPEND interfaces + ${dock_interfaces}) +list(APPEND sources + ${dock_sources}) + +paraview_add_plugin(CAVEInteraction + REQUIRED_ON_CLIENT + VERSION "1.0" + UI_INTERFACES ${interfaces} + UI_FILES ${ui_files} + SOURCES ${sources}) + +target_include_directories(CAVEInteraction + PRIVATE + "${CMAKE_CURRENT_BINARY_DIR}") + +target_link_libraries(CAVEInteraction + PRIVATE + ParaView::RemotingCore + ParaView::RemotingServerManager + ParaView::RemotingViews + ParaView::pqApplicationComponents + VTK::CommonCore + VTK::CommonMath + VTK::CommonTransforms + VTK::RenderingCore + Qt5::Network) + target_compile_definitions(CAVEInteraction PRIVATE QT_NO_KEYWORDS) + +if (PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) + target_link_libraries(CAVEInteraction + PRIVATE + VRPN::VRPN) +endif () diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/paraview.plugin paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/paraview.plugin --- paraview-5.10.1/Plugins/CAVEInteraction/paraview.plugin 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/paraview.plugin 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,15 @@ +NAME + CAVEInteraction +DESCRIPTION + Interaction with Cave Automatic Virtual Environments +CONDITION + PARAVIEW_USE_QT +REQUIRES_MODULES + ParaView::RemotingCore + ParaView::RemotingServerManager + ParaView::RemotingViews + ParaView::pqApplicationComponents + VTK::CommonCore + VTK::CommonMath + VTK::CommonTransforms + VTK::RenderingCore diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,518 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRAddConnectionDialog.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRAddConnectionDialog.h" +#include "ui_pqVRAddConnectionDialog.h" + +#include "pqVRConnectionManager.h" +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +#include "pqVRPNConnection.h" +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +#include "pqVRUIConnection.h" +#endif + +#include +#include +#include + +#include +#include +#include +#include + +#include + +class pqVRAddConnectionDialog::pqInternals : public Ui::VRAddConnectionDialog +{ +public: + enum InputType + { + Analog = 0, + Button, + Tracker + }; + + std::map AnalogMapping; + std::map ButtonMapping; + std::map TrackerMapping; + + enum ConnectionType + { + None = -1, + VRPN, + VRUI + }; + + ConnectionType Type; + + ConnectionType GetSelectedConnectionType() + { + if (this->connectionType->currentText() == "VRPN") + { + return VRPN; + } + else if (this->connectionType->currentText() == "VRUI") + { + return VRUI; + } + return None; + } + + bool SetSelectedConnectionType(ConnectionType type) + { + switch (type) + { +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + case pqInternals::VRPN: + { + int ind = this->connectionType->findText("VRPN"); + if (ind == -1) + { + return false; + } + this->connectionType->setCurrentIndex(ind); + return true; + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + case pqInternals::VRUI: + { + int ind = this->connectionType->findText("VRUI"); + if (ind == -1) + { + return false; + } + this->connectionType->setCurrentIndex(ind); + return true; + } +#endif + default: + case pqInternals::None: + return false; + } + } + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + pqVRPNConnection* VRPNConn; + void updateVRPNConnection(); +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + pqVRUIConnection* VRUIConn; + void updateVRUIConnection(); +#endif + + /// Given an entry in the listWidget, return a pair: id, name + QPair parseEntry(const QString&); + + void addInput(); + void removeInput(); + + void updateUi(); +}; + +//----------------------------------------------------------------------------- +pqVRAddConnectionDialog::pqVRAddConnectionDialog(QWidget* parentObject, Qt::WindowFlags f) + : Superclass(parentObject, f) + , Internals(new pqInternals()) +{ + this->Internals->setupUi(this); + this->Internals->Type = pqInternals::None; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + this->Internals->VRPNConn = nullptr; + this->Internals->connectionType->addItem("VRPN"); +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + this->Internals->VRUIConn = nullptr; + this->Internals->connectionType->addItem("VRUI"); +#endif + this->connectionTypeChanged(); + + // Restrict input in some line edits + QRegExpValidator* connNameValidator = new QRegExpValidator(QRegExp("[0-9a-zA-Z]+"), this); + QRegExpValidator* addressValidator = + new QRegExpValidator(QRegExp("([0-9a-zA-Z.]+@)?[0-9a-zA-Z.:]+"), this); + QRegExpValidator* inputIdValidator = new QRegExpValidator(QRegExp("[0-9]+"), this); + QRegExpValidator* inputNameValidator = new QRegExpValidator(QRegExp("[0-9a-zA-Z]+"), this); + this->Internals->connectionName->setValidator(connNameValidator); + this->Internals->connectionAddress->setValidator(addressValidator); + this->Internals->inputId->setValidator(inputIdValidator); + this->Internals->inputName->setValidator(inputNameValidator); + + connect(this->Internals->insertInput, SIGNAL(clicked()), this, SLOT(addInput())); + connect(this->Internals->eraseInput, SIGNAL(clicked()), this, SLOT(removeInput())); + connect(this->Internals->connectionType, SIGNAL(currentIndexChanged(int)), this, + SLOT(connectionTypeChanged())); +} + +//----------------------------------------------------------------------------- +pqVRAddConnectionDialog::~pqVRAddConnectionDialog() +{ + delete this->Internals; +} + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::setConnection(pqVRPNConnection* conn) +{ + this->Internals->VRPNConn = conn; + this->Internals->Type = pqInternals::VRPN; + this->Internals->connectionName->setText(QString::fromStdString(conn->name())); + this->Internals->connectionAddress->setText(QString::fromStdString(conn->address())); + this->Internals->SetSelectedConnectionType(pqInternals::VRPN); + this->Internals->connectionType->setEnabled(false); + this->Internals->AnalogMapping = conn->analogMap(); + this->Internals->ButtonMapping = conn->buttonMap(); + this->Internals->TrackerMapping = conn->trackerMap(); + this->Internals->updateUi(); +} + +//----------------------------------------------------------------------------- +pqVRPNConnection* pqVRAddConnectionDialog::getVRPNConnection() +{ + if (this->Internals->Type == pqInternals::VRPN) + { + return this->Internals->VRPNConn; + } + return nullptr; +} + +//----------------------------------------------------------------------------- +bool pqVRAddConnectionDialog::isVRPN() +{ + return this->Internals->Type == pqInternals::VRPN; +} +#endif + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::setConnection(pqVRUIConnection* conn) +{ + this->Internals->VRUIConn = conn; + this->Internals->Type = pqInternals::VRUI; + this->Internals->connectionName->setText(QString::fromStdString(conn->name())); + this->Internals->connectionAddress->setText(QString::fromStdString(conn->address())); + this->Internals->connectionPort->setValue(QString::fromStdString(conn->port()).toInt()); + this->Internals->SetSelectedConnectionType(pqInternals::VRUI); + this->Internals->connectionType->setEnabled(false); + this->Internals->AnalogMapping = conn->analogMap(); + this->Internals->ButtonMapping = conn->buttonMap(); + this->Internals->TrackerMapping = conn->trackerMap(); + this->Internals->updateUi(); +} + +//----------------------------------------------------------------------------- +pqVRUIConnection* pqVRAddConnectionDialog::getVRUIConnection() +{ + if (this->Internals->Type == pqInternals::VRUI) + { + return this->Internals->VRUIConn; + } + return nullptr; +} + +//----------------------------------------------------------------------------- +bool pqVRAddConnectionDialog::isVRUI() +{ + return this->Internals->Type == pqInternals::VRUI; +} +#endif + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::updateConnection() +{ + switch (this->Internals->Type) + { +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + case pqInternals::VRPN: + this->Internals->updateVRPNConnection(); + return; +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + case pqInternals::VRUI: + this->Internals->updateVRUIConnection(); + return; +#endif + default: + case pqInternals::None: + switch (this->Internals->GetSelectedConnectionType()) + { +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + case pqInternals::VRPN: + this->Internals->updateVRPNConnection(); + return; +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + case pqInternals::VRUI: + this->Internals->updateVRUIConnection(); + return; +#endif + default: + qWarning() << "Cannot create connection...unsupported connection type."; + return; + } + } +} + +void pqVRAddConnectionDialog::accept() +{ + QString missingVar; + if (this->Internals->connectionName->text().isEmpty()) + { + missingVar = "Connection name"; + } + if (this->Internals->connectionAddress->text().isEmpty()) + { + missingVar = "Connection address"; + } + + if (!missingVar.isEmpty()) + { + QMessageBox::critical(this, "Missing value", QString("%1 is not set!").arg(missingVar)); + return; + } + this->Superclass::accept(); +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::keyPressEvent(QKeyEvent* event) +{ + // Disable the default behavior of clicking "Ok" when enter is pressed + if (!event->modifiers() || + (event->modifiers() & Qt::KeypadModifier && event->key() == Qt::Key_Enter)) + { + switch (event->key()) + { + case Qt::Key_Enter: + case Qt::Key_Return: + if (this->Internals->insertInput->hasFocus()) + { + this->Internals->insertInput->click(); + event->accept(); + return; + } + return; + } + } + QDialog::keyPressEvent(event); +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::addInput() +{ + + QString missingVar; + if (this->Internals->inputName->text().isEmpty()) + { + missingVar = "Input name"; + } + if (this->Internals->inputId->text().isEmpty()) + { + missingVar = "Input id"; + } + + if (!missingVar.isEmpty()) + { + QMessageBox::critical(this, "Missing value", QString("%1 is not set!").arg(missingVar)); + return; + } + + this->Internals->addInput(); +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::removeInput() +{ + this->Internals->removeInput(); +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::connectionTypeChanged() +{ + switch (this->Internals->GetSelectedConnectionType()) + { + case pqInternals::VRPN: + this->Internals->portLabel->hide(); + this->Internals->connectionPort->hide(); + break; + case pqInternals::VRUI: + this->Internals->portLabel->show(); + this->Internals->connectionPort->show(); + break; + default: + break; + } +} + +//----------------------------------------------------------------------------- +//-----------------------------pqInternals methods----------------------------- +//----------------------------------------------------------------------------- + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::pqInternals::updateVRPNConnection() +{ + if (!this->VRPNConn) + { + this->VRPNConn = new pqVRPNConnection(pqVRConnectionManager::instance()); + this->Type = VRPN; + } + + this->VRPNConn->setName(this->connectionName->text().toStdString()); + this->VRPNConn->setAddress(this->connectionAddress->text().toStdString()); + this->VRPNConn->setAnalogMap(this->AnalogMapping); + this->VRPNConn->setButtonMap(this->ButtonMapping); + this->VRPNConn->setTrackerMap(this->TrackerMapping); +} +#endif + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::pqInternals::updateVRUIConnection() +{ + if (!this->VRUIConn) + { + this->VRUIConn = new pqVRUIConnection(pqVRConnectionManager::instance()); + this->Type = VRUI; + } + + this->VRUIConn->setName(this->connectionName->text().toStdString()); + this->VRUIConn->setAddress(this->connectionAddress->text().toStdString()); + this->VRUIConn->setPort(QString::number(this->connectionPort->value()).toStdString()); + this->VRUIConn->setAnalogMap(this->AnalogMapping); + this->VRUIConn->setButtonMap(this->ButtonMapping); + this->VRUIConn->setTrackerMap(this->TrackerMapping); +} +#endif + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::pqInternals::updateUi() +{ + this->listWidget->clear(); + std::map::const_iterator it; + std::map::const_iterator it_end; + for (it = this->AnalogMapping.begin(), it_end = this->AnalogMapping.end(); it != it_end; ++it) + { + this->listWidget->addItem(QString("%1: %2") + .arg(QString::fromStdString(it->first)) + .arg(QString::fromStdString(it->second))); + } + for (it = this->ButtonMapping.begin(), it_end = this->ButtonMapping.end(); it != it_end; ++it) + { + this->listWidget->addItem(QString("%1: %2") + .arg(QString::fromStdString(it->first)) + .arg(QString::fromStdString(it->second))); + } + for (it = this->TrackerMapping.begin(), it_end = this->TrackerMapping.end(); it != it_end; ++it) + { + this->listWidget->addItem(QString("%1: %2") + .arg(QString::fromStdString(it->first)) + .arg(QString::fromStdString(it->second))); + } +} + +//----------------------------------------------------------------------------- +QPair pqVRAddConnectionDialog::pqInternals::parseEntry(const QString& entry) +{ + QPair result; + QRegExp regexp("([^:]+): (.+)"); + if (regexp.indexIn(entry) < 0) + { + return result; + } + + result.first = regexp.cap(1); + result.second = regexp.cap(2); + return result; +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::pqInternals::addInput() +{ + std::map* targetMap; + const char* idPrefix; + switch (this->inputType->currentIndex()) + { + case Analog: + targetMap = &this->AnalogMapping; + idPrefix = "analog."; + break; + case Button: + targetMap = &this->ButtonMapping; + idPrefix = "button."; + break; + case Tracker: + targetMap = &this->TrackerMapping; + idPrefix = "tracker."; + break; + default: + qWarning() << "Invalid input type! This shouldn't happen..."; + return; + } + + std::string id = this->inputId->text().prepend(idPrefix).toStdString(); + (*targetMap)[id] = this->inputName->text().toStdString(); + this->updateUi(); +} + +//----------------------------------------------------------------------------- +void pqVRAddConnectionDialog::pqInternals::removeInput() +{ + bool changed = false; + Q_FOREACH (QListWidgetItem* item, this->listWidget->selectedItems()) + { + QString id = this->parseEntry(item->text()).first; + if (id.isEmpty()) + { + continue; + } + + if (id.startsWith("analog.")) + { + this->AnalogMapping.erase(id.toStdString()); + } + else if (id.startsWith("button.")) + { + this->ButtonMapping.erase(id.toStdString()); + } + else if (id.startsWith("tracker.")) + { + this->TrackerMapping.erase(id.toStdString()); + } + + changed = true; + } + + if (changed) + { + this->updateUi(); + } +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,87 @@ +/*========================================================================= + + Program: ParaView + Module: $RCSfile$ + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRAddConnectionDialog_h +#define pqVRAddConnectionDialog_h + +#include + +#include "vtkPVVRConfig.h" + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +class pqVRPNConnection; +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +class pqVRUIConnection; +#endif + +class pqVRAddConnectionDialog : public QDialog +{ + Q_OBJECT + typedef QDialog Superclass; + +public: + pqVRAddConnectionDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags{}); + virtual ~pqVRAddConnectionDialog(); + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + void setConnection(pqVRPNConnection* conn); + pqVRPNConnection* getVRPNConnection(); + bool isVRPN(); +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + void setConnection(pqVRUIConnection* conn); + pqVRUIConnection* getVRUIConnection(); + bool isVRUI(); +#endif + + void updateConnection(); + +public Q_SLOTS: + void accept(); + +protected: + void keyPressEvent(QKeyEvent*); + +private Q_SLOTS: + void addInput(); + void removeInput(); + + void connectionTypeChanged(); + +private: + Q_DISABLE_COPY(pqVRAddConnectionDialog) + + class pqInternals; + pqInternals* Internals; +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.ui paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.ui --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddConnectionDialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddConnectionDialog.ui 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,254 @@ + + + VRAddConnectionDialog + + + + 0 + 0 + 640 + 500 + + + + + 0 + 0 + + + + Add VR Connection + + + + QFormLayout::ExpandingFieldsGrow + + + + + Type: + + + + + + + + 0 + 0 + + + + <html><head/><body><p>Select the type of VR connection.</p></body></html> + + + + + + + + 0 + 0 + + + + Name: + + + + + + + <html><head/><body><p>Name of the connection.</p></body></html> + + + vrconn + + + + + + + Address: + + + + + + + + + + Port: + + + + + + + 99999 + + + 8555 + + + + + + + + 0 + 1 + + + + + <add inputs> + + + + + + + + + + + Analog + + + + + Button + + + + + Tracker + + + + + + + + id + + + + + + + name + + + + + + + + + + + :/QtWidgets/Icons/pqPlus.svg:/QtWidgets/Icons/pqPlus.svg + + + + + + + ... + + + + :/QtWidgets/Icons/pqMinus.svg:/QtWidgets/Icons/pqMinus.svg + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + false + + + + + + + + + + + buttonBox + accepted() + VRAddConnectionDialog + accept() + + + 252 + 475 + + + 157 + 274 + + + + + buttonBox + rejected() + VRAddConnectionDialog + reject() + + + 320 + 475 + + + 286 + 274 + + + + + inputId + returnPressed() + inputName + setFocus() + + + 358 + 428 + + + 539 + 432 + + + + + inputName + returnPressed() + insertInput + click() + + + 554 + 435 + + + 581 + 437 + + + + + diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,264 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRAddStyleDialog.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRAddStyleDialog.h" +#include "ui_pqVRAddStyleDialog.h" + +#include "pqVRConnectionManager.h" +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +#include "pqVRPNConnection.h" +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +#include "pqVRUIConnection.h" +#endif + +#include "vtkNew.h" +#include "vtkSMProxy.h" +#include "vtkStringList.h" +#include "vtkVRInteractorStyle.h" + +#include + +#include +#include + +#include +#include +#include + +class pqVRAddStyleDialog::pqInternals : public Ui::VRAddStyleDialog +{ +public: + bool CanConfigure; + vtkVRInteractorStyle* Style; + + enum InputType + { + Analog = 0, + Button, + Tracker + }; + + struct InputGui + { + InputType type; + std::string role; + QComboBox* combo; + }; + + void AddInput(QWidget* parent, InputType type, const std::string& role, const std::string& name); + QList Inputs; + + QStringList AnalogNames; + QStringList ButtonNames; + QStringList TrackerNames; +}; + +//----------------------------------------------------------------------------- +pqVRAddStyleDialog::pqVRAddStyleDialog(QWidget* parentObject, Qt::WindowFlags f) + : Superclass(parentObject, f) + , Internals(new pqInternals()) +{ + this->Internals->setupUi(this); + this->Internals->CanConfigure = false; + + // Populate input lists + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + + std::map analogs; + std::map buttons; + std::map trackers; + + Q_FOREACH (const QString& connName, mgr->connectionNames()) + { + analogs.clear(); + buttons.clear(); + trackers.clear(); + // Lookup connection + bool found = false; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + if (pqVRPNConnection* conn = mgr->GetVRPNConnection(connName)) + { + analogs = conn->analogMap(); + buttons = conn->buttonMap(); + trackers = conn->trackerMap(); + found = true; + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + if (pqVRUIConnection* conn = mgr->GetVRUIConnection(connName)) + { + if (!found) + { + analogs = conn->analogMap(); + buttons = conn->buttonMap(); + trackers = conn->trackerMap(); + found = true; + } + } +#endif + if (!found) + { + qDebug() << "Missing connection? Name:" << connName; + continue; + } + + std::map::const_iterator it; + std::map::const_iterator it_end; + for (it = analogs.begin(), it_end = analogs.end(); it != it_end; ++it) + { + this->Internals->AnalogNames.append( + QString("%1.%2").arg(connName).arg(QString::fromStdString(it->second))); + } + for (it = buttons.begin(), it_end = buttons.end(); it != it_end; ++it) + { + this->Internals->ButtonNames.append( + QString("%1.%2").arg(connName).arg(QString::fromStdString(it->second))); + } + for (it = trackers.begin(), it_end = trackers.end(); it != it_end; ++it) + { + this->Internals->TrackerNames.append( + QString("%1.%2").arg(connName).arg(QString::fromStdString(it->second))); + } + } + + std::sort(this->Internals->AnalogNames.begin(), this->Internals->AnalogNames.end()); + std::sort(this->Internals->ButtonNames.begin(), this->Internals->ButtonNames.end()); + std::sort(this->Internals->TrackerNames.begin(), this->Internals->TrackerNames.end()); +} + +//----------------------------------------------------------------------------- +pqVRAddStyleDialog::~pqVRAddStyleDialog() +{ + delete this->Internals; +} + +//----------------------------------------------------------------------------- +void pqVRAddStyleDialog::setInteractorStyle(vtkVRInteractorStyle* style, const QString& name) +{ + this->Internals->Style = style; + this->Internals->infoLabel->setText(QString("Configuring style %1.").arg(name)); + + // Create gui + vtkNew roles; + style->GetAnalogRoles(roles.GetPointer()); + for (int i = 0; i < roles->GetNumberOfStrings(); ++i) + { + std::string role(roles->GetString(i)); + std::string analogName(style->GetAnalogName(role)); + this->Internals->AddInput(this, pqInternals::Analog, role, analogName); + } + style->GetButtonRoles(roles.GetPointer()); + for (int i = 0; i < roles->GetNumberOfStrings(); ++i) + { + std::string role(roles->GetString(i)); + std::string buttonName(style->GetButtonName(role)); + this->Internals->AddInput(this, pqInternals::Button, role, buttonName); + } + style->GetTrackerRoles(roles.GetPointer()); + for (int i = 0; i < roles->GetNumberOfStrings(); ++i) + { + std::string role(roles->GetString(i)); + std::string trackerName(style->GetTrackerName(role)); + this->Internals->AddInput(this, pqInternals::Tracker, role, trackerName); + } + + this->Internals->CanConfigure = (this->Internals->Inputs.size() != 0); +} + +//----------------------------------------------------------------------------- +void pqVRAddStyleDialog::updateInteractorStyle() +{ + if (!this->Internals->CanConfigure || !this->Internals->Style) + { + return; + } + + Q_FOREACH (const pqInternals::InputGui& gui, this->Internals->Inputs) + { + const std::string& role = gui.role; + const std::string& name = gui.combo->currentText().toStdString(); + switch (gui.type) + { + case pqInternals::Analog: + this->Internals->Style->SetAnalogName(role, name); + break; + case pqInternals::Button: + this->Internals->Style->SetButtonName(role, name); + break; + case pqInternals::Tracker: + this->Internals->Style->SetTrackerName(role, name); + break; + default: + break; + } + } +} + +//----------------------------------------------------------------------------- +bool pqVRAddStyleDialog::isConfigurable() +{ + return this->Internals->CanConfigure; +} + +//----------------------------------------------------------------------------- +void pqVRAddStyleDialog::pqInternals::AddInput( + QWidget* parent, InputType type, const std::string& role, const std::string& name) +{ + this->Inputs.push_back(InputGui()); + InputGui& gui = this->Inputs.back(); + + gui.type = type; + gui.role = role; + gui.combo = new QComboBox(parent); + switch (type) + { + case Analog: + gui.combo->addItems(this->AnalogNames); + break; + case Button: + gui.combo->addItems(this->ButtonNames); + break; + case Tracker: + gui.combo->addItems(this->TrackerNames); + break; + default: + qWarning() << "Unknown tracker type: " << type; + } + + int comboIndex = gui.combo->findText(QString::fromStdString(name)); + if (comboIndex != -1) + { + gui.combo->setCurrentIndex(comboIndex); + } + + this->inputForm->addRow(QString::fromStdString(role) + ":", gui.combo); +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,63 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRAddStyleDialog.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRAddStyleDialog_h +#define pqVRAddStyleDialog_h + +#include + +class vtkVRInteractorStyle; + +class pqVRAddStyleDialog : public QDialog +{ + Q_OBJECT + typedef QDialog Superclass; + +public: + pqVRAddStyleDialog(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags{}); + virtual ~pqVRAddStyleDialog(); + + void setInteractorStyle(vtkVRInteractorStyle*, const QString& name); + void updateInteractorStyle(); + + // Returns true if there are any user-configurable options. + bool isConfigurable(); + +private Q_SLOTS: + +private: + Q_DISABLE_COPY(pqVRAddStyleDialog) + + class pqInternals; + pqInternals* Internals; +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.ui paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.ui --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRAddStyleDialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRAddStyleDialog.ui 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,90 @@ + + + VRAddStyleDialog + + + + 0 + 0 + 286 + 65 + + + + + 0 + 0 + + + + Add VR Interaction + + + + QFormLayout::ExpandingFieldsGrow + + + + + TextLabel + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + false + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + + + + buttonBox + accepted() + VRAddStyleDialog + accept() + + + 252 + 475 + + + 157 + 274 + + + + + buttonBox + rejected() + VRAddStyleDialog + reject() + + + 320 + 475 + + + 286 + 274 + + + + + diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRConnectionManager.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRConnectionManager.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRConnectionManager.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRConnectionManager.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,375 @@ +/*========================================================================= + + Program: ParaView + Module: vtkVRConnectionManager.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=========================================================================*/ +#include "pqVRConnectionManager.h" + +// --------------------------------------------------------------------includes +#include "pqApplicationCore.h" +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +#include "pqVRPNConnection.h" +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +#include "pqVRUIConnection.h" +#endif + +#include "vtkObjectFactory.h" +#include "vtkPVVRConfig.h" +#include "vtkPVXMLElement.h" +#include "vtkVRQueue.h" +#include "vtkWeakPointer.h" + +#include +#include + +#include +#include + +// ---------------------------------------------------------------------------- +QPointer pqVRConnectionManager::Instance; +void pqVRConnectionManager::setInstance(pqVRConnectionManager* mgr) +{ + pqVRConnectionManager::Instance = mgr; +} + +// ---------------------------------------------------------------------------- +pqVRConnectionManager* pqVRConnectionManager::instance() +{ + return pqVRConnectionManager::Instance; +} + +// --------------------------------------------------------------------internal +// IMPORTANT: Make sure that this struct has no pointers. All pointers should +// be put in the class declaration. For all newly defined pointers make sure to +// update constructor and destructor methods. +class pqVRConnectionManager::pqInternals +{ +public: +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + QList> VRPNConnections; +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + QList> VRUIConnections; +#endif + vtkWeakPointer Queue; +}; + +// -----------------------------------------------------------------------cnstr +pqVRConnectionManager::pqVRConnectionManager(vtkVRQueue* queue, QObject* parentObject) + : Superclass(parentObject) +{ + this->Internals = new pqInternals(); + this->Internals->Queue = queue; + QObject::connect(pqApplicationCore::instance(), + SIGNAL(stateLoaded(vtkPVXMLElement*, vtkSMProxyLocator*)), this, + SLOT(configureConnections(vtkPVXMLElement*, vtkSMProxyLocator*))); + QObject::connect(pqApplicationCore::instance(), SIGNAL(stateSaved(vtkPVXMLElement*)), this, + SLOT(saveConnectionsConfiguration(vtkPVXMLElement*))); +} + +// -----------------------------------------------------------------------destr +pqVRConnectionManager::~pqVRConnectionManager() +{ + delete this->Internals; +} + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::add(pqVRPNConnection* conn) +{ + this->Internals->VRPNConnections.push_front(conn); + conn->setQueue(this->Internals->Queue); + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::remove(pqVRPNConnection* conn) +{ + conn->stop(); + this->Internals->VRPNConnections.removeAll(conn); + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +pqVRPNConnection* pqVRConnectionManager::GetVRPNConnection(const QString& name) +{ + std::string target = name.toStdString(); + Q_FOREACH (const QPointer& conn, this->Internals->VRPNConnections) + { + if (!conn.isNull()) + { + if (conn->name() == target) + { + return conn.data(); + } + } + } + return nullptr; +} +#endif + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::add(pqVRUIConnection* conn) +{ + this->Internals->VRUIConnections.push_front(conn); + conn->setQueue(this->Internals->Queue); + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::remove(pqVRUIConnection* conn) +{ + conn->stop(); + this->Internals->VRUIConnections.removeAll(conn); + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +pqVRUIConnection* pqVRConnectionManager::GetVRUIConnection(const QString& name) +{ + std::string target = name.toStdString(); + Q_FOREACH (const QPointer& conn, this->Internals->VRUIConnections) + { + if (!conn.isNull()) + { + if (conn->name() == target) + { + return conn.data(); + } + } + } + return nullptr; +} +#endif + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::clear() +{ + this->stop(); +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + this->Internals->VRPNConnections.clear(); +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + this->Internals->VRUIConnections.clear(); +#endif + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +QList pqVRConnectionManager::connectionNames() const +{ + QList result; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + Q_FOREACH (pqVRPNConnection* conn, this->Internals->VRPNConnections) + { + if (conn) + { + result << QString::fromStdString(conn->name()); + } + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + Q_FOREACH (pqVRUIConnection* conn, this->Internals->VRUIConnections) + { + if (conn) + { + result << QString::fromStdString(conn->name()); + } + } +#endif + std::sort(result.begin(), result.end()); + return result; +} + +// ---------------------------------------------------------------------------- +int pqVRConnectionManager::numConnections() const +{ + int result = 0; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + Q_FOREACH (pqVRPNConnection* conn, this->Internals->VRPNConnections) + { + if (conn) + { + result++; + } + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + Q_FOREACH (pqVRUIConnection* conn, this->Internals->VRUIConnections) + { + if (conn) + { + result++; + } + } +#endif + return result; +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::start() +{ +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + Q_FOREACH (pqVRPNConnection* conn, this->Internals->VRPNConnections) + { + if (conn && conn->init()) + { + conn->start(); + } + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + Q_FOREACH (pqVRUIConnection* conn, this->Internals->VRUIConnections) + { + if (conn && conn->init()) + { + conn->start(); + } + } +#endif +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::stop() +{ +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + Q_FOREACH (pqVRPNConnection* conn, this->Internals->VRPNConnections) + { + if (conn) + { + conn->stop(); + } + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + Q_FOREACH (pqVRUIConnection* conn, this->Internals->VRUIConnections) + { + if (conn) + { + conn->stop(); + } + } +#endif +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::configureConnections(vtkPVXMLElement* xml, vtkSMProxyLocator* locator) +{ + if (!xml) + { + return; + } + + if (xml->GetName() && strcmp(xml->GetName(), "VRConnectionManager") == 0) + { + this->clear(); + for (unsigned cc = 0; cc < xml->GetNumberOfNestedElements(); cc++) + { + vtkPVXMLElement* child = xml->GetNestedElement(cc); + if (child && child->GetName()) + { + if (strcmp(child->GetName(), "VRPNConnection") == 0) + { + const char* name = child->GetAttributeOrEmpty("name"); + const char* address = child->GetAttributeOrEmpty("address"); + (void)name; + (void)address; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + // TODO: Need to throw some warning if VRPN is used when not + // compiled. For now we will simply ignore VRPN configuration + pqVRPNConnection* device = new pqVRPNConnection(this); + device->setName(name); + device->setAddress(address); + device->configure(child, locator); + this->add(device); +#endif + } + else if (strcmp(child->GetName(), "VRUIConnection") == 0) + { +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + // TODO: Need to throw some warning if VRUI is used when not + // compiled. For now we will simply ignore VRUI configuration + const char* name = child->GetAttributeOrEmpty("name"); + const char* address = child->GetAttributeOrEmpty("address"); + const char* port = child->GetAttribute("port"); + pqVRUIConnection* device = new pqVRUIConnection(this); + device->setName(name); + device->setAddress(address); + device->setPort(port ? port : "8555"); + device->configure(child, locator); + this->add(device); +#endif + } + else + { + qWarning() << "Unknown Connection type : \"" << child->GetName() << "\""; + } + } + } + } + else + { + this->configureConnections(xml->FindNestedElementByName("VRConnectionManager"), locator); + } + Q_EMIT this->connectionsChanged(); +} + +// ---------------------------------------------------------------------------- +void pqVRConnectionManager::saveConnectionsConfiguration(vtkPVXMLElement* root) +{ + assert(root != nullptr); + vtkPVXMLElement* tempParent = vtkPVXMLElement::New(); + tempParent->SetName("VRConnectionManager"); +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + Q_FOREACH (pqVRPNConnection* conn, this->Internals->VRPNConnections) + { + vtkPVXMLElement* child = conn->saveConfiguration(); + if (child) + { + tempParent->AddNestedElement(child); + child->Delete(); + } + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + Q_FOREACH (pqVRUIConnection* conn, this->Internals->VRUIConnections) + { + vtkPVXMLElement* child = conn->saveConfiguration(); + if (child) + { + tempParent->AddNestedElement(child); + child->Delete(); + } + } +#endif + root->AddNestedElement(tempParent); + tempParent->Delete(); +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRConnectionManager.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRConnectionManager.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRConnectionManager.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRConnectionManager.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,99 @@ +/*========================================================================= + + Program: ParaView + Module: vtkVRConnectionManager.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=========================================================================*/ +#ifndef pqVRConnectionManager_h +#define pqVRConnectionManager_h +#include "vtkPVVRConfig.h" + +#include +#include +class vtkVRQueue; +class vtkPVXMLElement; +class vtkSMProxyLocator; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +class pqVRUIConnection; +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +class pqVRPNConnection; +#endif + +class pqVRConnectionManager : public QObject +{ + Q_OBJECT + typedef QObject Superclass; + +public: + pqVRConnectionManager(vtkVRQueue* queue, QObject* parent = 0); + virtual ~pqVRConnectionManager(); +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + void add(pqVRPNConnection* conn); + void remove(pqVRPNConnection* conn); + pqVRPNConnection* GetVRPNConnection(const QString& name); +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + void add(pqVRUIConnection* conn); + void remove(pqVRUIConnection* conn); + pqVRUIConnection* GetVRUIConnection(const QString& name); +#endif + void clear(); + + QList connectionNames() const; + + int numConnections() const; + + static pqVRConnectionManager* instance(); + +public Q_SLOTS: + /// start/stop connections + void start(); + void stop(); + + /// Clears current connections and loads a new set of connections from the XML + /// Configuration + void configureConnections(vtkPVXMLElement* xml, vtkSMProxyLocator* locator); + + // save the connection configuration + void saveConnectionsConfiguration(vtkPVXMLElement* root); + +Q_SIGNALS: + void connectionsChanged(); + +private: + Q_DISABLE_COPY(pqVRConnectionManager) + class pqInternals; + pqInternals* Internals; + + friend class pqVRStarter; + static void setInstance(pqVRConnectionManager*); + static QPointer Instance; +}; + +#endif // pqVRConnectionManager_h diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,678 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRDockPanel.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRDockPanel.h" +#include "ui_pqVRDockPanel.h" + +#include "pqActiveObjects.h" +#include "pqApplicationCore.h" +#include "pqCoreUtilities.h" +#include "pqFileDialog.h" +#include "pqLoadStateReaction.h" +#include "pqRenderView.h" +#include "pqSaveStateReaction.h" +#include "pqServerManagerModel.h" +#include "pqVRAddConnectionDialog.h" +#include "pqVRAddStyleDialog.h" +#include "pqVRConnectionManager.h" +#include "pqVRQueueHandler.h" +#include "pqView.h" + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +#include "pqVRPNConnection.h" +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI +#include "pqVRUIConnection.h" +#endif + +#include "vtkCamera.h" +#include "vtkCommand.h" +#include "vtkMatrix4x4.h" +#include "vtkNew.h" +#include "vtkPVXMLElement.h" +#include "vtkPVXMLParser.h" +#include "vtkSMRenderViewProxy.h" +#include "vtkVRInteractorStyle.h" +#include "vtkVRInteractorStyleFactory.h" +#include "vtkWeakPointer.h" + +#include + +#include +#include +#include + +#include + +#include + +class pqVRDockPanel::pqInternals : public Ui::VRDockPanel +{ +public: + QString createName(vtkVRInteractorStyle*); + + bool IsRunning; + + vtkWeakPointer Camera; + QMap StyleNameMap; +}; + +//----------------------------------------------------------------------------- +void pqVRDockPanel::constructor() +{ + this->setWindowTitle("VR Panel"); + QWidget* container = new QWidget(this); + this->Internals = new pqInternals(); + this->Internals->setupUi(container); + this->setWidget(container); + + this->Internals->IsRunning = false; + this->updateStartStopButtonStates(); + + QFont font = this->Internals->debugLabel->font(); + font.setFamily("Courier"); + this->Internals->debugLabel->setFont(font); + + this->Internals->propertyCombo->setCollapseVectors(true); + + vtkVRInteractorStyleFactory* styleFactory = vtkVRInteractorStyleFactory::GetInstance(); + std::vector styleDescs = styleFactory->GetInteractorStyleDescriptions(); + for (size_t i = 0; i < styleDescs.size(); ++i) + { + this->Internals->stylesCombo->addItem(QString::fromStdString(styleDescs[i])); + } + + // Connections + connect(this->Internals->addConnection, SIGNAL(clicked()), this, SLOT(addConnection())); + + connect(this->Internals->removeConnection, SIGNAL(clicked()), this, SLOT(removeConnection())); + + connect(this->Internals->editConnection, SIGNAL(clicked()), this, SLOT(editConnection())); + + connect(this->Internals->connectionsTable, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, + SLOT(editConnection(QListWidgetItem*))); + + connect(this->Internals->connectionsTable, SIGNAL(currentRowChanged(int)), this, + SLOT(updateConnectionButtons(int))); + + connect(pqVRConnectionManager::instance(), SIGNAL(connectionsChanged()), this, + SLOT(updateConnections())); + + connect(pqVRConnectionManager::instance(), SIGNAL(connectionsChanged()), this, + SLOT(updateStartStopButtonStates())); + + // Styles + connect(this->Internals->addStyle, SIGNAL(clicked()), this, SLOT(addStyle())); + + connect(this->Internals->removeStyle, SIGNAL(clicked()), this, SLOT(removeStyle())); + + connect(this->Internals->editStyle, SIGNAL(clicked()), this, SLOT(editStyle())); + + connect(this->Internals->stylesTable, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, + SLOT(editStyle(QListWidgetItem*))); + + connect(this->Internals->stylesTable, SIGNAL(currentRowChanged(int)), this, + SLOT(updateStyleButtons(int))); + + connect(pqVRQueueHandler::instance(), SIGNAL(stylesChanged()), this, SLOT(updateStyles())); + + // Other + connect( + &pqActiveObjects::instance(), SIGNAL(viewChanged(pqView*)), this, SLOT(setActiveView(pqView*))); + + connect(this->Internals->proxyCombo, SIGNAL(currentProxyChanged(vtkSMProxy*)), this, + SLOT(proxyChanged(vtkSMProxy*))); + + connect(this->Internals->stylesCombo, SIGNAL(currentIndexChanged(QString)), this, + SLOT(styleComboChanged(QString))); + + connect(this->Internals->saveState, SIGNAL(clicked()), this, SLOT(saveState())); + + connect(this->Internals->restoreState, SIGNAL(clicked()), this, SLOT(restoreState())); + + connect(this->Internals->startButton, SIGNAL(clicked()), this, SLOT(start())); + + connect(this->Internals->stopButton, SIGNAL(clicked()), this, SLOT(stop())); + + this->styleComboChanged(this->Internals->stylesCombo->currentText()); + this->updateConnectionButtons(this->Internals->connectionsTable->currentRow()); + this->updateStyleButtons(this->Internals->stylesTable->currentRow()); + + // Add the render view to the proxy combo + pqServerManagerModel* smmodel = pqApplicationCore::instance()->getServerManagerModel(); + + QList rviews = ::pqFindItems(smmodel); + if (rviews.size() != 0) + this->setActiveView(rviews.first()); +} + +//----------------------------------------------------------------------------- +pqVRDockPanel::~pqVRDockPanel() +{ + if (this->Internals->IsRunning) + { + this->stop(); + } + delete this->Internals; +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateConnections() +{ + this->Internals->connectionsTable->clear(); + + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + QList connectionNames = mgr->connectionNames(); + Q_FOREACH (const QString& name, connectionNames) + { + this->Internals->connectionsTable->addItem(name); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::editConnection(QListWidgetItem* item) +{ + if (this->Internals->IsRunning) + { + return; + } + + if (!item) + { + item = this->Internals->connectionsTable->currentItem(); + } + + if (!item) + { + return; + } + + // Lookup connection + QString connName = item->text(); + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + (void)mgr; // Avoid unusued local variable warning if VRPN and VRUI not enabled + + pqVRAddConnectionDialog dialog(this); + bool set = false; +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + if (pqVRPNConnection* vrpnConn = mgr->GetVRPNConnection(connName)) + { + set = true; + dialog.setConnection(vrpnConn); + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + if (pqVRUIConnection* vruiConn = mgr->GetVRUIConnection(connName)) + { + if (!set) + { + set = true; + dialog.setConnection(vruiConn); + } + } +#endif + + if (!set) + { + // Connection not found! + return; + } + + if (dialog.exec() == QDialog::Accepted) + { + dialog.updateConnection(); + this->updateConnections(); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateConnectionButtons(int row) +{ + if (!this->Internals->IsRunning) + { + bool enabled = (row >= 0); + this->Internals->editConnection->setEnabled(enabled); + this->Internals->removeConnection->setEnabled(enabled); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::addConnection() +{ + pqVRAddConnectionDialog dialog(this); + if (dialog.exec() == QDialog::Accepted) + { + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + (void)mgr; // Avoid unusued local variable warning if VRPN and VRUI not enabled + dialog.updateConnection(); +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + if (dialog.isVRPN()) + { + pqVRPNConnection* conn = dialog.getVRPNConnection(); + mgr->add(conn); + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + if (dialog.isVRUI()) + { + pqVRUIConnection* conn = dialog.getVRUIConnection(); + mgr->add(conn); + } +#endif + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::removeConnection() +{ + QListWidgetItem* item = this->Internals->connectionsTable->currentItem(); + if (!item) + { + return; + } + QString name = item->text(); + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + (void)mgr; // Avoid unusued local variable warning if VRPN and VRUI not enabled + + pqVRAddConnectionDialog dialog(this); +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + if (pqVRPNConnection* vrpnConn = mgr->GetVRPNConnection(name)) + { + mgr->remove(vrpnConn); + return; + } +#endif +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI + if (pqVRUIConnection* vruiConn = mgr->GetVRUIConnection(name)) + { + mgr->remove(vruiConn); + } +#endif +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::addStyle() +{ + vtkSMProxy* proxy = this->Internals->propertyCombo->getCurrentProxy(); + QByteArray property = this->Internals->propertyCombo->getCurrentPropertyName().toUtf8(); + QString styleString = this->Internals->stylesCombo->currentText(); + + vtkVRInteractorStyleFactory* styleFactory = vtkVRInteractorStyleFactory::GetInstance(); + vtkVRInteractorStyle* style = + styleFactory->NewInteractorStyleFromDescription(styleString.toStdString()); + + if (!style) + { + return; + } + + style->SetControlledProxy(proxy); + style->SetControlledPropertyName(property.data()); + + pqVRAddStyleDialog dialog(this); + QString name = this->Internals->createName(style); + dialog.setInteractorStyle(style, name); + if (!dialog.isConfigurable() || dialog.exec() == QDialog::Accepted) + { + dialog.updateInteractorStyle(); + pqVRQueueHandler* handler = pqVRQueueHandler::instance(); + handler->add(style); + } + + // Clean up reference + style->Delete(); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::removeStyle() +{ + QListWidgetItem* item = this->Internals->stylesTable->currentItem(); + if (!item) + { + return; + } + QString name = item->text(); + + vtkVRInteractorStyle* style = this->Internals->StyleNameMap.value(name, nullptr); + if (!style) + { + return; + } + + pqVRQueueHandler::instance()->remove(style); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateStyles() +{ + this->Internals->StyleNameMap.clear(); + this->Internals->stylesTable->clear(); + + Q_FOREACH (vtkVRInteractorStyle* style, pqVRQueueHandler::instance()->styles()) + { + QString name = this->Internals->createName(style); + this->Internals->StyleNameMap.insert(name, style); + this->Internals->stylesTable->addItem(name); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::editStyle(QListWidgetItem* item) +{ + if (!item) + { + item = this->Internals->stylesTable->currentItem(); + } + + if (!item) + { + return; + } + + pqVRAddStyleDialog dialog(this); + QString name = item->text(); + vtkVRInteractorStyle* style = this->Internals->StyleNameMap.value(name, nullptr); + if (!style) + { + return; + } + + dialog.setInteractorStyle(style, name); + if (!dialog.isConfigurable() || dialog.exec() == QDialog::Accepted) + { + dialog.updateInteractorStyle(); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateStyleButtons(int row) +{ + bool enabled = (row >= 0); + this->Internals->editStyle->setEnabled(enabled); + this->Internals->removeStyle->setEnabled(enabled); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::proxyChanged(vtkSMProxy* pxy) +{ + this->Internals->propertyCombo->setSource(pxy); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::styleComboChanged(const QString& name) +{ + vtkVRInteractorStyleFactory* styleFactory = vtkVRInteractorStyleFactory::GetInstance(); + vtkVRInteractorStyle* style = styleFactory->NewInteractorStyleFromDescription(name.toStdString()); + int size = style ? style->GetControlledPropertySize() : -1; + if (style) + { + style->Delete(); + } + this->Internals->propertyCombo->setVectorSizeFilter(size); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::setActiveView(pqView* view) +{ + pqRenderView* rview = qobject_cast(view); + + // Remove any RenderView entries in the combobox + Qt::MatchFlags matchFlags = Qt::MatchStartsWith | Qt::MatchCaseSensitive; + int ind = this->Internals->proxyCombo->findText("RenderView", matchFlags); + while (ind != -1) + { + QString label = this->Internals->proxyCombo->itemText(ind); + this->Internals->proxyCombo->removeProxy(label); + ind = this->Internals->proxyCombo->findText("RenderView", matchFlags); + } + + if (rview) + { + this->Internals->proxyCombo->addProxy(0, rview->getSMName(), rview->getProxy()); + } + + this->Internals->Camera = nullptr; + if (rview) + { + vtkSMRenderViewProxy* renPxy = rview->getRenderViewProxy(); + if (renPxy) + { + this->Internals->Camera = renPxy->GetActiveCamera(); + if (this->Internals->Camera) + { + pqCoreUtilities::connect( + this->Internals->Camera, vtkCommand::ModifiedEvent, this, SLOT(updateDebugLabel())); + } + } + } + this->updateDebugLabel(); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::saveState() +{ + pqFileDialog fileDialog(nullptr, pqCoreUtilities::mainWidget(), "Save CAVE Interaction template", + QString(), "CAVE Interaction template files (*.pvvr)"); + + fileDialog.setFileMode(pqFileDialog::AnyFile); + + if (fileDialog.exec() != pqFileDialog::Accepted) + { + // User canceled + return; + } + + QString filename = fileDialog.getSelectedFiles().first(); + + vtkNew root; + root->SetName("CAVEInteractionState"); + + if (pqVRConnectionManager* connMgr = pqVRConnectionManager::instance()) + { + connMgr->saveConnectionsConfiguration(root.GetPointer()); + } + if (pqVRQueueHandler* queueHandler = pqVRQueueHandler::instance()) + { + queueHandler->saveStylesConfiguration(root.GetPointer()); + } + + vtksys::ofstream os(filename.toUtf8().data(), ios::out); + root->PrintXML(os, vtkIndent()); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::restoreState() +{ + pqFileDialog fileDialog(nullptr, pqCoreUtilities::mainWidget(), "Load CAVE Interaction template", + QString(), "CAVE Interaction template files (*.pvvr);;ParaView state files (*.pvsm)"); + + fileDialog.setFileMode(pqFileDialog::ExistingFile); + + if (fileDialog.exec() != pqFileDialog::Accepted) + { + // User canceled + return; + } + + QString filename = fileDialog.getSelectedFiles().first(); + + vtkNew xmlParser; + xmlParser->SetFileName(filename.toUtf8().data()); + xmlParser->Parse(); + + vtkPVXMLElement* root = xmlParser->GetRootElement(); + + pqVRConnectionManager* connMgr = pqVRConnectionManager::instance(); + vtkPVXMLElement* connRoot = root->FindNestedElementByName("VRConnectionManager"); + if (connMgr && connRoot) + { + connMgr->configureConnections(connRoot, nullptr); + } + + pqVRQueueHandler* queueHandler = pqVRQueueHandler::instance(); + vtkPVXMLElement* stylesRoot = root->FindNestedElementByName("VRInteractorStyles"); + if (queueHandler && stylesRoot) + { + queueHandler->configureStyles(root, nullptr); + } +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::disableConnectionButtons() +{ + this->Internals->addConnection->setEnabled(false); + this->Internals->editConnection->setEnabled(false); + this->Internals->removeConnection->setEnabled(false); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::enableConnectionButtons() +{ + this->Internals->addConnection->setEnabled(true); + this->Internals->editConnection->setEnabled(true); + this->Internals->removeConnection->setEnabled(true); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateStartStopButtonStates() +{ + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + bool canStart = !this->Internals->IsRunning && mgr->numConnections() != 0; + bool canStop = this->Internals->IsRunning; + + this->Internals->startButton->setEnabled(canStart); + this->Internals->stopButton->setEnabled(canStop); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::start() +{ + if (this->Internals->IsRunning) + { + qWarning() << "pqVRDockPanel: Cannot start listening for VR events --" + " already running!"; + return; + } + QApplication::setOverrideCursor(QCursor(Qt::BusyCursor)); + this->disableConnectionButtons(); + pqVRConnectionManager::instance()->start(); + pqVRQueueHandler::instance()->start(); + this->Internals->IsRunning = true; + this->updateStartStopButtonStates(); + QApplication::restoreOverrideCursor(); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::stop() +{ + if (!this->Internals->IsRunning) + { + qWarning() << "pqVRDockPanel: Cannot stop listening for VR events --" + " not started!"; + return; + } + QApplication::setOverrideCursor(QCursor(Qt::BusyCursor)); + this->enableConnectionButtons(); + pqVRConnectionManager::instance()->stop(); + pqVRQueueHandler::instance()->stop(); + this->Internals->IsRunning = false; + this->updateConnectionButtons(this->Internals->connectionsTable->currentRow()); + this->updateStartStopButtonStates(); + QApplication::restoreOverrideCursor(); +} + +//----------------------------------------------------------------------------- +void pqVRDockPanel::updateDebugLabel() +{ + if (this->Internals->Camera) + { + double* pos = this->Internals->Camera->GetPosition(); + QString debugString = + QString("Camera position: %1 %2 %3\n").arg(pos[0]).arg(pos[1]).arg(pos[2]); + vtkMatrix4x4* mv = this->Internals->Camera->GetModelViewTransformMatrix(); + debugString += "ModelView Matrix:\n"; + for (int i = 0; i < 4; ++i) + { + double e0 = mv->GetElement(i, 0); + double e1 = mv->GetElement(i, 1); + double e2 = mv->GetElement(i, 2); + double e3 = mv->GetElement(i, 3); + debugString += QString("%1 %2 %3 %4\n") + .arg(fabs(e0) < 1e-5 ? 0.0 : e0, 8, 'g', 3) + .arg(fabs(e1) < 1e-5 ? 0.0 : e1, 8, 'g', 3) + .arg(fabs(e2) < 1e-5 ? 0.0 : e2, 8, 'g', 3) + .arg(fabs(e3) < 1e-5 ? 0.0 : e3, 8, 'g', 3); + } + // Pop off trailing newline + debugString.remove(QRegExp("\n$")); + this->Internals->debugLabel->setText(debugString); + this->Internals->debugLabel->show(); + } + else + { + this->Internals->debugLabel->hide(); + } +} + +//----------------------------------------------------------------------------- +// createName() -- this method returns the string that will appear in the +// "Interactions:" list in the Qt VR Panel for the individual given "*style". +QString pqVRDockPanel::pqInternals::createName(vtkVRInteractorStyle* style) +{ + QString description; // A one-line description of the interaction (style, object, property) + QString className; // The name of the style's VTK class (e.g. vtkVRTrackStyle) + QString styleName; // A human readable version of the style + QString objectName; // The object onto which the style interacts + QString propertyName; // The property of the object which the style affects + + pqApplicationCore* core = pqApplicationCore::instance(); + pqServerManagerModel* model = core->getServerManagerModel(); + vtkVRInteractorStyleFactory* styleFactory = vtkVRInteractorStyleFactory::GetInstance(); + + className = style->GetClassName(); + styleName = + QString::fromStdString(styleFactory->GetDescriptionFromClassName(className.toStdString())); + + vtkSMProxy* smControlledProxy = style->GetControlledProxy(); + pqProxy* pqControlledProxy = model->findItem(smControlledProxy); + + // WRS-TODO: I don't know why "" occurs, there will always be a selected Proxy -- should be + // investigated + objectName = + (pqControlledProxy ? pqControlledProxy->getSMName() + : (smControlledProxy ? smControlledProxy->GetXMLLabel() : "")); + propertyName = + (strlen(style->GetControlledPropertyName()) ? style->GetControlledPropertyName() : "--"); + + description = QString("%1 on %2's %3").arg(styleName).arg(objectName).arg(propertyName); + + return description; +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,97 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRDockPanel.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRDockPanel_h +#define pqVRDockPanel_h + +#include + +class pqView; +class QListWidgetItem; +class vtkSMProxy; + +class pqVRDockPanel : public QDockWidget +{ + Q_OBJECT + typedef QDockWidget Superclass; + +public: + pqVRDockPanel(const QString& t, QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags{}) + : Superclass(t, p, f) + { + this->constructor(); + } + pqVRDockPanel(QWidget* p = nullptr, Qt::WindowFlags f = Qt::WindowFlags{}) + : Superclass(p, f) + { + this->constructor(); + } + virtual ~pqVRDockPanel(); + +private Q_SLOTS: + void addConnection(); + void removeConnection(); + void updateConnections(); + void editConnection(QListWidgetItem* item = nullptr); + void updateConnectionButtons(int row); + + void addStyle(); + void removeStyle(); + void updateStyles(); + void editStyle(QListWidgetItem* item = nullptr); + void updateStyleButtons(int row); + + void proxyChanged(vtkSMProxy*); + void styleComboChanged(const QString& name); + void setActiveView(pqView*); + + void saveState(); + void restoreState(); + + void disableConnectionButtons(); + void enableConnectionButtons(); + + void updateStartStopButtonStates(); + void start(); + void stop(); + + void updateDebugLabel(); + +private: + Q_DISABLE_COPY(pqVRDockPanel) + + void constructor(); + + class pqInternals; + pqInternals* Internals; +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.ui paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.ui --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRDockPanel.ui 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRDockPanel.ui 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,293 @@ + + + VRDockPanel + + + + 0 + 0 + 479 + 613 + + + + + + + + + + + + + Qt::Horizontal + + + + + + + + + Save VR State + + + + + + + Restore VR State + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <html><head/><body><p>Start listening for VR events on the configured connections.</p></body></html> + + + Start + + + + + + + <html><head/><body><p>Stop listening for VR events.</p></body></html> + + + Stop + + + + + + + + + + + <html><head/><body><p>Select an object for interaction.</p></body></html> + + + QComboBox::AdjustToContents + + + + + + + <html><head/><body><p>Select the object's property for interaction.</p></body></html> + + + QComboBox::AdjustToContents + + + + + + + <html><head/><body><p>Select the type of interaction.</p></body></html> + + + QComboBox::AdjustToContents + + + + + + + + + + + + Qt::Horizontal + + + + + + + + + <html><head/><body><p>Add a new VR connection.</p></body></html> + + + Add... + + + + :/QtWidgets/Icons/pqPlus.svg:/QtWidgets/Icons/pqPlus.svg + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <html><head/><body><p>Edit the selected VR connection.</p></body></html> + + + Edit... + + + + + + + <html><head/><body><p>Remove the selected VR connection.</p></body></html> + + + Remove + + + + :/QtWidgets/Icons/pqDelete.svg:/QtWidgets/Icons/pqDelete.svg + + + + + + + + + VR Connections: + + + + + + + Qt::Horizontal + + + + + + + Interactions: + + + + + + + TextLabel + + + + + + + + + <html><head/><body><p>Add a new interaction.</p></body></html> + + + Add... + + + + :/QtWidgets/Icons/pqPlus.svg:/QtWidgets/Icons/pqPlus.svg + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <html><head/><body><p>Edit the selected interaction.</p></body></html> + + + Edit... + + + + + + + <html><head/><body><p>Remove the selected interaction.</p></body></html> + + + Remove + + + + :/QtWidgets/Icons/pqDelete.svg:/QtWidgets/Icons/pqDelete.svg + + + + + + + + + + pqAnimatableProxyComboBox + QComboBox +
pqAnimatableProxyComboBox.h
+ + + pqAnimatablePropertiesComboBox + QComboBox +
pqAnimatablePropertiesComboBox.h
+ + + + connectionsTable + addConnection + editConnection + removeConnection + stylesTable + proxyCombo + propertyCombo + stylesCombo + addStyle + editStyle + removeStyle + saveState + restoreState + + + + + + diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNConnection.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNConnection.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNConnection.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNConnection.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,609 @@ +/*========================================================================= + + Program: ParaView + Module: vtkVRPNConnection.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRPNConnection.h" + +#include "pqActiveObjects.h" +#include "pqDataRepresentation.h" +#include "pqVRPNEventListener.h" +#include "pqView.h" + +#include "vtkCamera.h" +#include "vtkMath.h" +#include "vtkObjectFactory.h" +#include "vtkPVXMLElement.h" +#include "vtkSMDoubleVectorProperty.h" +#include "vtkSMPropertyHelper.h" +#include "vtkSMRenderViewProxy.h" +#include "vtkSMRepresentationProxy.h" +#include "vtkVRPNCallBackHandlers.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +pqVRPNEventListener* pqVRPNConnection::Listener = nullptr; + +class pqVRPNConnection::pqInternals +{ +public: + pqInternals() + { + this->Tracker = 0; + this->Button = 0; + this->Analog = 0; + this->Dial = 0; + this->Text = 0; + } + + ~pqInternals() + { + if (this->Tracker != 0) + { + delete this->Tracker; + } + if (this->Button != 0) + { + delete this->Button; + } + if (this->Analog != 0) + { + delete this->Analog; + } + if (this->Dial != 0) + { + delete this->Dial; + } + if (this->Text != 0) + { + delete this->Text; + } + } + + vrpn_Tracker_Remote* Tracker; + vrpn_Button_Remote* Button; + vrpn_Analog_Remote* Analog; + vrpn_Dial_Remote* Dial; + vrpn_Text_Receiver* Text; +}; + +// -----------------------------------------------------------------------cnstr +pqVRPNConnection::pqVRPNConnection(QObject* parentObject) + : Superclass(parentObject) +{ + this->Internals = new pqInternals(); + if (!this->Listener) + { + this->Listener = new pqVRPNEventListener(); + } + this->Initialized = false; + this->Address = ""; + this->Name = ""; + this->Type = "VRPN"; + this->TrackerPresent = false; + this->AnalogPresent = false; + this->ButtonPresent = false; + this->TrackerTransformPresent = false; + this->Transformation = vtkMatrix4x4::New(); +} + +// -----------------------------------------------------------------------destr +pqVRPNConnection::~pqVRPNConnection() +{ + delete this->Internals; + this->Transformation->Delete(); +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::addButton(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "button." << id; + this->ButtonMapping[returnStr.str()] = name; + this->ButtonPresent = true; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::addAnalog(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "analog." << id; + this->AnalogMapping[returnStr.str()] = name; + this->AnalogPresent = true; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::addTracking(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "tracker." << id; + this->TrackerMapping[returnStr.str()] = name; + this->TrackerPresent = true; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::setName(std::string name) +{ + this->Name = name; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::setAddress(std::string address) +{ + this->Address = address; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::setQueue(vtkVRQueue* queue) +{ + this->EventQueue = queue; +} + +// ---------------------------------------------------------------------------- +bool pqVRPNConnection::init() +{ + if (this->Initialized) + { + return true; + } + + this->Internals->Tracker = new vrpn_Tracker_Remote(this->Address.c_str()); + this->Internals->Analog = new vrpn_Analog_Remote(this->Address.c_str()); + this->Internals->Button = new vrpn_Button_Remote(this->Address.c_str()); + + this->Internals->Tracker->register_change_handler(static_cast(this), handleTrackerChange); + this->Internals->Analog->register_change_handler(static_cast(this), handleAnalogChange); + this->Internals->Button->register_change_handler(static_cast(this), handleButtonChange); + + return this->Initialized = true; +} + +// ----------------------------------------------------------------private-slot +void pqVRPNConnection::listen() +{ + if (this->Initialized) + { + this->Internals->Tracker->mainloop(); + this->Internals->Button->mainloop(); + this->Internals->Analog->mainloop(); + } +} + +// ----------------------------------------------------------------private-slot +bool pqVRPNConnection::start() +{ + if (!this->Initialized) + { + return false; + } + + this->Listener->addConnection(this); + return true; +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::stop() +{ + this->Listener->removeConnection(this); + + this->Initialized = false; + delete this->Internals->Analog; + this->Internals->Analog = nullptr; + delete this->Internals->Button; + this->Internals->Button = nullptr; + delete this->Internals->Tracker; + this->Internals->Tracker = nullptr; +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::newAnalogValue(vrpn_ANALOGCB data) +{ + vtkVREvent event; + event.connId = this->Address; + event.name = name(ANALOG_EVENT); + event.eventType = ANALOG_EVENT; + event.timeStamp = QDateTime::currentDateTime().toTime_t(); + event.data.analog.num_channels = data.num_channel; + for (int i = 0; i < data.num_channel; ++i) + { + event.data.analog.channel[i] = data.channel[i]; + } + this->EventQueue->Enqueue(event); +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::newButtonValue(vrpn_BUTTONCB data) +{ + vtkVREvent event; + event.connId = this->Address; + event.name = this->name(BUTTON_EVENT, data.button); + event.eventType = BUTTON_EVENT; + event.timeStamp = QDateTime::currentDateTime().toTime_t(); + event.data.button.button = data.button; + event.data.button.state = data.state; + this->EventQueue->Enqueue(event); +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::newTrackerValue(vrpn_TRACKERCB data) +{ + vtkVREvent event; + event.connId = this->Address; + event.name = name(TRACKER_EVENT, data.sensor); + event.eventType = TRACKER_EVENT; + event.timeStamp = QDateTime::currentDateTime().toTime_t(); + event.data.tracker.sensor = data.sensor; + double rotMatrix[3][3]; + double vtkQuat[4] = { data.quat[3], data.quat[0], data.quat[1], data.quat[2] }; + vtkMath::QuaternionToMatrix3x3(vtkQuat, rotMatrix); + vtkMatrix4x4* matrix = vtkMatrix4x4::New(); +#define COLUMN_MAJOR 1 +#if COLUMN_MAJOR + matrix->Element[0][0] = rotMatrix[0][0]; + matrix->Element[0][1] = rotMatrix[0][1]; + matrix->Element[0][2] = rotMatrix[0][2]; + matrix->Element[0][3] = data.pos[0] * 1; + + matrix->Element[1][0] = rotMatrix[1][0]; + matrix->Element[1][1] = 1 * rotMatrix[1][1]; + matrix->Element[1][2] = rotMatrix[1][2]; + matrix->Element[1][3] = data.pos[1]; + + matrix->Element[2][0] = rotMatrix[2][0]; + matrix->Element[2][1] = rotMatrix[2][1]; + matrix->Element[2][2] = rotMatrix[2][2]; + matrix->Element[2][3] = data.pos[2]; + + matrix->Element[3][0] = 0.0f; + matrix->Element[3][1] = 0.0f; + matrix->Element[3][2] = 0.0f; + matrix->Element[3][3] = 1.0f; + +#else + + matrix->Element[0][0] = rotMatrix[0][0]; + matrix->Element[1][0] = rotMatrix[0][1]; + matrix->Element[2][0] = rotMatrix[0][2]; + matrix->Element[3][0] = 0.0; + + matrix->Element[0][1] = rotMatrix[1][0]; + matrix->Element[1][1] = rotMatrix[1][1]; + matrix->Element[2][1] = rotMatrix[1][2]; + matrix->Element[3][1] = 0.0; + + matrix->Element[0][2] = rotMatrix[2][0]; + matrix->Element[1][2] = rotMatrix[2][1]; + matrix->Element[2][2] = rotMatrix[2][2]; + matrix->Element[3][2] = 0.0; + + matrix->Element[0][3] = data.pos[0] * 1; + matrix->Element[1][3] = data.pos[1]; + matrix->Element[2][3] = data.pos[2]; + matrix->Element[3][3] = 1.0f; +#endif + + vtkMatrix4x4::Multiply4x4(this->Transformation, matrix, matrix); + +#if COLUMN_MAJOR + event.data.tracker.matrix[0] = matrix->Element[0][0]; + event.data.tracker.matrix[1] = matrix->Element[0][1]; + event.data.tracker.matrix[2] = matrix->Element[0][2]; + event.data.tracker.matrix[3] = matrix->Element[0][3]; + + event.data.tracker.matrix[4] = matrix->Element[1][0]; + event.data.tracker.matrix[5] = matrix->Element[1][1]; + event.data.tracker.matrix[6] = matrix->Element[1][2]; + event.data.tracker.matrix[7] = matrix->Element[1][3]; + + event.data.tracker.matrix[8] = matrix->Element[2][0]; + event.data.tracker.matrix[9] = matrix->Element[2][1]; + event.data.tracker.matrix[10] = matrix->Element[2][2]; + event.data.tracker.matrix[11] = matrix->Element[2][3]; + + event.data.tracker.matrix[12] = matrix->Element[3][0]; + event.data.tracker.matrix[13] = matrix->Element[3][1]; + event.data.tracker.matrix[14] = matrix->Element[3][2]; + event.data.tracker.matrix[15] = matrix->Element[3][3]; +#else + event.data.tracker.matrix[0] = matrix->Element[0][0]; + event.data.tracker.matrix[1] = matrix->Element[1][0]; + event.data.tracker.matrix[2] = matrix->Element[2][0]; + event.data.tracker.matrix[3] = matrix->Element[3][0]; + + event.data.tracker.matrix[4] = matrix->Element[0][1]; + event.data.tracker.matrix[5] = matrix->Element[1][1]; + event.data.tracker.matrix[6] = matrix->Element[2][1]; + event.data.tracker.matrix[7] = matrix->Element[3][1]; + + event.data.tracker.matrix[8] = matrix->Element[0][2]; + event.data.tracker.matrix[9] = matrix->Element[1][2]; + event.data.tracker.matrix[10] = matrix->Element[2][2]; + event.data.tracker.matrix[11] = matrix->Element[3][2]; + + event.data.tracker.matrix[12] = matrix->Element[0][3]; + event.data.tracker.matrix[13] = matrix->Element[1][3]; + event.data.tracker.matrix[14] = matrix->Element[2][3]; + event.data.tracker.matrix[15] = matrix->Element[3][3]; +#endif + matrix->Delete(); + this->EventQueue->Enqueue(event); +} + +// ---------------------------------------------------------------------private +std::string pqVRPNConnection::name(int eventType, int id) +{ + std::stringstream returnStr, eventStr; + if (this->Name.size()) + returnStr << this->Name << "."; + else + returnStr << this->Address << "."; + switch (eventType) + { + case ANALOG_EVENT: + eventStr << "analog." << id; + if (this->AnalogMapping.find(eventStr.str()) != this->AnalogMapping.end()) + returnStr << this->AnalogMapping[eventStr.str()]; + else + returnStr << eventStr.str(); + break; + case BUTTON_EVENT: + eventStr << "button." << id; + if (this->ButtonMapping.find(eventStr.str()) != this->ButtonMapping.end()) + returnStr << this->ButtonMapping[eventStr.str()]; + else + returnStr << eventStr.str(); + break; + case TRACKER_EVENT: + eventStr << "tracker." << id; + if (this->TrackerMapping.find(eventStr.str()) != this->TrackerMapping.end()) + returnStr << this->TrackerMapping[eventStr.str()]; + else + returnStr << eventStr.str(); + break; + } + return returnStr.str(); +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::verifyConfig(const char* id, const char* name) +{ + if (!id) + { + qWarning() << "\"id\" should be specified"; + } + if (!name) + { + qWarning() << "\"name\" should be specified"; + } +} + +// ----------------------------------------------------------------------public +bool pqVRPNConnection::configure(vtkPVXMLElement* child, vtkSMProxyLocator*) +{ + bool returnVal = false; + if (child->GetName() && strcmp(child->GetName(), "VRPNConnection") == 0) + { + for (unsigned neCount = 0; neCount < child->GetNumberOfNestedElements(); ++neCount) + { + vtkPVXMLElement* nestedElement = child->GetNestedElement(neCount); + if (nestedElement && nestedElement->GetName()) + { + const char* id = nestedElement->GetAttributeOrEmpty("id"); + const char* name = nestedElement->GetAttributeOrEmpty("name"); + this->verifyConfig(id, name); + + if (strcmp(nestedElement->GetName(), "Button") == 0) + { + this->addButton(id, name); + } + else if (strcmp(nestedElement->GetName(), "Analog") == 0) + { + this->addAnalog(id, name); + } + else if (strcmp(nestedElement->GetName(), "Tracker") == 0) + { + this->addTracking(id, name); + } + else if (strcmp(nestedElement->GetName(), "TrackerTransform") == 0) + { + this->configureTransform(nestedElement); + } + + else + { + qWarning() << "Unknown Device type: \"" << nestedElement->GetName() << "\""; + } + returnVal = true; + } + } + } + return returnVal; +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::configureTransform(vtkPVXMLElement* child) +{ + if (child->GetName() && strcmp(child->GetName(), "TrackerTransform") == 0) + { + child->GetVectorAttribute("value", 16, (double*)this->Transformation->Element); + this->TrackerTransformPresent = true; + } +} + +// ----------------------------------------------------------------------public +vtkPVXMLElement* pqVRPNConnection::saveConfiguration() const +{ + vtkPVXMLElement* child = vtkPVXMLElement::New(); + child->SetName("VRPNConnection"); + child->AddAttribute("name", this->Name.c_str()); + child->AddAttribute("address", this->Address.c_str()); + saveButtonEventConfig(child); + saveAnalogEventConfig(child); + saveTrackerEventConfig(child); + saveTrackerTransformationConfig(child); + return child; +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::saveButtonEventConfig(vtkPVXMLElement* child) const +{ + if (!this->ButtonPresent) + return; + for (std::map::const_iterator iter = this->ButtonMapping.begin(); + iter != this->ButtonMapping.end(); ++iter) + { + std::string key = iter->first; + std::string value = iter->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* element = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "button") == 0) + { + element->SetName("Button"); + element->AddAttribute("id", token[1].c_str()); + element->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(element); + element->FastDelete(); + } +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::saveAnalogEventConfig(vtkPVXMLElement* child) const +{ + if (!this->AnalogPresent) + return; + for (std::map::const_iterator iter = this->AnalogMapping.begin(); + iter != this->AnalogMapping.end(); ++iter) + { + std::string key = iter->first; + std::string value = iter->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* element = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "analog") == 0) + { + element->SetName("Analog"); + element->AddAttribute("id", token[1].c_str()); + element->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(element); + element->FastDelete(); + } +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::saveTrackerEventConfig(vtkPVXMLElement* child) const +{ + if (!this->TrackerPresent) + return; + for (std::map::const_iterator iter = this->TrackerMapping.begin(); + iter != this->TrackerMapping.end(); ++iter) + { + std::string key = iter->first; + std::string value = iter->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* element = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "tracker") == 0) + { + element->SetName("Tracker"); + element->AddAttribute("id", token[1].c_str()); + element->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(element); + element->FastDelete(); + } +} + +// ---------------------------------------------------------------------private +void pqVRPNConnection::saveTrackerTransformationConfig(vtkPVXMLElement* child) const +{ + if (!this->TrackerTransformPresent) + return; + vtkPVXMLElement* transformationMatrix = vtkPVXMLElement::New(); + transformationMatrix->SetName("TrackerTransform"); + std::stringstream matrix; + for (int i = 0; i < 16; ++i) + { + matrix << double(*((double*)this->Transformation->Element + i)) << " "; + } + transformationMatrix->AddAttribute("value", matrix.str().c_str()); + child->AddNestedElement(transformationMatrix); + transformationMatrix->FastDelete(); +} + +// ----------------------------------------------------------------------public +void pqVRPNConnection::setTransformation(vtkMatrix4x4* matrix) +{ + for (int i = 0; i < 4; ++i) + { + for (int j = 0; j < 4; ++j) + { + this->Transformation->SetElement(i, j, matrix->GetElement(i, j)); + } + } + this->TrackerTransformPresent = true; +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNConnection.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNConnection.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNConnection.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNConnection.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,199 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRPNConnection.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRPNConnection_h +#define pqVRPNConnection_h + +#include + +#include "vtkMatrix4x4.h" +#include "vtkTransform.h" +#include "vtkVRQueue.h" + +#include + +#include +#include +#include + +#include + +class pqVRPNEventListener; + +class vtkPVXMLElement; +class vtkSMProxyLocator; + +/// Callback to listen to VRPN events +class pqVRPNConnection : public QObject +{ + Q_OBJECT + typedef QObject Superclass; + +public: + explicit pqVRPNConnection(QObject* parent = 0); + virtual ~pqVRPNConnection(); + + // Description: + // Address of the device. For example, "Tracker0@localhost" + void setAddress(std::string address); + + // Description: + // Address of the device. For example, "Tracker0@localhost" + std::string address() { return this->Address; } + + // Description: + // Set the device name. + void setName(std::string name); + + // Description: + // Get the device name. + std::string name() { return this->Name; } + + // Description: + // Add button device + void addButton(std::string id, std::string name); + + // Description: + // Add Analog device + void addAnalog(std::string id, std::string name); + + // Description: + // Add tracking device + void addTracking(std::string id, std::string name); + + // Description: + // Adding a transformation matrix + void setTransformation(vtkMatrix4x4* matrix); + + // Description: + // Initialize the device with the name. + bool init(); + + // Description: + // Register this connection with the event listener and request that the + // event listener start. + bool start(); + + // Description: + // Terminate the thread + void stop(); + + // Description: + // Sets the Event Queue into which the vrpn data needs to be written + void setQueue(vtkVRQueue* queue); + + /// configure the style using the xml configuration. + virtual bool configure(vtkPVXMLElement* child, vtkSMProxyLocator*); + + /// save the xml configuration. + virtual vtkPVXMLElement* saveConfiguration() const; + + /// Access to analog map + std::map analogMap() { return this->AnalogMapping; } + /// Access to analog map + void setAnalogMap(const std::map& mapping) + { + this->AnalogMapping = mapping; + this->AnalogPresent = (this->AnalogMapping.size() > 0); + } + + /// Access to button map + std::map buttonMap() { return this->ButtonMapping; } + /// Access to button map + void setButtonMap(const std::map& mapping) + { + this->ButtonMapping = mapping; + this->ButtonPresent = (this->ButtonMapping.size() > 0); + } + + /// Access to tracker map + std::map trackerMap() { return this->TrackerMapping; } + /// Access to tracker map + void setTrackerMap(const std::map& mapping) + { + this->TrackerMapping = mapping; + this->TrackerPresent = (this->TrackerMapping.size() > 0); + } + +protected Q_SLOTS: + /// This is called by VRPNEventListener in a threadsafe manner, and should not + /// be called directly. + void listen(); + +protected: + std::string name(int eventType, int id = 0); + + friend class pqVREventPlayer; + void newAnalogValue(vrpn_ANALOGCB data); + void newButtonValue(vrpn_BUTTONCB data); + void newTrackerValue(vrpn_TRACKERCB data); + void verifyConfig(const char* id, const char* name); + + void configureTransform(vtkPVXMLElement* child); + void saveButtonEventConfig(vtkPVXMLElement* child) const; + void saveAnalogEventConfig(vtkPVXMLElement* child) const; + void saveTrackerEventConfig(vtkPVXMLElement* child) const; + void saveTrackerTranslationConfig(vtkPVXMLElement* child) const; + void saveTrackerRotationConfig(vtkPVXMLElement* child) const; + void saveTrackerTransformationConfig(vtkPVXMLElement* child) const; + friend void VRPN_CALLBACK handleAnalogChange(void* userdata, const vrpn_ANALOGCB b); + friend void VRPN_CALLBACK handleButtonChange(void* userdata, vrpn_BUTTONCB b); + friend void VRPN_CALLBACK handleTrackerChange(void* userdata, const vrpn_TRACKERCB t); + + std::string Name; + std::string Address; + std::string Type; + + // std::map Mapping; + std::map ButtonMapping; + std::map AnalogMapping; + std::map TrackerMapping; + + bool TrackerPresent, ButtonPresent, AnalogPresent, TrackerTransformPresent; + vtkMatrix4x4* Transformation; + + bool Initialized; + + // The shared thread and listener that listens to incoming events. + friend class pqVRPNEventListener; + friend class pqVRPNThreadBridge; + static pqVRPNEventListener* Listener; + + vtkVRQueue* EventQueue; + + class pqInternals; + pqInternals* Internals; + +private: + Q_DISABLE_COPY(pqVRPNConnection) +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNEventListener.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNEventListener.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNEventListener.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNEventListener.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,172 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRPNEventListener.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ + +#include "pqVRPNEventListener.h" + +#include "pqVRPNConnection.h" + +#include // For qWarning +#include +#include + +//------------------------------------------------------------------------------ +pqVRPNEventListener::pqVRPNEventListener(QObject* _parent) + : Superclass(_parent) + , Bridge(new pqVRPNThreadBridge) +{ + this->Bridge->moveToThread(&this->Thread); + connect(this, SIGNAL(addConnectionInternal(pqVRPNConnection*)), this->Bridge, + SLOT(addConnection(pqVRPNConnection*))); + connect(this, SIGNAL(removeConnectionInternal(pqVRPNConnection*)), this->Bridge, + SLOT(removeConnection(pqVRPNConnection*))); + connect(this, SIGNAL(listen()), this->Bridge, SLOT(listen())); +} + +//------------------------------------------------------------------------------ +pqVRPNEventListener::~pqVRPNEventListener() +{ + if (this->isRunning()) + { + this->stop(); + } + delete Bridge; +} + +//------------------------------------------------------------------------------ +void pqVRPNEventListener::addConnection(pqVRPNConnection* conn) +{ + this->connect(conn, SIGNAL(destroyed()), this, SLOT(removeSenderConnection())); + + if (this->isRunning()) + { + // Need to synchronize and use signals/slots if running. + this->Bridge->SyncMutex.lock(); + Q_EMIT addConnectionInternal(conn); + this->Bridge->SyncCondition.wait(&this->Bridge->SyncMutex); + this->Bridge->SyncMutex.unlock(); + } + else + { + // Otherwise just call the slot directly. + this->Bridge->addConnection(conn); + this->start(); + } +} + +//------------------------------------------------------------------------------ +void pqVRPNThreadBridge::addConnection(pqVRPNConnection* conn) +{ + this->SyncMutex.lock(); + if (!this->Connections.contains(conn)) + { + this->Connections.append(conn); + } + this->SyncMutex.unlock(); + this->SyncCondition.wakeAll(); +} + +//------------------------------------------------------------------------------ +void pqVRPNEventListener::removeConnection(pqVRPNConnection* conn) +{ + this->disconnect(conn); + if (this->isRunning()) + { + // Need to synchronize and use signals/slots if running. + this->Bridge->SyncMutex.lock(); + Q_EMIT removeConnectionInternal(conn); + this->Bridge->SyncCondition.wait(&this->Bridge->SyncMutex); + bool needsStop = this->Bridge->Connections.isEmpty(); + this->Bridge->SyncMutex.unlock(); + if (needsStop) + { + this->stop(); + } + } + else + { + // Otherwise just call the slot directly. + this->Bridge->removeConnection(conn); + } +} + +//------------------------------------------------------------------------------ +void pqVRPNThreadBridge::removeConnection(pqVRPNConnection* conn) +{ + this->SyncMutex.lock(); + this->Connections.removeOne(conn); + this->SyncMutex.unlock(); + this->SyncCondition.wakeAll(); +} + +//------------------------------------------------------------------------------ +void pqVRPNEventListener::removeSenderConnection() +{ + if (pqVRPNConnection* conn = qobject_cast(this->sender())) + { + this->removeConnection(conn); + } +} + +//------------------------------------------------------------------------------ +void pqVRPNEventListener::start() +{ + if (this->isRunning()) + { + qWarning("pqVRPNEventListener::start() called while already running!"); + return; + } + this->Thread.start(); + Q_EMIT listen(); +} + +//------------------------------------------------------------------------------ +void pqVRPNEventListener::stop() +{ + if (!this->isRunning()) + { + qWarning("pqVRPNEventListener::stop() called while not running."); + } + this->Thread.exit(0); +} + +//------------------------------------------------------------------------------ +void pqVRPNThreadBridge::listen() +{ + Q_FOREACH (pqVRPNConnection* conn, this->Connections) + { + conn->listen(); + } + // Immediately post another call to this method on the thread's event loop. + // This way connections can be added and removed safely by serializing access + // to the connection container via the event loop. + QTimer::singleShot(0, this, SLOT(listen())); +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNEventListener.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNEventListener.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRPNEventListener.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRPNEventListener.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,110 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRPNEventListener.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ + +#ifndef pqVRPNEventListener_h +#define pqVRPNEventListener_h + +#include +#include +#include +#include + +class pqVRPNConnection; +class pqVRPNThreadBridge; // Defined below +class pqVRPNEventListener : public QObject +{ + Q_OBJECT +public: + typedef QObject Superclass; + explicit pqVRPNEventListener(QObject* _parent = nullptr); + ~pqVRPNEventListener(); + + // Description: + // Returns true if the listener has started. + bool isRunning() const { return this->Thread.isRunning(); } + +public Q_SLOTS: + // Description: + // Register a connection with the listener. The listener will automatically + // start listening for events when the first connection is registered. The + // connection will be removed automatically when it is deleted, or when + // removeConnection is called. The listener will stop listening once all + // connection are removed. + void addConnection(pqVRPNConnection* conn); + + // Description: + // Remove a connection from the listener. + void removeConnection(pqVRPNConnection* conn); + + // Description: + // Remove the pqVRPNConnection that is the Qt signal/slot sender which + // triggered this call. + void removeSenderConnection(); + +Q_SIGNALS: + + // Description: + // Internal use only. + void addConnectionInternal(pqVRPNConnection* conn); + void removeConnectionInternal(pqVRPNConnection* conn); + void listen(); + +private: + // Description: + // Start the listener. + void start(); + + // Description: + // Stop the listener. + void stop(); + + pqVRPNThreadBridge* Bridge; + QThread Thread; +}; + +class pqVRPNThreadBridge : public QObject +{ + Q_OBJECT +public: + QMutex SyncMutex; + QWaitCondition SyncCondition; + QList Connections; + +public Q_SLOTS: + void addConnection(pqVRPNConnection* conn); + void removeConnection(pqVRPNConnection* conn); + +protected Q_SLOTS: + void listen(); +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRQueueHandler.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRQueueHandler.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRQueueHandler.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRQueueHandler.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,294 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRQueueHandler.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRQueueHandler.h" + +#include "vtkCollection.h" +#include "vtkNew.h" +#include "vtkObjectFactory.h" +#include "vtkPVXMLElement.h" +#include "vtkSMRenderViewProxy.h" +#include "vtkVRGrabWorldStyle.h" +#include "vtkVRInteractorStyle.h" +#include "vtkVRInteractorStyleFactory.h" +#include "vtkVRQueue.h" +#include "vtkVRTrackStyle.h" +#include "vtkWeakPointer.h" + +#include "pqActiveObjects.h" +#include "pqApplicationCore.h" +#include "pqView.h" + +#include +#include +#include + +#include + +class pqVRQueueHandler::pqInternals +{ +public: + vtkNew Styles; + vtkWeakPointer Queue; + QTimer Timer; +}; + +//---------------------------------------------------------------------------- +QPointer pqVRQueueHandler::Instance; + +//---------------------------------------------------------------------------- +pqVRQueueHandler* pqVRQueueHandler::instance() +{ + return pqVRQueueHandler::Instance; +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::setInstance(pqVRQueueHandler* inst) +{ + pqVRQueueHandler::Instance = inst; +} + +//---------------------------------------------------------------------------- +pqVRQueueHandler::pqVRQueueHandler(vtkVRQueue* queue, QObject* parentObject) + : Superclass(parentObject) +{ + this->Internals = new pqInternals(); + this->Internals->Queue = queue; + this->Internals->Timer.setInterval(1); + this->Internals->Timer.setSingleShot(true); + QObject::connect(&this->Internals->Timer, SIGNAL(timeout()), this, SLOT(processEvents())); + + QObject::connect(pqApplicationCore::instance(), + SIGNAL(stateLoaded(vtkPVXMLElement*, vtkSMProxyLocator*)), this, + SLOT(configureStyles(vtkPVXMLElement*, vtkSMProxyLocator*))); + QObject::connect(pqApplicationCore::instance(), SIGNAL(stateSaved(vtkPVXMLElement*)), this, + SLOT(saveStylesConfiguration(vtkPVXMLElement*))); +} + +//---------------------------------------------------------------------------- +pqVRQueueHandler::~pqVRQueueHandler() +{ + delete this->Internals; +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::add(vtkVRInteractorStyle* style) +{ + if (!this->Internals->Styles->IsItemPresent(style)) + { + this->Internals->Styles->AddItem(style); + Q_EMIT stylesChanged(); + return; + } +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::remove(vtkVRInteractorStyle* style) +{ + this->Internals->Styles->RemoveItem(style); + Q_EMIT stylesChanged(); +} + +//----------------------------------------------------------------------public +void pqVRQueueHandler::clear() +{ + if (this->Internals->Styles->GetNumberOfItems() != 0) + { + this->Internals->Styles->RemoveAllItems(); + Q_EMIT stylesChanged(); + } +} + +//----------------------------------------------------------------------public +QList pqVRQueueHandler::styles() +{ + vtkVRInteractorStyle* style; + QList result; + for (this->Internals->Styles->InitTraversal(); + (style = + vtkVRInteractorStyle::SafeDownCast(this->Internals->Styles->GetNextItemAsObject()));) + { + result << style; + } + + return result; +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::start() +{ + this->Internals->Timer.start(); +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::stop() +{ + this->Internals->Timer.stop(); +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::processEvents() +{ + assert(this->Internals->Queue != nullptr); + std::queue events; + this->Internals->Queue->TryDequeue(events); + + // Loop through the event queue and pass events to InteractorStyles + while (!events.empty()) + { + vtkVREvent event = events.front(); /* get first event on the queue */ + events.pop(); + vtkVRInteractorStyle* style; + for (this->Internals->Styles->InitTraversal(); + (style = + vtkVRInteractorStyle::SafeDownCast(this->Internals->Styles->GetNextItemAsObject()));) + { + if (style->HandleEvent(event)) + { + break; + } + } + } + + // There should be an explicit update for each handler. Otherwise the server + // side updates will not happen + vtkVRInteractorStyle* style; + for (this->Internals->Styles->InitTraversal(); + (style = + vtkVRInteractorStyle::SafeDownCast(this->Internals->Styles->GetNextItemAsObject()));) + { + if (style->Update()) + { + break; + } + } + + this->render(); + + // since timer is single-shot we start it again. + this->Internals->Timer.start(); +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::render() +{ + vtkSMRenderViewProxy* proxy = 0; + pqView* view = 0; + view = pqActiveObjects::instance().activeView(); + if (view) + { + proxy = vtkSMRenderViewProxy::SafeDownCast(view->getViewProxy()); + if (proxy) + { + proxy->StillRender(); + } + } +} + +//---------------------------------------------------------------------------- +/* Sample PVVR configuration: */ +/* */ +/* */ +/* */ +/* */ +/* */ +/* */ +void pqVRQueueHandler::configureStyles(vtkPVXMLElement* xml, vtkSMProxyLocator* locator) +{ + if (!xml) + { + return; + } + + if (xml->GetName() && strcmp(xml->GetName(), "VRInteractorStyles") == 0) + { + this->clear(); + vtkVRInteractorStyleFactory* factory = vtkVRInteractorStyleFactory::GetInstance(); + for (unsigned cc = 0; cc < xml->GetNumberOfNestedElements(); cc++) + { + vtkPVXMLElement* child = xml->GetNestedElement(cc); + if (child && child->GetName() && strcmp(child->GetName(), "Style") == 0) + { + const char* class_name = child->GetAttributeOrEmpty("class"); + vtkVRInteractorStyle* style = factory->NewInteractorStyleFromClassName(class_name); + if (style) + { + if (style->Configure(child, locator)) + { + this->add(style); + } + else + { + style->Delete(); + } + } + else + { + qWarning() << "Unknown interactor style: \"" << class_name << "\""; + } + } + } + } + else + { + this->configureStyles(xml->FindNestedElementByName("VRInteractorStyles"), locator); + } + + Q_EMIT stylesChanged(); +} + +//---------------------------------------------------------------------------- +void pqVRQueueHandler::saveStylesConfiguration(vtkPVXMLElement* root) +{ + assert(root != nullptr); + + vtkPVXMLElement* tempParent = vtkPVXMLElement::New(); + tempParent->SetName("VRInteractorStyles"); + vtkVRInteractorStyle* style; + for (this->Internals->Styles->InitTraversal(); + (style = + vtkVRInteractorStyle::SafeDownCast(this->Internals->Styles->GetNextItemAsObject()));) + { + vtkPVXMLElement* child = style->SaveConfiguration(); + if (child) + { + tempParent->AddNestedElement(child); + child->Delete(); + } + } + root->AddNestedElement(tempParent); + tempParent->Delete(); +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRQueueHandler.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRQueueHandler.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRQueueHandler.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRQueueHandler.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,94 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRQueueHandler.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRQueueHandler_h +#define pqVRQueueHandler_h + +#include +#include + +class vtkVRInteractorStyle; +class vtkVRQueue; +class vtkPVXMLElement; +class vtkSMProxyLocator; + +/// pqVRQueueHandler is a class that process events stacked on to vtkVRQueue +/// one by one. One adds vtkVRInteractorStyles to the handler to do any actual +/// work with these events. +class pqVRQueueHandler : public QObject +{ + Q_OBJECT + typedef QObject Superclass; + +public: + pqVRQueueHandler(vtkVRQueue* queue, QObject* parent = 0); + virtual ~pqVRQueueHandler(); + + /// Add/remove interactor style. + void add(vtkVRInteractorStyle* style); + void remove(vtkVRInteractorStyle* style); + void clear(); + + QList styles(); + + static pqVRQueueHandler* instance(); + +public Q_SLOTS: + /// start/stop queue processing. + void start(); + void stop(); + + /// clears current interactor styles and loads a new set of styles from the + /// XML configuration. + void configureStyles(vtkPVXMLElement* xml, vtkSMProxyLocator* locator); + + /// saves the styles configuration. + void saveStylesConfiguration(vtkPVXMLElement* root); + +Q_SIGNALS: + void stylesChanged(); + +protected Q_SLOTS: + /// called to processes events from the queue. + void processEvents(); + +private: + Q_DISABLE_COPY(pqVRQueueHandler) + void render(); + class pqInternals; + pqInternals* Internals; + + friend class pqVRStarter; + static void setInstance(pqVRQueueHandler*); + static QPointer Instance; +}; + +#endif // pqVRQueueHandler_h diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRStarter.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRStarter.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRStarter.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRStarter.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,192 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRStarter.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#include "pqVRStarter.h" +#include "pqApplicationCore.h" +#include "pqTestUtility.h" +#include "pqVRConnectionManager.h" +#include "pqVRQueueHandler.h" +#include "pqWidgetEventPlayer.h" +#include "vtkPVVRConfig.h" +#include "vtkPVXMLElement.h" +#include "vtkProcessModule.h" +#include "vtkVRInteractorStyleFactory.h" +#include "vtkVRQueue.h" + +#include +#include + +// Used for testing: +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN +#include +class pqVREventPlayer : public pqWidgetEventPlayer +{ + typedef pqWidgetEventPlayer Superclass; + +public: + pqVREventPlayer(QObject* _parent) + : Superclass(_parent) + { + } + virtual bool playEvent(QObject*, const QString& command, const QString& arguments, bool& error) + { + if (command == "pqVREvent") + { + if (arguments.startsWith("vrpn_trackerEvent")) + { + // Syntax is (one line:) + // "vrpn_trackerEvent:[connName];[sensorid];[pos_x],[pos_y],[pos_z]; + // [quat_w],[quat_x],[quat_y],[quat_z]" + QRegExp capture("vrpn_trackerEvent:" + "([\\w.@]+);" // Connection name + "(\\d+);" // sensor id + "([\\d.-]+)," // pos_x + "([\\d.-]+)," // pos_y + "([\\d.-]+);" // pos_z + "([\\d.-]+)," // quat_w + "([\\d.-]+)," // quat_x + "([\\d.-]+)," // quat_y + "([\\d.-]+)$" // quat_z + ); + int ind = capture.indexIn(arguments); + if (ind < 0) + { + qWarning() << "pqVREventPlayer: bad arguments:" << command; + error = true; + return false; + } + vrpn_TRACKERCB event; + QString connName; + connName = capture.cap(1); + event.sensor = capture.cap(2).toInt(); + event.pos[0] = capture.cap(3).toDouble(); + event.pos[1] = capture.cap(4).toDouble(); + event.pos[2] = capture.cap(5).toDouble(); + event.quat[0] = capture.cap(6).toDouble(); + event.quat[1] = capture.cap(7).toDouble(); + event.quat[2] = capture.cap(8).toDouble(); + event.quat[3] = capture.cap(9).toDouble(); + pqVRConnectionManager* mgr = pqVRConnectionManager::instance(); + pqVRPNConnection* conn = mgr->GetVRPNConnection(connName); + if (!conn) + { + qWarning() << "pqVREventPlayer: bad connection name:" << command; + error = true; + return false; + } + conn->newTrackerValue(event); + return true; + } + else + { + error = true; + } + return true; + } + else + { + return false; + } + } +}; +#endif // PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + +//----------------------------------------------------------------------------- +class pqVRStarter::pqInternals +{ +public: + pqVRConnectionManager* ConnectionManager; + vtkVRQueue* EventQueue; + pqVRQueueHandler* Handler; + vtkVRInteractorStyleFactory* StyleFactory; +}; + +//----------------------------------------------------------------------------- +pqVRStarter::pqVRStarter(QObject* _parent /*=0*/) + : QObject(_parent) +{ + this->Internals = new pqInternals; + this->Internals->EventQueue = nullptr; + this->Internals->Handler = nullptr; + this->Internals->StyleFactory = nullptr; + +#if PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + pqVREventPlayer* player = new pqVREventPlayer(nullptr); + pqApplicationCore::instance()->testUtility()->eventPlayer()->addWidgetEventPlayer(player); +#endif // PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN + + this->IsShutdown = true; +} + +//----------------------------------------------------------------------------- +pqVRStarter::~pqVRStarter() +{ + if (!this->IsShutdown) + { + this->onShutdown(); + } +} + +//----------------------------------------------------------------------------- +void pqVRStarter::onStartup() +{ + if (!this->IsShutdown) + { + qWarning() << "pqVRStarter: Cannot startup -- already started."; + return; + } + this->IsShutdown = false; + this->Internals->EventQueue = vtkVRQueue::New(); + this->Internals->ConnectionManager = new pqVRConnectionManager(this->Internals->EventQueue, this); + pqVRConnectionManager::setInstance(this->Internals->ConnectionManager); + this->Internals->Handler = new pqVRQueueHandler(this->Internals->EventQueue, this); + pqVRQueueHandler::setInstance(this->Internals->Handler); + this->Internals->StyleFactory = vtkVRInteractorStyleFactory::New(); + vtkVRInteractorStyleFactory::SetInstance(this->Internals->StyleFactory); +} + +//----------------------------------------------------------------------------- +void pqVRStarter::onShutdown() +{ + if (this->IsShutdown) + { + qWarning() << "pqVRStarter: Cannot shutdown -- not started yet."; + return; + } + this->IsShutdown = true; + pqVRConnectionManager::setInstance(nullptr); + pqVRQueueHandler::setInstance(nullptr); + vtkVRInteractorStyleFactory::SetInstance(nullptr); + delete this->Internals->Handler; + delete this->Internals->ConnectionManager; + this->Internals->EventQueue->Delete(); + this->Internals->StyleFactory->Delete(); +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRStarter.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRStarter.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRStarter.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRStarter.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,74 @@ +/*========================================================================= + + Program: ParaView + Module: pqVRStarter.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRStarter_h +#define pqVRStarter_h +#include + +class QTimer; +class vtkVRQueue; +class pqVRQueueHandler; +class vtkPVXMLElement; +class vtkSMProxyLocator; + +/// pqVRStarter creates and establishes the framework for VR device. There are +/// three primary objects that make up the framework, vtkVRConnectionManager, +/// vtkVRQueue and VRQueueHandler. vtkVRConnectionManager and the +/// vtkVRQueueHandler are threads one acting as a source and other as the +/// destination for coming in from various VR connection servers (VRPN and +/// VRUI). vtkVRQueue is a asynchronous queue established between the +/// VRConnectionManager and the vtkVRQueueHandler. +class pqVRStarter : public QObject +{ + Q_OBJECT + typedef QObject Superclass; + +public: + pqVRStarter(QObject* _parent = 0); + ~pqVRStarter(); + + /// Creates and initiates the vtkVRConnectionManager thread the vtkVRQueue and + /// vtkVRQueueHandler thread. + void onStartup(); + + /// Stops the vtkVRConnectioManager and vtkVRQueueHandler threads. Also + /// deletes the corresponding objects including vtkVRQueue. + void onShutdown(); + +private: + Q_DISABLE_COPY(pqVRStarter) + + class pqInternals; + pqInternals* Internals; + bool IsShutdown; +}; + +#endif // pqVRStarter_h diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRUIConnection.cxx paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRUIConnection.cxx --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRUIConnection.cxx 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRUIConnection.cxx 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,865 @@ +/*========================================================================= + + Program: ParaView + Module: vtkVRUIConnection.cxx + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + ========================================================================*/ +#include "pqVRUIConnection.h" + +#include "pqActiveObjects.h" +#include "pqView.h" +#include "vtkMath.h" +#include "vtkMatrix4x4.h" +#include "vtkObjectFactory.h" +#include "vtkPVXMLElement.h" +#include "vtkSMDoubleVectorProperty.h" +#include "vtkSMPropertyHelper.h" +#include "vtkSMRenderViewProxy.h" +#include "vtkSMRepresentationProxy.h" +#include "vtkTransform.h" +#include "vtkVRUIPipe.h" +#include "vtkVRUIServerState.h" +#include "vtkVRUITrackerState.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef QTSOCK +#include +#else +#include +#include +#include +#include +#include +#endif + +// ---------------------------------------------------------------------------- +class pqVRUIConnection::pqInternals +{ +public: + // -------------------------------------------------------------------------- + pqInternals() + { +#ifdef QTSOCK + this->Socket = false; +#else + this->Socket = -1; +#endif + this->Active = false; + this->Pipe = 0; + this->State = 0; + this->StateMutex = 0; + this->Streaming = false; // streaming + // this->PacketSignalCond=0; // for streaming + // this->PacketSignalCondMutex=0; // for streaming + } + + // -------------------------------------------------------------------------- + ~pqInternals() + { + if (this->Pipe != 0) + { + delete this->Pipe; + } + if (this->State != 0) + { + delete this->State; + } + } + +#ifdef QTSOCK + QTcpSocket* Socket; +#else + int Socket; +#endif + bool Active; + vtkVRUIPipe* Pipe; + vtkVRUIServerState* State; + QMutex* StateMutex; + bool Streaming; // streaming + // QWaitCondition *PacketSignalCond; // for streaming + // QMutex *PacketSignalCondMutex; // for streaming + + // -------------------------------------------------------------------------- + void initSocket(std::string address, std::string port) + { +#ifdef QTSOCK + this->Socket = new QTcpSocket; +#ifdef VRUI_ENABLE_DEBUG + qDebug() << QString(address.c_str()) << "::" << QString(port.c_str()).toInt(); +#endif + + this->Socket->connectToHost(QString(address.c_str()), + QString(port.c_str()).toInt()); // ReadWrite? +#else + struct sockaddr_in client_addr; + struct hostent* hp; + + this->Socket = socket(AF_INET, SOCK_STREAM, 0); + if (this->Socket < 0) + { +#ifdef VRUI_ENABLE_DEBUG + qDebug() << "Error opening stream socket"; + abort(); +#endif + } + + /* Name socket using file system name */ + hp = gethostbyname(address.c_str()); + if (hp == 0) + { + fprintf(stderr, "%s: unknown host\n", address.c_str()); + return; + } + bcopy(hp->h_addr, &client_addr.sin_addr, hp->h_length); + + client_addr.sin_family = AF_INET; + client_addr.sin_port = htons((uint16_t)atoi(port.c_str())); + + if (::connect(this->Socket, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in)) < 0) + { /* TODO: why is this "sockaddr", when the type is "sockaddr_in" ?? */ + close(this->Socket); + perror("connecting stream socket"); + return; + } +#endif + } + + // -------------------------------------------------------------------------- + void initPipe() { this->Pipe = new vtkVRUIPipe(this->Socket); } + + // -------------------------------------------------------------------------- + bool connect() + { +#ifdef VRUI_ENABLE_DEBUG + std::cout << "Trying to connect" << std::endl; +#endif + this->Pipe->Send(vtkVRUIPipe::CONNECT_REQUEST); + if (!this->Pipe->WaitForServerReply(30000)) // 30s + { + cerr << "Timeout while waiting for CONNECT_REPLY" << endl; + delete this->Pipe; + this->Pipe = 0; + return false; + } + if (this->Pipe->Receive() != vtkVRUIPipe::CONNECT_REPLY) + { + cerr << "Mismatching message while waiting for CONNECT_REPLY" << endl; + delete this->Pipe; + this->Pipe = 0; + return false; + } + this->State = new vtkVRUIServerState; + this->StateMutex = new QMutex; + this->Pipe->ReadLayout(this->State); + return true; + } + + // -------------------------------------------------------------------------- + void activate() + { + if (!this->Active) + { + this->Pipe->Send(vtkVRUIPipe::ACTIVATE_REQUEST); + this->Active = true; + } + } + + // -------------------------------------------------------------------------- + void deactivate() + { + if (this->Active) + { + this->Active = false; + this->Pipe->Send(vtkVRUIPipe::DEACTIVATE_REQUEST); + } + } + + // -------------------------------------------------------------------------- + void startStream() + { + if (this->Active) + { +#ifdef VRUI_ENABLE_DEBUG + std::cout << "start streaming" << std::endl; +#endif + this->Streaming = true; + this->Pipe->Send(vtkVRUIPipe::STARTSTREAM_REQUEST); + } + } + + // -------------------------------------------------------------------------- + void stopStream() + { + if (this->Streaming) + { + this->Streaming = false; + this->Pipe->Send(vtkVRUIPipe::STOPSTREAM_REQUEST); + } + } + + // -------------------------------------------------------------------------- + // Streaming routine called when streaming is used + void readStream() + { + this->StateMutex->lock(); + this->Pipe->ReadState(this->State); + this->StateMutex->unlock(); + bool done = false; + vtkVRUIPipe::MessageTag m = this->Pipe->Receive(); + switch (m) + { + case vtkVRUIPipe::PACKET_REPLY: +#ifdef VRUI_ENABLE_DEBUG + cout << "thread:PACKET_REPLY ok : tag=" << m << endl; +#endif + this->StateMutex->lock(); + this->Pipe->ReadState(this->State); + this->StateMutex->unlock(); + + break; + case vtkVRUIPipe::STOPSTREAM_REPLY: + cout << "thread:STOPSTREAM_REPLY ok : tag=" << m << endl; + done = true; + break; + default: + cerr << "thread: Mismatching message while waiting for PACKET_REPLY: tag=" + << this->Pipe->GetString(m) << "::" << m << endl; + done = true; + break; + } + } +}; + +// ---------------------------------------------------------------------------- +pqVRUIConnection::pqVRUIConnection(QObject* parentObject) + : Superclass(parentObject) +{ + this->Internals = new pqInternals(); + this->Initialized = false; + this->_Stop = false; + this->Address = ""; + this->Port = "8555"; + this->Name = ""; + this->Type = "VRUI"; + this->TrackerPresent = false; + this->AnalogPresent = false; + this->ButtonPresent = false; + this->TrackerTransformPresent = false; + this->Transformation = vtkMatrix4x4::New(); + this->Matrix = vtkMatrix4x4::New(); + this->ZUpToYUpMatrix = vtkMatrix4x4::New(); +} + +// ---------------------------------------------------------------------------- +pqVRUIConnection::~pqVRUIConnection() +{ + this->ZUpToYUpMatrix->Delete(); + this->Matrix->Delete(); + this->Transformation->Delete(); + this->Internals->stopStream(); + this->Internals->deactivate(); + delete this->Internals; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::addButton(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "button." << id; + this->ButtonMapping[returnStr.str()] = name; + this->ButtonPresent = true; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::addAnalog(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "analog." << id; + this->AnalogMapping[returnStr.str()] = name; + this->AnalogPresent = true; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::addTracking(std::string id, std::string name) +{ + std::stringstream returnStr; + returnStr << "tracker." << id; + this->TrackerMapping[returnStr.str()] = name; + this->TrackerPresent = true; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::setName(std::string name) +{ + this->Name = name; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::setAddress(std::string address) +{ + this->Address = address; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::setQueue(vtkVRQueue* queue) +{ + this->EventQueue = queue; +} + +// ---------------------------------------------------------------------------- +bool pqVRUIConnection::init() +{ + // Initialize the socket connection; + this->Internals->initSocket(this->Address, this->Port); + this->Internals->initPipe(); + if (!this->Internals->connect()) + return false; + this->Internals->activate(); + // this->Internals->startStream(); + this->Initialized = true; + return true; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::run() +{ + while (!this->_Stop) + { + if (this->Initialized) + { + if (this->Internals->Streaming) + { + this->Internals->readStream(); + } + else + { + this->callback(); + } + } + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::stop() +{ + this->_Stop = true; + this->Internals->stopStream(); + this->Internals->deactivate(); + this->Initialized = false; + QThread::wait(); +} + +// ---------------------------------------------------------------------------- +std::string pqVRUIConnection::name(int eventType, int id) +{ + std::stringstream returnStr, connection, e; + if (this->Name.size()) + returnStr << this->Name << "."; + else + returnStr << this->Address << "."; + switch (eventType) + { + case ANALOG_EVENT: + e << "analog." << id; + if (this->AnalogMapping.find(e.str()) != this->AnalogMapping.end()) + returnStr << this->AnalogMapping[e.str()]; + else + returnStr << e.str(); + break; + case BUTTON_EVENT: + e << "button." << id; + if (this->ButtonMapping.find(e.str()) != this->ButtonMapping.end()) + returnStr << this->ButtonMapping[e.str()]; + else + returnStr << e.str(); + break; + case TRACKER_EVENT: + e << "tracker." << id; + if (this->TrackerMapping.find(e.str()) != this->TrackerMapping.end()) + returnStr << this->TrackerMapping[e.str()]; + else + returnStr << e.str(); + break; + } + return returnStr.str(); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::verifyConfig(const char* id, const char* name) +{ + if (!id) + { + qWarning() << "\"id\" should be specified"; + } + if (!name) + { + qWarning() << "\"name\" should be specified"; + } +} + +// ---------------------------------------------------------------------------- +bool pqVRUIConnection::configure(vtkPVXMLElement* child, vtkSMProxyLocator*) +{ + bool returnVal = false; + if (child->GetName() && strcmp(child->GetName(), "VRUIConnection") == 0) + { + for (unsigned cc = 0; cc < child->GetNumberOfNestedElements(); ++cc) + { + vtkPVXMLElement* e = child->GetNestedElement(cc); + if (e && e->GetName()) + { + const char* id = e->GetAttributeOrEmpty("id"); + const char* name = e->GetAttributeOrEmpty("name"); + this->verifyConfig(id, name); + + if (strcmp(e->GetName(), "Button") == 0) + { + this->addButton(id, name); + } + else if (strcmp(e->GetName(), "Analog") == 0) + { + this->addAnalog(id, name); + } + else if (strcmp(e->GetName(), "Tracker") == 0) + { + this->addTracking(id, name); + } + else if (strcmp(e->GetName(), "TrackerTransform") == 0) + { + this->configureTransform(e); + } + + else + { + qWarning() << "Unknown Device type: \"" << e->GetName() << "\""; + } + returnVal = true; + } + } + } + return returnVal; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::configureTransform(vtkPVXMLElement* child) +{ + if (child->GetName() && strcmp(child->GetName(), "TrackerTransform") == 0) + { + child->GetVectorAttribute("value", 16, (double*)this->Transformation->Element); + this->TrackerTransformPresent = true; + } +} + +// ---------------------------------------------------------------------------- +vtkPVXMLElement* pqVRUIConnection::saveConfiguration() const +{ + vtkPVXMLElement* child = vtkPVXMLElement::New(); + child->SetName("VRUIConnection"); + child->AddAttribute("name", this->Name.c_str()); + child->AddAttribute("address", this->Address.c_str()); + child->AddAttribute("port", this->Port.c_str()); + saveButtonEventConfig(child); + saveAnalogEventConfig(child); + saveTrackerEventConfig(child); + saveTrackerTransformationConfig(child); + return child; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::saveButtonEventConfig(vtkPVXMLElement* child) const +{ + if (!this->ButtonPresent) + return; + for (std::map::const_iterator it = this->ButtonMapping.begin(); + it != this->ButtonMapping.end(); ++it) + { + std::string key = it->first; + std::string value = it->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* e = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "button") == 0) + { + e->SetName("Button"); + e->AddAttribute("id", token[1].c_str()); + e->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(e); + e->FastDelete(); + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::saveAnalogEventConfig(vtkPVXMLElement* child) const +{ + if (!this->AnalogPresent) + return; + for (std::map::const_iterator it = this->AnalogMapping.begin(); + it != this->AnalogMapping.end(); ++it) + { + std::string key = it->first; + std::string value = it->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* e = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "analog") == 0) + { + e->SetName("Analog"); + e->AddAttribute("id", token[1].c_str()); + e->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(e); + e->FastDelete(); + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::saveTrackerEventConfig(vtkPVXMLElement* child) const +{ + if (!this->TrackerPresent) + return; + for (std::map::const_iterator it = this->TrackerMapping.begin(); + it != this->TrackerMapping.end(); ++it) + { + std::string key = it->first; + std::string value = it->second; + std::replace(key.begin(), key.end(), '.', ' '); + std::istringstream stm(key); + std::vector token; + for (;;) + { + std::string word; + if (!(stm >> word)) + break; + token.push_back(word); + } + vtkPVXMLElement* e = vtkPVXMLElement::New(); + if (strcmp(token[0].c_str(), "tracker") == 0) + { + e->SetName("Tracker"); + e->AddAttribute("id", token[1].c_str()); + e->AddAttribute("name", value.c_str()); + } + child->AddNestedElement(e); + e->FastDelete(); + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::saveTrackerTransformationConfig(vtkPVXMLElement* child) const +{ + if (!this->TrackerTransformPresent) + return; + vtkPVXMLElement* transformationMatrix = vtkPVXMLElement::New(); + transformationMatrix->SetName("TrackerTransform"); + std::stringstream matrix; + for (int i = 0; i < 16; ++i) + { + matrix << double(*((double*)this->Transformation->Element + i)) << " "; + } + transformationMatrix->AddAttribute("value", matrix.str().c_str()); + child->AddNestedElement(transformationMatrix); + transformationMatrix->FastDelete(); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::setTransformation(vtkMatrix4x4* matrix) +{ + for (int i = 0; i < 4; ++i) + { + for (int j = 0; j < 4; ++j) + { + this->Transformation->SetElement(i, j, matrix->GetElement(i, j)); + } + } + this->TrackerTransformPresent = true; +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::callback() +{ + if (this->Initialized) + { + +#ifdef VRUI_ENABLE_DEBUG + std::cout << "callback()" << std::endl; +#endif + this->Internals->StateMutex->lock(); + this->getAndEnqueueButtonData(); + this->getAndEnqueueAnalogData(); + this->getAndEnqueueTrackerData(); + this->Internals->StateMutex->unlock(); + + this->getNextPacket(); // for the next step + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::getNextPacket() +{ + if (this->Internals->Active) + { + if (this->Internals->Streaming) + { + // With a thread + // this->Internals->PacketSignalCondMutex->lock(); + // this->Internals->PacketSignalCond->wait(this->Internals->PacketSignalCondMutex); + // this->Internals->PacketSignalCondMutex->unlock(); + } + else + { + // With a loop + this->Internals->Pipe->Send(vtkVRUIPipe::PACKET_REQUEST); + if (this->Internals->Pipe->WaitForServerReply(30000)) + { + if (this->Internals->Pipe->Receive() != vtkVRUIPipe::PACKET_REPLY) + { + cout << "VRUI Mismatching message while waiting for PACKET_REPLY" << std::endl; + abort(); + } + else + { + this->Internals->StateMutex->lock(); + this->Internals->Pipe->ReadState(this->Internals->State); + this->Internals->StateMutex->unlock(); + + // this->PacketNotificationMutex->lock(); + // this->PacketNotificationMutex->unlock(); + } + } + else + { + cout << "timeout for PACKET_REPLY" << endl; + } + } + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::newAnalogValue(std::vector* data) +{ + vtkVREvent temp; + temp.connId = this->Address; + temp.name = name(ANALOG_EVENT); + temp.eventType = ANALOG_EVENT; + temp.timeStamp = QDateTime::currentDateTime().toTime_t(); + temp.data.analog.num_channels = (int)(*data).size(); + for (unsigned int i = 0; i < (*data).size(); ++i) + { + temp.data.analog.channel[i] = (*data)[i]; + } + this->EventQueue->Enqueue(temp); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::newButtonValue(int state, int button) +{ + vtkVREvent temp; + temp.connId = this->Address; + temp.name = this->name(BUTTON_EVENT, button); + temp.eventType = BUTTON_EVENT; + temp.timeStamp = QDateTime::currentDateTime().toTime_t(); + temp.data.button.button = button; + temp.data.button.state = state; + this->EventQueue->Enqueue(temp); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::newTrackerValue(vtkSmartPointer data, int sensor) +{ + vtkVREvent temp; + temp.connId = this->Address; + temp.name = name(TRACKER_EVENT, sensor); + temp.eventType = TRACKER_EVENT; + temp.timeStamp = QDateTime::currentDateTime().toTime_t(); + temp.data.tracker.sensor = sensor; + float rotMatrix[3][3]; + float pos[3]; + float q[4]; + data->GetPosition(pos); + data->GetUnitQuaternion(q); + +#if defined(VRUI_ENABLE_DEBUG) || 0 + cout << "pos=(" << pos[0] << "," << pos[1] << "," << pos[2] << ")" << endl; + cout << "q=(" << q[0] << "," << q[1] << "," << q[2] << "," << q[3] << ")" << endl; +#endif + + // VTK expects quaternion in the format of (real, i, j, k), where as + // FreeVR VRUI Daemon is giving us (i,j,k, real) + float vtkQuat[4] = { q[3], q[0], q[1], q[2] }; + + vtkMath::QuaternionToMatrix3x3(&vtkQuat[0], rotMatrix); + + this->Matrix->Element[0][0] = rotMatrix[0][0]; + this->Matrix->Element[1][0] = rotMatrix[1][0]; + this->Matrix->Element[2][0] = rotMatrix[2][0]; + this->Matrix->Element[3][0] = 0.0; + + this->Matrix->Element[0][1] = rotMatrix[0][1]; + this->Matrix->Element[1][1] = rotMatrix[1][1]; + this->Matrix->Element[2][1] = rotMatrix[2][1]; + // this->Matrix->Element[1][3] = pos[2]*1/12; + this->Matrix->Element[3][1] = 0.0; + + this->Matrix->Element[0][2] = rotMatrix[0][2]; + this->Matrix->Element[1][2] = rotMatrix[1][2]; + this->Matrix->Element[2][2] = rotMatrix[2][2]; + // this->Matrix->Element[2][3] = pos[1]*-1/12; + this->Matrix->Element[3][2] = 0.0; + + this->Matrix->Element[0][3] = pos[0] / 12.0; + this->Matrix->Element[1][3] = pos[1] / 12.0; + this->Matrix->Element[2][3] = pos[2] / 12.0; + this->Matrix->Element[3][3] = 1.0f; + +#if defined(VRUI_ENABLE_DEBUG) || 0 + if (sensor) + { + std::cout << "Pre multiplication matrix: " << std::endl; + this->Matrix->PrintSelf(cout, vtkIndent(0)); + } +#endif + + this->ZUpToYUpMatrix->Element[0][0] = 1.0; + this->ZUpToYUpMatrix->Element[1][0] = 0.0; + this->ZUpToYUpMatrix->Element[2][0] = 0.0; + this->ZUpToYUpMatrix->Element[3][0] = 0.0; + + this->ZUpToYUpMatrix->Element[0][1] = 0.0; + this->ZUpToYUpMatrix->Element[1][1] = 0.0; + this->ZUpToYUpMatrix->Element[2][1] = -1.0; + this->ZUpToYUpMatrix->Element[3][1] = 0.0; + + this->ZUpToYUpMatrix->Element[0][2] = 0.0; + this->ZUpToYUpMatrix->Element[1][2] = 1.0; + this->ZUpToYUpMatrix->Element[2][2] = 0.0; + this->ZUpToYUpMatrix->Element[3][2] = 0.0; + + this->ZUpToYUpMatrix->Element[0][3] = 0.0; + this->ZUpToYUpMatrix->Element[1][3] = 0.0; + this->ZUpToYUpMatrix->Element[2][3] = 0.0; + this->ZUpToYUpMatrix->Element[3][3] = 1.0; + + vtkMatrix4x4::Multiply4x4(this->ZUpToYUpMatrix, this->Matrix, this->Matrix); + +#if defined(VRUI_ENABLE_DEBUG) || 0 + if (sensor) + { + std::cout << "Post multiplication matrix: " << std::endl; + this->Matrix->PrintSelf(cout, vtkIndent(0)); + } +#endif + +#if defined(VRUI_ENABLE_DEBUG) || 0 + if (sensor) + cout << "post pos=(" << this->Matrix->Element[0][3] << "," << this->Matrix->Element[1][3] << "," + << this->Matrix->Element[2][3] << ")" << endl; +#endif + + temp.data.tracker.matrix[0] = this->Matrix->Element[0][0]; + temp.data.tracker.matrix[1] = this->Matrix->Element[0][1]; + temp.data.tracker.matrix[2] = this->Matrix->Element[0][2]; + temp.data.tracker.matrix[3] = this->Matrix->Element[0][3]; + + temp.data.tracker.matrix[4] = this->Matrix->Element[1][0]; + temp.data.tracker.matrix[5] = this->Matrix->Element[1][1]; + temp.data.tracker.matrix[6] = this->Matrix->Element[1][2]; + temp.data.tracker.matrix[7] = this->Matrix->Element[1][3]; + + temp.data.tracker.matrix[8] = this->Matrix->Element[2][0]; + temp.data.tracker.matrix[9] = this->Matrix->Element[2][1]; + temp.data.tracker.matrix[10] = this->Matrix->Element[2][2]; + temp.data.tracker.matrix[11] = this->Matrix->Element[2][3]; + + temp.data.tracker.matrix[12] = this->Matrix->Element[3][0]; + temp.data.tracker.matrix[13] = this->Matrix->Element[3][1]; + temp.data.tracker.matrix[14] = this->Matrix->Element[3][2]; + temp.data.tracker.matrix[15] = this->Matrix->Element[3][3]; + + this->EventQueue->Enqueue(temp); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::getAndEnqueueButtonData() +{ + std::vector* buttons = this->Internals->State->GetButtonStates(); + for (unsigned int i = 0; i < (*buttons).size(); ++i) + { + newButtonValue((*buttons)[i], i); + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::getAndEnqueueAnalogData() +{ + std::vector* analog = this->Internals->State->GetValuatorStates(); + newAnalogValue(analog); +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::getAndEnqueueTrackerData() +{ + std::vector>* trackers = + this->Internals->State->GetTrackerStates(); + + for (unsigned int i = 0; i < (*trackers).size(); ++i) + { + newTrackerValue((*trackers)[i], i); + } +} + +// ---------------------------------------------------------------------------- +void pqVRUIConnection::setPort(std::string port) +{ + this->Port = port; +} diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/pqVRUIConnection.h paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRUIConnection.h --- paraview-5.10.1/Plugins/CAVEInteraction/pqVRUIConnection.h 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/pqVRUIConnection.h 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,189 @@ +/*========================================================================= + + Program: ParaView + Module: vtkVRUIConnection.h + + Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc. + All rights reserved. + + ParaView is a free software; you can redistribute it and/or modify it + under the terms of the ParaView license version 1.2. + + See License_v1.2.txt for the full ParaView license. + A copy of this license can be obtained by contacting + Kitware Inc. + 28 Corporate Drive + Clifton Park, NY 12065 + USA + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +========================================================================*/ +#ifndef pqVRUIConnection_h +#define pqVRUIConnection_h + +#include "vtkSmartPointer.h" +#include "vtkVRQueue.h" +#include "vtkVRUITrackerState.h" +#include +#include +#include + +class vtkPVXMLElement; +class vtkSMProxyLocator; +class vtkTransform; +class vtkMatrix4x4; + +/// Callback to listen to VRUI events +class pqVRUIConnection : public QThread +{ + Q_OBJECT + typedef QThread Superclass; + +public: + pqVRUIConnection(QObject* parent = 0); + ~pqVRUIConnection(); + + // Description: + // Address of the device. For example, "Tracker0@localhost" + void setAddress(std::string address); + + // Description: + // Address of the device. For example, "Tracker0@localhost" + std::string address() { return this->Address; } + + /// Port number of the VRUI server. Initial value is 8555. + void setPort(std::string port); + + /// Port number of the VRUI server. Initial value is 8555. + std::string port() { return this->Port; } + + /// Set the device name. + void setName(std::string name); + + // Description: + // Get the device name. + std::string name() { return this->Name; } + + /// Add button device + void addButton(std::string id, std::string name); + + /// Add Analog device + void addAnalog(std::string id, std::string name); + + /// Add tracking device + void addTracking(std::string id, std::string name); + + /// Adding a transformation matrix + void setTransformation(vtkMatrix4x4* matrix); + + /// Initialize the device with the name. + bool init(); + + /// Tell if Init() was called successfully bool GetInitialized() const; + + /// Terminate the thread + void stop(); + + /// Sets the Event Queue into which the vrpn data needs to be written + void setQueue(vtkVRQueue* queue); + + /// configure the style using the xml configuration. + virtual bool configure(vtkPVXMLElement* child, vtkSMProxyLocator*); + + /// save the xml configuration. + virtual vtkPVXMLElement* saveConfiguration() const; + + /// Access to analog map + std::map analogMap() { return this->AnalogMapping; } + /// Access to analog map + void setAnalogMap(const std::map& m) + { + this->AnalogMapping = m; + this->AnalogPresent = (this->AnalogMapping.size() > 0); + } + + /// Access to button map + std::map buttonMap() { return this->ButtonMapping; } + /// Access to button map + void setButtonMap(const std::map& m) + { + this->ButtonMapping = m; + this->ButtonPresent = (this->ButtonMapping.size() > 0); + } + + /// Access to tracker map + std::map trackerMap() { return this->TrackerMapping; } + /// Access to tracker map + void setTrackerMap(const std::map& m) + { + this->TrackerMapping = m; + this->TrackerPresent = (this->TrackerMapping.size() > 0); + } + +protected Q_SLOTS: + void run(); + void callback(); + +protected: + // void PrintPositionOrientation(); + void getNextPacket(); + + std::string name(int eventType, int id = 0); + + void verifyConfig(const char* id, const char* name); + + void getAndEnqueueButtonData(); + void getAndEnqueueAnalogData(); + void getAndEnqueueTrackerData(); + + void newAnalogValue(std::vector* data); + void newButtonValue(int state, int button); + void newTrackerValue(vtkSmartPointer data, int sensor); + + void configureTransform(vtkPVXMLElement* child); + void saveButtonEventConfig(vtkPVXMLElement* child) const; + void saveAnalogEventConfig(vtkPVXMLElement* child) const; + void saveTrackerEventConfig(vtkPVXMLElement* child) const; + void saveTrackerTranslationConfig(vtkPVXMLElement* child) const; + void saveTrackerRotationConfig(vtkPVXMLElement* child) const; + void saveTrackerTransformationConfig(vtkPVXMLElement* child) const; + + std::string Name; + std::string Address; + std::string Port; + std::string Type; + + // std::map Mapping; + std::map ButtonMapping; + std::map AnalogMapping; + std::map TrackerMapping; + + bool TrackerPresent, ButtonPresent, AnalogPresent, TrackerTransformPresent; + vtkMatrix4x4* Transformation; + + bool Initialized; + bool _Stop; + + vtkVRQueue* EventQueue; + vtkMatrix4x4* ZUpToYUpMatrix; + vtkMatrix4x4* Matrix; + + class pqInternals; + pqInternals* Internals; + +private: + Q_DISABLE_COPY(pqVRUIConnection) +}; + +#endif diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/README.md paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/README.md --- paraview-5.10.1/Plugins/CAVEInteraction/README.md 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/README.md 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,15 @@ +# CAVEInteraction Plugin + +CAVEInteraction is a plugin to interact with Cave Automatic Virtual Environments + +## Building the plugin + +To enable this plugin, you need to provide the following cmake variable when configuring ParaView: +`-DPARAVIEW_PLUGIN_ENABLE_CAVEInteraction=ON` + +`CAVEInteraction` plugin requires [VRPN](https://github.com/vrpn) +or/and [VRUI](https://web.cs.ucdavis.edu/~okreylos/ResDev/Vrui/index.html) to be installed, and provide one or both of +the following cmake variables when configuring ParaView: + +1. `-DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN=ON` +2. `-DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI=ON` diff -Nru paraview-5.10.1/Plugins/CAVEInteraction/samples/old_sample.pvsm paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/samples/old_sample.pvsm --- paraview-5.10.1/Plugins/CAVEInteraction/samples/old_sample.pvsm 1970-01-01 00:00:00.000000000 +0000 +++ paraview-5.11.0~rc1+dfsg/Plugins/CAVEInteraction/samples/old_sample.pvsm 2022-09-01 19:52:20.000000000 +0000 @@ -0,0 +1,486 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +