Salome HOME
On the fly
authorAnthony Geay <anthony.geay@edf.fr>
Tue, 5 Dec 2017 16:45:44 +0000 (17:45 +0100)
committerAnthony Geay <anthony.geay@edf.fr>
Tue, 5 Dec 2017 16:45:44 +0000 (17:45 +0100)
src/Plugins/MEDWriter/IO/CMakeLists.txt
src/Plugins/MEDWriter/IO/VTKToMEDMem.cxx

index 16dbc23b895b867a733edc26a7ac2dc41ea0b0c4..2b8c2d9965e2e5147cfc6150f5b8f62e10e03dae 100644 (file)
@@ -30,7 +30,7 @@ TARGET_LINK_LIBRARIES(vtkMEDWriter VTKToMEDMem)
 INSTALL(TARGETS vtkMEDWriter RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} )
 INSTALL(TARGETS VTKToMEDMem  EXPORT ${PROJECT_NAME}TargetGroup RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} )
 
-INSTALL(FILES VTKToMEDMem.hxx DESTINATION ${MEDWRITER_INSTALL_HEADERS})
+INSTALL(FILES VTKToMEDMem.hxx VTKMEDTraits.hxx DESTINATION ${MEDWRITER_INSTALL_HEADERS})
 
 SET(_${PROJECT_NAME}_exposed_targets VTKToMEDMem)
 EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake)
index c3d20a9e3fa336cf555db5a41239f955a213fded..b63989583774f6374859aed57833d2f62c8f9025 100644 (file)
@@ -105,37 +105,7 @@ Fam::Fam(const std::string& name)
 
 ///////////////////
 
-template<class T>
-class MEDFileVTKTraits
-{
-public:
-  typedef void VtkType;
-  typedef void MCType;
-};
-
-template<>
-class MEDFileVTKTraits<int>
-{
-public:
-  typedef vtkIntArray VtkType;
-  typedef MEDCoupling::DataArrayInt MCType;
-};
-
-template<>
-class MEDFileVTKTraits<float>
-{
-public:
-  typedef vtkFloatArray VtkType;
-  typedef MEDCoupling::DataArrayFloat MCType;
-};
-
-template<>
-class MEDFileVTKTraits<double>
-{
-public:
-  typedef vtkDoubleArray VtkType;
-  typedef MEDCoupling::DataArrayDouble MCType;
-};
+#include "VTKMEDTraits.hxx"
 
 std::map<int,int> ComputeMapOfType()
 {