diff --git a/src/paraview-plugins/PV3FoamReader/Allwclean b/src/paraview-plugins/PV3Readers/PV3FoamReader/Allwclean similarity index 67% rename from src/paraview-plugins/PV3FoamReader/Allwclean rename to src/paraview-plugins/PV3Readers/PV3FoamReader/Allwclean index 3fdbeae44cdc62199bcc1969d41b60a99574fac4..c5f41ab9da11f3dc5f09f81ef6cf6d58a5e67d09 100755 --- a/src/paraview-plugins/PV3FoamReader/Allwclean +++ b/src/paraview-plugins/PV3Readers/PV3FoamReader/Allwclean @@ -2,6 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x +# deal with client/server vs combined plugins +rm -f $FOAM_LIBBIN/libPV3FoamReader* 2>/dev/null + rm -rf PV3FoamReader/Make wclean libso vtkPV3Foam diff --git a/src/paraview-plugins/PV3FoamReader/Allwmake b/src/paraview-plugins/PV3Readers/PV3FoamReader/Allwmake similarity index 100% rename from src/paraview-plugins/PV3FoamReader/Allwmake rename to src/paraview-plugins/PV3Readers/PV3FoamReader/Allwmake diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt similarity index 60% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/CMakeLists.txt rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt index 670b78c33d80f3f2e1db2e6f4ce3ac7e0f0551cf..7702f5803963d247d1f7f3a1066e796bdff8f7af 100644 --- a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/CMakeLists.txt +++ b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt @@ -7,7 +7,7 @@ # the pqReader.xml file contains xml defining readers with their # file extensions and descriptions. -cmake_minimum_required(VERSION 2.4) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) @@ -33,19 +33,45 @@ SET( "Single output directory for building all libraries." ) -# Build the server-side plugin + +# +# Defined combined plugin +# + +# Extend the auto-generated panel +QT4_WRAP_CPP(MOC_SRCS pqPV3FoamReaderPanel.h) + +ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS + CLASS_NAME pqPV3FoamReaderPanel + XML_NAME PV3FoamReader # name of SourceProxy in *SM.xml + XML_GROUP sources +) + ADD_PARAVIEW_PLUGIN( PV3FoamReader_SM "1.0" SERVER_MANAGER_XML PV3FoamReader_SM.xml SERVER_MANAGER_SOURCES vtkPV3FoamReader.cxx + GUI_INTERFACES ${IFACES} + GUI_SOURCES ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} + GUI_RESOURCE_FILES PV3FoamReader.xml ) -# Build the client-side plugin -ADD_PARAVIEW_PLUGIN( - PV3FoamReader - "1.0" - GUI_RESOURCES PV3FoamReader.qrc -) +# # +# # Define the server-side portion of the reader plugin +# # +# ADD_PARAVIEW_PLUGIN( +# PV3FoamReader_SM "1.0" +# SERVER_MANAGER_XML PV3FoamReader_SM.xml +# SERVER_MANAGER_SOURCES vtkPV3FoamReader.cxx +# ) +# # +# # Define the client-side portion of the reader plugin +# # +# ADD_PARAVIEW_PLUGIN( +# PV3FoamReader "1.0" +# GUI_RESOURCES PV3FoamReader.qrc +# ) +# TARGET_LINK_LIBRARIES( PV3FoamReader_SM diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc similarity index 100% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader.qrc diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml similarity index 100% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader.xml diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml similarity index 100% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml diff --git a/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h new file mode 100644 index 0000000000000000000000000000000000000000..3c97b52dfdd6dcb0a14f9e9b6a189bc0cead142a --- /dev/null +++ b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h @@ -0,0 +1,34 @@ +#ifndef __pqPV3FoamReaderPanel_h +#define __pqPV3FoamReaderPanel_h + +#include "pqAutoGeneratedObjectPanel.h" +#include <QLabel> +#include <QLayout> + +// +// Custom panel for PV3FoamReader source. +// +class pqPV3FoamReaderPanel +: + public pqAutoGeneratedObjectPanel +{ + Q_OBJECT; + typedef pqAutoGeneratedObjectPanel Superclass; + +public: + pqPV3FoamReaderPanel(pqProxy *proxy, QWidget *p) + : + pqAutoGeneratedObjectPanel(proxy, p) + { + this->layout()->addWidget + ( + new QLabel("Plugin for reading OpenFOAM meshes/results", this) + ); + } + + //virtual ~pqPV3FoamReaderPanel(); + +protected: +}; + +#endif //__pqPV3FoamReaderPanel_h diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx similarity index 99% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx index 734511f963beb534217bbb2c8c392afe66f48290..e0af1cd47e6b5366870065a887a301c0d76e1850 100644 --- a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx +++ b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx @@ -113,7 +113,12 @@ vtkPV3FoamReader::~vtkPV3FoamReader() { vtkDebugMacro(<<"Deconstructor"); - delete foamData_; + if (foamData_) + { + // remove patch names + updatePatchNamesView(false); + delete foamData_; + } if (FileName) { diff --git a/src/paraview-plugins/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h b/src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h similarity index 100% rename from src/paraview-plugins/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h rename to src/paraview-plugins/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/Make/files b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/Make/files rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/Make/options b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/Make/options rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkDataArrayTemplateImplicit.txx diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddToSelection.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddToSelection.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddToSelection.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddToSelection.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFaceField.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFaceField.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFaceField.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFaceField.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C diff --git a/src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H b/src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H similarity index 100% rename from src/paraview-plugins/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H rename to src/paraview-plugins/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H diff --git a/src/paraview-plugins/PV3blockMeshReader/Allwclean b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/Allwclean similarity index 67% rename from src/paraview-plugins/PV3blockMeshReader/Allwclean rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/Allwclean index 30ee40ddae59aebfc80c648baa6d40ce74204f43..d2c85df001142d7a9c09d855fc3df2acea6dcaba 100755 --- a/src/paraview-plugins/PV3blockMeshReader/Allwclean +++ b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/Allwclean @@ -2,6 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x +# deal with client/server vs combined plugins +rm -f $FOAM_LIBBIN/libPV3blockMeshReader* 2>/dev/null + rm -rf PV3blockMeshReader/Make wclean libso vtkPV3blockMesh diff --git a/src/paraview-plugins/PV3blockMeshReader/Allwmake b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/Allwmake similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/Allwmake rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/Allwmake diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt similarity index 60% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt index fc645367f49e1f026c64d4a4a140c486c7d48d7e..c5b911f615160e2e391815ae8db43958b574ba5b 100644 --- a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt +++ b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt @@ -7,7 +7,7 @@ # the pqReader.xml file contains xml defining readers with their # file extensions and descriptions. -cmake_minimum_required(VERSION 2.4) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) FIND_PACKAGE(ParaView REQUIRED) INCLUDE(${PARAVIEW_USE_FILE}) @@ -33,19 +33,45 @@ SET( "Single output directory for building all libraries." ) -# Build the server-side plugin +# +# Define combined plugin +# +# Try to extend the auto-generated panel +QT4_WRAP_CPP(MOC_SRCS pqPV3blockMeshReaderPanel.h) + +ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS + CLASS_NAME pqPV3blockMeshReaderPanel + XML_NAME PV3blockMeshReader # name of SourceProxy in *SM.xml + XML_GROUP sources +) + ADD_PARAVIEW_PLUGIN( PV3blockMeshReader_SM "1.0" SERVER_MANAGER_XML PV3blockMeshReader_SM.xml SERVER_MANAGER_SOURCES vtkPV3blockMeshReader.cxx + GUI_INTERFACES ${IFACES} + GUI_SOURCES ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} + GUI_RESOURCE_FILES PV3blockMeshReader.xml ) + +# # +# # Define the server-side portion of the reader plugin +# # +# ADD_PARAVIEW_PLUGIN(PV3blockMeshReader_SM "1.0" +# SERVER_MANAGER_XML PV3blockMeshReader_SM.xml +# SERVER_MANAGER_SOURCES vtkPV3blockMeshReader.cxx +# ) +# # +# # Define the client-side portion of the reader plugin +# # +# ADD_PARAVIEW_PLUGIN( +# PV3blockMeshReader "1.0" +# GUI_RESOURCES PV3blockMeshReader.qrc +# ) + + # Build the client-side plugin -ADD_PARAVIEW_PLUGIN( - PV3blockMeshReader - "1.0" - GUI_RESOURCES PV3blockMeshReader.qrc -) TARGET_LINK_LIBRARIES( PV3blockMeshReader_SM diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.qrc b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.qrc similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.qrc rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.qrc diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.xml b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.xml similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.xml rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader.xml diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader_SM.xml b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader_SM.xml similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader_SM.xml rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/PV3blockMeshReader_SM.xml diff --git a/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/pqPV3blockMeshReaderPanel.h b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/pqPV3blockMeshReaderPanel.h new file mode 100644 index 0000000000000000000000000000000000000000..1f3c2ba9b2b7f9399d46520a1a3fd9698450fa97 --- /dev/null +++ b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/pqPV3blockMeshReaderPanel.h @@ -0,0 +1,34 @@ +#ifndef __pqPV3blockMeshReaderPanel_h +#define __pqPV3blockMeshReaderPanel_h + +#include "pqAutoGeneratedObjectPanel.h" +#include <QLabel> +#include <QLayout> + +// +// Custom panel for PV3blockMeshReader source. +// +class pqPV3blockMeshReaderPanel +: + public pqAutoGeneratedObjectPanel +{ + Q_OBJECT; + typedef pqAutoGeneratedObjectPanel Superclass; + +public: + pqPV3blockMeshReaderPanel(pqProxy *proxy, QWidget *p) + : + pqAutoGeneratedObjectPanel(proxy, p) + { + this->layout()->addWidget + ( + new QLabel("Plugin for reading OpenFOAM blockMesh files", this) + ); + } + + //virtual ~pqPV3blockMeshReaderPanel(); + +protected: +}; + +#endif //__pqPV3blockMeshReaderPanel_h diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx similarity index 98% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx index 451c8b5855abc0992d6f501c2c16471a2f8bb705..155fc83f57b8c182d6ae0b897c419873c438b53c 100644 --- a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx +++ b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx @@ -80,7 +80,12 @@ vtkPV3blockMeshReader::~vtkPV3blockMeshReader() { vtkDebugMacro(<<"Deconstructor"); - delete foamData_; + if (foamData_) + { + // remove point numbers + updatePointNumbersView(false); + delete foamData_; + } if (FileName) { diff --git a/src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.h b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.h similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.h rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.h diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/Make/files b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/Make/files rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/Make/options b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/Make/options rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkDataArrayTemplateImplicit.txx b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkDataArrayTemplateImplicit.txx similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkDataArrayTemplateImplicit.txx rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkDataArrayTemplateImplicit.txx diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkOpenFOAMPoints.H b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkOpenFOAMPoints.H similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkOpenFOAMPoints.H rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkOpenFOAMPoints.H diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C similarity index 98% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C index 2dc5bc32e3aff5d092706c7bd263d9f9eed2e857..66da31d620c530d06e1074d854ba5ab6be7fd096 100644 --- a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C +++ b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.C @@ -219,6 +219,14 @@ Foam::vtkPV3blockMesh::~vtkPV3blockMesh() Info<< "<end> Foam::vtkPV3blockMesh::~vtkPV3blockMesh" << endl; } + // Hmm. pointNumberTextActors are not getting removed + // + forAll(pointNumberTextActorsPtrs_, pointI) + { + pointNumberTextActorsPtrs_[pointI]->Delete(); + } + pointNumberTextActorsPtrs_.clear(); + delete meshPtr_; } diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshConvert.C diff --git a/src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C b/src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C similarity index 100% rename from src/paraview-plugins/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C rename to src/paraview-plugins/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMeshUtils.C