merge with the branch nadir_update_MED_v1_3_0 (branch to build the V1_3_0

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

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index 7b9b8f255edf2382f40ac17f4db20abdb9db2b5f..0db6c4095e9300ff7ef67e836828f3d58eacb9ba 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -293,7 +293,7 @@ CORBA::Long SMESH_MEDSupport_i::getNumberOfElements(SALOME_MED::
  */
 //=============================================================================
 
-Engines::long_array * SMESH_MEDSupport_i::getNumber(
+SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber(
        SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
 {
        if (_subMeshDS==NULL)
@@ -304,20 +304,18 @@ Engines::long_array * SMESH_MEDSupport_i::getNumber(
        if (geomElement != SALOME_MED::MED_NONE)
                THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
 
-       Engines::long_array_var myseq = new Engines::long_array;
+       SALOME_MED::long_array_var myseq = new SALOME_MED::long_array;
 
        int i = 0;
        myseq->length(_subMeshDS->NbNodes());
-       const set<const SMDS_MeshNode*> & myNodesMap = _subMeshDS->GetNodes();
-       set<const SMDS_MeshNode*>::const_iterator it=myNodesMap.begin();
 
-       for (; it!=myNodesMap.end(); it++)
+       SMDS_Iterator<const SMDS_MeshNode*> * it = _subMeshDS->GetNodes();
+       while(it->more())
        {
-               myseq[i] = (*it)->GetID();
-               SCRUTE((*it)->GetID());
-               SCRUTE(myseq[i]);
+               myseq[i] = it->next()->GetID();
                i++;
        };
+       delete it;
 
        SCRUTE(myseq->length());
        MESSAGE("End of SMESH_MEDSupport_i::getNumber");
@@ -332,12 +330,12 @@ Engines::long_array * SMESH_MEDSupport_i::getNumber(
  */
 //=============================================================================
 
-Engines::long_array *
+SALOME_MED::long_array *
        SMESH_MEDSupport_i::getNumberIndex()throw(SALOME::SALOME_Exception)
 {
        MESSAGE("Not implemented for SMESH_i");
        THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
-       return 0;
+       return NULL;
 }
 
 //=============================================================================
@@ -346,9 +344,57 @@ Engines::long_array *
  */
 //=============================================================================
 
-CORBA::Long SMESH_MEDSupport_i::getNumberOfGaussPoints(SALOME_MED::
+CORBA::Long SMESH_MEDSupport_i::getNumberOfGaussPoint(SALOME_MED::
        medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
 {
        MESSAGE("Not implemented for SMESH_i");
        return 0;
 }
+//=============================================================================
+/*!
+ * Gives the number of types of elements included in the support 
+ */
+//=============================================================================
+CORBA::Long SMESH_MEDSupport_i::getNumberOfTypes()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return 0;
+}
+//=============================================================================
+/*!
+ * Gives CORBA: Array containing the numbers of Gauss point of elements
+ * included in the support 
+ */
+//=============================================================================
+SALOME_MED::long_array* SMESH_MEDSupport_i::getNumbersOfGaussPoint()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}
+//=============================================================================
+/*!
+ * build the object which will contain all the boundary elements of the mesh.
+ */
+//=============================================================================
+void SMESH_MEDSupport_i::getBoundaryElements()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+}
+//=============================================================================
+/*!
+ * Gives information on the support
+ */
+//=============================================================================
+SALOME_MED::SUPPORT::supportInfos * SMESH_MEDSupport_i::getSupportGlobal()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}