NRI : Merge branch br_porting_MED.

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index 6757a4ca6e84989ccfb2df53bbff076970a6eff9..08bae36a990b67bb119ecce6f980c9d6c1252c4e 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -92,7 +92,7 @@ LIB_MOC = \
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \
                 VISU_Gen.idl \
-                Med_Gen.idl \
+                MED_Gen.idl \
                 MED.idl \
                 SALOMEDS.idl \
                 SALOME_ModuleCatalog.idl \

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 7b7a9579d689426c66194eeb67dae72e60da6080..9073b28a20b634ed505b6f1151c8b88c3236f446 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -120,7 +120,7 @@
 #include <qmessagebox.h>
 
 #include <med.h>
-#include CORBA_CLIENT_HEADER(Med_Gen)
+#include CORBA_CLIENT_HEADER(MED_Gen)
 
 #include <vtkActor.h>
 #include <vtkDataSetMapper.h>
@@ -681,7 +681,7 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
 
        Engines::Component_var aMedComp = GetDesktop()->getEngine("FactoryServer", "MED");
        if (CORBA::is_nil(aMedComp)) return false;
-       Engines::Med_Gen_var aMedGen = Engines::Med_Gen::_narrow(aMedComp);
+       SALOME_MED::MED_Gen_var aMedGen = SALOME_MED::MED_Gen::_narrow(aMedComp);
        if (CORBA::is_nil(aMedGen)) return false;
 
        QStringList filtersList ;       

diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 09a465037483256cc8056bc6c38a63bfe07b3f8b..6cda4f5b521851c111d9c890a44d000a7edb538c 100644 (file)
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -209,7 +209,7 @@ static void GetCellsSize(vtkIdType& theNbCells, vtkIdType& theCellsSize,
   if(MYDEBUG) MESSAGE("GetCellsSize - iGeomElemEnd = "<<iGeomElemEnd);
   for (int iGeomElem = 0; iGeomElem < iGeomElemEnd; iGeomElem++) {
     SALOME_MED::medGeometryElement aGeomType = aGeom[iGeomElem];
-    Engines::long_array_var aCellNumForType = theMEDFamily->getNumber(aGeomType);
+    SALOME_MED::long_array_var aCellNumForType = theMEDFamily->getNumber(aGeomType);
     int medId = GetIdMEDType(aGeomType);
     med_int iNumElemEnd = aCellNumForType->length();
     if(iNumElemEnd > 0){
@@ -642,7 +642,7 @@ int VISU_MEDConvertor::LoadPoints(VISU::TMesh& theMesh, const string& theFamilyN
   if(MYDEBUG) MESSAGE("LoadPoints - iNumElemEnd = "<<iNumElemEnd);
   if (iNumElemEnd <= 0) throw std::runtime_error("LoadPoints >> There is no points in the mesh !!!");
   aPointsCoord.resize(theMesh.myDim*iNumElemEnd,0.0);
-  Engines::double_array_var coord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE);
+  SALOME_MED::double_array_var coord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE);
   if(!isPointsLoaded){
     for (int iNumElem = 0; iNumElem < iNumElemEnd; iNumElem++) 
       for(int iDim = 0, iNumElem2Dim = iNumElem*theMesh.myDim; iDim < theMesh.myDim; iDim++, iNumElem2Dim++)
@@ -659,7 +659,7 @@ int VISU_MEDConvertor::LoadPoints(VISU::TMesh& theMesh, const string& theFamilyN
     SALOME_MED::FAMILY_var aMedFamily = aFamily2.myFamily;
     VISU::TFamily::TSubMeshOnCellType& aSubMeshOnCellType = aFamily.mySubMesh[VTK_VERTEX];
     SALOME_MED::medGeometryElement_array_var aGeom = aMedFamily->getTypes();
-    Engines::long_array_var aCellNumForType = aMedFamily->getNumber(aGeom[0]);
+    SALOME_MED::long_array_var aCellNumForType = aMedFamily->getNumber(aGeom[0]);
     int iNumElemEndTmp = iNumElemEnd;
     iNumElemEnd = aCellNumForType->length();
     for (int iNumElem = 0; iNumElem < iNumElemEnd; iNumElem++) {
@@ -712,7 +712,7 @@ int VISU_MEDConvertor::LoadCellsOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, c
       SALOME_MED::medGeometryElement aMedType = salome_med2vtk[medId].medType;
       med_int iNumElemEnd = aMedMesh->getNumberOfElements(aMedEntity,aMedType);
       if (iNumElemEnd > 0) {
-       Engines::long_array_var conn = 
+       SALOME_MED::long_array_var conn = 
          aMedMesh->getConnectivity(SALOME_MED::MED_FULL_INTERLACE,SALOME_MED::MED_NODAL,aMedEntity,aMedType);
        VISU::TMeshOnEntity::TConnForCellType& aConnForCellType = theMeshOnEntity.myCellsConn[aVtkType];
        //APO - aConnForCellType.resize(iNumElemEnd);
@@ -771,7 +771,7 @@ int VISU_MEDConvertor::LoadCellsOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, c
     if(MYDEBUG) MESSAGE("LoadCellsOnEntity - iGeomElemEnd = "<<iGeomElemEnd);
     for (int iGeomElem = 0; iGeomElem < iGeomElemEnd; iGeomElem++) {
       SALOME_MED::medGeometryElement aGeomType = aGeom[iGeomElem];
-      Engines::long_array_var aCellNumForType = aMedFamily->getNumber(aGeomType);
+      SALOME_MED::long_array_var aCellNumForType = aMedFamily->getNumber(aGeomType);
       int medId = GetIdMEDType(aGeomType);
       int aVtkType = salome_med2vtk[medId].vtkType;
       SALOME_MED::medGeometryElement aMedType = salome_med2vtk[medId].medType;
@@ -856,13 +856,13 @@ int VISU_MEDConvertor::LoadField(const VISU::TMeshOnEntity& theMeshOnEntity,
   //Main part of code
   SALOME_MED::FIELDDOUBLE_ptr aFieldDouble = SALOME_MED::FIELDDOUBLE::_narrow(aMEDField);
   if(!aFieldDouble->_is_nil()){
-    Engines::double_array_var anArray = aFieldDouble->getValue(SALOME_MED::MED_FULL_INTERLACE);
+    SALOME_MED::double_array_var anArray = aFieldDouble->getValue(SALOME_MED::MED_FULL_INTERLACE);
     if(MYDEBUG) MESSAGE("VISU_MEDConvertor::LoadField - There is FIELDDOUBLE = "<<anArray->length());
     ::ImportField(anArray,aMesh,theField,theValForTime,theMeshOnEntity,aMeshOnEntity2);
   }
   SALOME_MED::FIELDINT_ptr aFieldInt = SALOME_MED::FIELDINT::_narrow(aMEDField);
   if(!aFieldInt->_is_nil()){
-    Engines::long_array_var anArray = aFieldInt->getValue(SALOME_MED::MED_FULL_INTERLACE);
+    SALOME_MED::long_array_var anArray = aFieldInt->getValue(SALOME_MED::MED_FULL_INTERLACE);
     if(MYDEBUG) MESSAGE("VISU_MEDConvertor::LoadField - There is FIELDINT = "<<anArray->length());
     ::ImportField(anArray,aMesh,theField,theValForTime,theMeshOnEntity,aMeshOnEntity2);
   }

diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py
index b36b04e621575f2bb09765aa7926f9adbe05e2a8..ad6eba31385ad000182fdc0ac00b4af6b095b741 100644 (file)
--- a/src/VISU_SWIG/visu.py
+++ b/src/VISU_SWIG/visu.py
@@ -10,10 +10,6 @@
 import os
 import re
 from time import sleep
-
-# NRI : temporary added because interface is declared into Engines module.
-import MED_idl
-import Med_Gen_idl
 #
 
 import VISU