updating or adding when merging in the main trunk with the version in the

[modules/smesh.git] / src / SMESH_I / SMESH_MEDMesh_i.cxx

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index cfbea781a3c1db8d1154be8a7d15b10914170120..25ce55bfe3b3fedfa11e95fa5b322af840b2fb49 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -86,13 +86,17 @@ SMESH_MEDMesh_i::~SMESH_MEDMesh_i()
  */
 //=============================================================================
 SMESH_MEDMesh_i::SMESH_MEDMesh_i(::SMESH_Mesh_i * m_i):_meshId(""),
  */
 //=============================================================================
 SMESH_MEDMesh_i::SMESH_MEDMesh_i(::SMESH_Mesh_i * m_i):_meshId(""),

-_compte(false),
-_creeFamily(false), _famIdent(0), _indexElts(0), _indexEnts(0)
+                                                      _compte(false),
+                                                      _creeFamily(false),
+                                                      _famIdent(0),
+                                                      _indexElts(0),
+                                                      _indexEnts(0)

 {
 {

+       BEGIN_OF("Constructor SMESH_MEDMesh_i");
+

        _mesh_i = m_i;
        _meshDS = _mesh_i->GetImpl().GetMeshDS();
 
        _mesh_i = m_i;
        _meshDS = _mesh_i->GetImpl().GetMeshDS();
 

-       BEGIN_OF("Constructor SMESH_MEDMesh_i");

        END_OF("Constructor SMESH_MEDMesh_i");
 }
 
        END_OF("Constructor SMESH_MEDMesh_i");
 }
 


@@ -478,13 +482,14 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED::
                if (_mapIndToSeqElts.find(geomElement) != _mapIndToSeqElts.end())
                {
                        int index = _mapIndToSeqElts[geomElement];
                if (_mapIndToSeqElts.find(geomElement) != _mapIndToSeqElts.end())
                {
                        int index = _mapIndToSeqElts[geomElement];

+

                        retour = _seq_elemId[index]->length();
                }
                return retour;
        }
        catch(...)
        {
                        retour = _seq_elemId[index]->length();
                }
                return retour;
        }
        catch(...)
        {

-               MESSAGE("Exception en accedant au nombre d élements");
+               MESSAGE("Exception en accedant au nombre d élements");

                THROW_SALOME_CORBA_EXCEPTION("Unable to acces Mesh C++ Object",
                        SALOME::INTERNAL_ERROR);
        }
                THROW_SALOME_CORBA_EXCEPTION("Unable to acces Mesh C++ Object",
                        SALOME::INTERNAL_ERROR);
        }


@@ -518,6 +523,7 @@ SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch,
                        SALOME::BAD_PARAM);
 
        int index = _mapIndToSeqElts[geomElement];
                        SALOME::BAD_PARAM);
 
        int index = _mapIndToSeqElts[geomElement];

+

        return _seq_elemId[index]._retn();
 }
 
        return _seq_elemId[index]._retn();
 }
 


@@ -977,6 +983,7 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
                        int index = _mapIndToSeqElts[medElement];
                        SCRUTE(index);
                        // Traitement de l arete
                        int index = _mapIndToSeqElts[medElement];
                        SCRUTE(index);
                        // Traitement de l arete

+

                        int longueur = _seq_elemId[index]->length();
                        _seq_elemId[index]->length(longueur + nb_of_nodes);
 
                        int longueur = _seq_elemId[index]->length();
                        _seq_elemId[index]->length(longueur + nb_of_nodes);
 


@@ -1047,7 +1054,7 @@ void SMESH_MEDMesh_i::calculeNbElts() throw(SALOME::SALOME_Exception)
                        SCRUTE(index);
 
                        // Traitement de la face
                        SCRUTE(index);
 
                        // Traitement de la face

-                       // Attention La numérotation des noeuds Med commence a 1
+                       // Attention La numérotation des noeuds Med commence a 1

 
                        int longueur = _seq_elemId[index]->length();
                        _seq_elemId[index]->length(longueur + nb_of_nodes);
 
                        int longueur = _seq_elemId[index]->length();
                        _seq_elemId[index]->length(longueur + nb_of_nodes);


@@ -1198,5 +1205,5 @@ SMESH_MEDMesh_i::getElementType(SALOME_MED::medEntityMesh entity,
 
   THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
 
 
   THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
 

-  return 0;
+  return (SALOME_MED::medGeometryElement) 0;

 }
 }