Updated PV4blockMeshReader for ParaView-4.1.0

This commit is contained in:
Henry
2014-01-10 12:03:21 +00:00
parent af27e633f9
commit 8a9da0aeac
4 changed files with 27 additions and 30 deletions

View File

@ -49,7 +49,7 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
XML_GROUP sources XML_GROUP sources
) )
IF("${PARAVIEW_VERSION_MINOR}" LESS 1) IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PV4FoamReader_SM "1.0" PV4FoamReader_SM "1.0"
SERVER_MANAGER_XML PV4FoamReader_SM.xml SERVER_MANAGER_XML PV4FoamReader_SM.xml
@ -59,7 +59,7 @@ IF("${PARAVIEW_VERSION_MINOR}" LESS 1)
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
GUI_RESOURCE_FILES PV4FoamReader.xml GUI_RESOURCE_FILES PV4FoamReader.xml
) )
ELSE("${PARAVIEW_VERSION_MINOR}" LESS 1) ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PV4FoamReader_SM "1.0" PV4FoamReader_SM "1.0"
SERVER_MANAGER_XML PV4FoamReader_SM.xml SERVER_MANAGER_XML PV4FoamReader_SM.xml
@ -68,7 +68,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" LESS 1)
GUI_SOURCES pqPV4FoamReaderPanel.cxx GUI_SOURCES pqPV4FoamReaderPanel.cxx
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
) )
ENDIF("${PARAVIEW_VERSION_MINOR}" LESS 1) ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
PV4FoamReader_SM PV4FoamReader_SM

View File

@ -286,7 +286,7 @@
<Property name="UiIncludeSets" show="0"/> <Property name="UiIncludeSets" show="0"/>
<Property name="UiIncludeZones" show="0"/> <Property name="UiIncludeZones" show="0"/>
<ReaderFactory extensions="OpenFOAM" <ReaderFactory extensions="OpenFOAM"
file_description="OpenFOAM" /> file_description="OpenFOAM"/>
</Hints> </Hints>

View File

@ -48,32 +48,26 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
XML_GROUP sources XML_GROUP sources
) )
ADD_PARAVIEW_PLUGIN( IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
PV4blockMeshReader_SM "1.0" ADD_PARAVIEW_PLUGIN(
SERVER_MANAGER_XML PV4blockMeshReader_SM.xml PV4blockMeshReader_SM "1.0"
SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
GUI_INTERFACES ${IFACES} SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
GUI_SOURCES pqPV4blockMeshReaderPanel.cxx GUI_INTERFACES ${IFACES}
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
GUI_RESOURCE_FILES PV4blockMeshReader.xml ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
) GUI_RESOURCE_FILES PV4blockMeshReader.xml
)
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
# # ADD_PARAVIEW_PLUGIN(
# # Define the server-side portion of the reader plugin PV4blockMeshReader_SM "1.0"
# # SERVER_MANAGER_XML PV4blockMeshReader_SM.xml
# ADD_PARAVIEW_PLUGIN(PV4blockMeshReader_SM "1.0" SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx
# SERVER_MANAGER_XML PV4blockMeshReader_SM.xml GUI_INTERFACES ${IFACES}
# SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx GUI_SOURCES pqPV4blockMeshReaderPanel.cxx
# ) ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
# # )
# # Define the client-side portion of the reader plugin ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
# #
# ADD_PARAVIEW_PLUGIN(
# PV4blockMeshReader "1.0"
# GUI_RESOURCES PV4blockMeshReader.qrc
# )
# Build the client-side plugin # Build the client-side plugin
@ -83,4 +77,5 @@ TARGET_LINK_LIBRARIES(
blockMesh blockMesh
vtkPV4blockMesh vtkPV4blockMesh
) )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

View File

@ -103,6 +103,8 @@
<Hints> <Hints>
<Property name="FileName" show="0"/> <Property name="FileName" show="0"/>
<Property name="UiShowPointNumbers" show="0"/> <Property name="UiShowPointNumbers" show="0"/>
<ReaderFactory extensions="blockMesh"
file_description="OpenFOAM blockMesh"/>
</Hints> </Hints>
</SourceProxy> </SourceProxy>