X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FParaMEDCorba%2FVTKMEDCouplingMeshClient.cxx;h=2afad5f98fd48c20a0cb9ffc0f3408a9829cf873;hb=e2c075bb656e4e5b0d8e6fcb7e06b5c25f903dee;hp=2d53a14e7a9a70c3d48041619c3214f1dda2c8ba;hpb=89c33033151baa33eeac8fb09d9c0488acb43c35;p=modules%2Fparavis.git diff --git a/src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.cxx b/src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.cxx index 2d53a14e..2afad5f9 100644 --- a/src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.cxx +++ b/src/Plugins/ParaMEDCorba/VTKMEDCouplingMeshClient.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2012 CEA/DEN, EDF R&D +// Copyright (C) 2010-2013 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -20,10 +20,12 @@ #include "VTKMEDCouplingMeshClient.hxx" #include "VTKMEDCouplingUMeshClient.hxx" #include "VTKMEDCouplingCMeshClient.hxx" +#include "VTKMEDCouplingCurveLinearMeshClient.hxx" #include "vtkErrorCode.h" #include "vtkUnstructuredGrid.h" #include "vtkRectilinearGrid.h" +#include "vtkStructuredGrid.h" #include #include @@ -56,6 +58,18 @@ void ParaMEDMEM2VTK::FillMEDCouplingMeshInstanceFrom(SALOME_MED::MEDCouplingMesh ParaMEDMEM2VTK::FillMEDCouplingCMeshInstanceFrom(cmeshPtr,ret1); return ; } + SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_var clmeshPtr=SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface::_narrow(meshPtr); + if(!CORBA::is_nil(clmeshPtr)) + { + vtkStructuredGrid *ret1=vtkStructuredGrid::SafeDownCast(ret); + if(!ret1) + { + vtkErrorWithObjectMacro(ret,"Internal error in ParaMEDCorba plugin : mismatch between VTK type and CORBA type CurveLinearMesh !"); + return ; + } + ParaMEDMEM2VTK::FillMEDCouplingCurveLinearMeshInstanceFrom(clmeshPtr,ret1); + return ; + } vtkErrorWithObjectMacro(ret,"Error : CORBA mesh type ! Mesh type not managed !"); } @@ -75,6 +89,13 @@ vtkDataSet *ParaMEDMEM2VTK::BuildFromMEDCouplingMeshInstance(SALOME_MED::MEDCoup ParaMEDMEM2VTK::FillMEDCouplingCMeshInstanceFrom(cmeshPtr,ret1); return ret1; } + SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_var clmeshPtr=SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface::_narrow(meshPtr); + if(!CORBA::is_nil(clmeshPtr)) + { + vtkStructuredGrid *ret1=vtkStructuredGrid::New(); + ParaMEDMEM2VTK::FillMEDCouplingCurveLinearMeshInstanceFrom(clmeshPtr,ret1); + return ret1; + } vtkOutputWindowDisplayErrorText("Error : CORBA mesh type ! Mesh type not managed #2 !"); return 0; }