ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-19 00:20:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Anthony to be compliant with MED

Browse Source
This commit is contained in:
adam 2010-07-19 15:18:39 +00:00
parent 99adc043fe
commit 92931e254a
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SMESH_I/SMESH_MEDFamily_i.cxx
View File

@ -126,7 +126,7 @@ throw (SALOME::SALOME_Exception)
* CORBA: Accessor for attributes identifiers
*/
//=============================================================================
SALOME_MED::long_array* SMESH_MEDFamily_i::getAttributesIdentifiers()
SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesIdentifiers()
throw (SALOME::SALOME_Exception)
{
if (_subMeshDS==NULL)
@ -139,7 +139,7 @@ throw (SALOME::SALOME_Exception)
,SALOME::BAD_PARAM);
};
SALOME_MED::long_array_var myseq= new SALOME_MED::long_array;
SALOME_TYPES::ListOfLong_var myseq= new SALOME_TYPES::ListOfLong;
myseq->length(_numberOfAttribute);
for (int i=0;i<_numberOfAttribute;i++)
{
@ -176,7 +176,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeIdentifier(CORBA::Long i)
* CORBA: Accessor for attributes values
*/
//=============================================================================
SALOME_MED::long_array* SMESH_MEDFamily_i::getAttributesValues()
SALOME_TYPES::ListOfLong* SMESH_MEDFamily_i::getAttributesValues()
throw (SALOME::SALOME_Exception)
{
if (_subMeshDS==NULL)
@ -190,7 +190,7 @@ SALOME_MED::long_array* SMESH_MEDFamily_i::getAttributesValues()
,SALOME::BAD_PARAM);
};
SALOME_MED::long_array_var myseq= new SALOME_MED::long_array;
SALOME_TYPES::ListOfLong_var myseq= new SALOME_TYPES::ListOfLong;
myseq->length(_numberOfAttribute);
for (int i=0;i<_numberOfAttribute;i++)
{
@ -224,7 +224,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeValue(CORBA::Long i)
* CORBA: Accessor for attributes desriptions
*/
//=============================================================================
SALOME_MED::string_array * SMESH_MEDFamily_i::getAttributesDescriptions()
SALOME_TYPES::ListOfString * SMESH_MEDFamily_i::getAttributesDescriptions()
throw (SALOME::SALOME_Exception)
{
if (_subMeshDS==NULL)
@ -236,7 +236,7 @@ SALOME_MED::string_array * SMESH_MEDFamily_i::getAttributesDescriptions()
THROW_SALOME_CORBA_EXCEPTION("No attributes"\
,SALOME::BAD_PARAM);
}
SALOME_MED::string_array_var myseq = new SALOME_MED::string_array;
SALOME_TYPES::ListOfString_var myseq = new SALOME_TYPES::ListOfString;
for (int i=0;i<_numberOfAttribute;i++)
{
myseq[i]=CORBA::string_dup(_attributeDescription[i].c_str());
@ -292,7 +292,7 @@ char * SMESH_MEDFamily_i::getGroupName( CORBA::Long i)
* CORBA: Accessor for all the groups name
*/
//=============================================================================
SALOME_MED::string_array* SMESH_MEDFamily_i::getGroupsNames()
SALOME_TYPES::ListOfString* SMESH_MEDFamily_i::getGroupsNames()
throw (SALOME::SALOME_Exception)
{
MESSAGE("!!! NOT YET IMPLEMENTED !!!!");

8
src/SMESH_I/SMESH_MEDFamily_i.hxx
View File

@ -70,15 +70,15 @@ public :
throw (SALOME::SALOME_Exception);
CORBA::Long getNumberOfAttributes()
throw (SALOME::SALOME_Exception);
SALOME_MED::long_array* getAttributesIdentifiers()
SALOME_TYPES::ListOfLong* getAttributesIdentifiers()
throw (SALOME::SALOME_Exception);
CORBA::Long getAttributeIdentifier(CORBA::Long i)
throw (SALOME::SALOME_Exception);
SALOME_MED::long_array* getAttributesValues()
SALOME_TYPES::ListOfLong* getAttributesValues()
throw (SALOME::SALOME_Exception);
CORBA::Long getAttributeValue(CORBA::Long i)
throw (SALOME::SALOME_Exception);
SALOME_MED::string_array* getAttributesDescriptions()
SALOME_TYPES::ListOfString* getAttributesDescriptions()
throw (SALOME::SALOME_Exception);
char* getAttributeDescription( CORBA::Long i)
throw (SALOME::SALOME_Exception);
@ -86,7 +86,7 @@ public :
throw (SALOME::SALOME_Exception);
char * getGroupName( CORBA::Long i)
throw (SALOME::SALOME_Exception);
SALOME_MED::string_array* getGroupsNames()
SALOME_TYPES::ListOfString* getGroupsNames()
throw (SALOME::SALOME_Exception);
};
#endif /* MED_FAMILY_I_HXX_ */

24
src/SMESH_I/SMESH_MEDMesh_i.cxx
View File

@ -248,13 +248,13 @@ char *SMESH_MEDMesh_i::getCoordinatesSystem() throw(SALOME::SALOME_Exception)
* CORBA: Accessor for Coordinates
*/
//=============================================================================
SALOME_MED::double_array * SMESH_MEDMesh_i::getCoordinates
SALOME_TYPES::ListOfDouble * SMESH_MEDMesh_i::getCoordinates
(SALOME_MED::medModeSwitch typeSwitch) throw(SALOME::SALOME_Exception)
{
if (_mesh_i == 0)
THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
SALOME::INTERNAL_ERROR);
SALOME_MED::double_array_var myseq = new SALOME_MED::double_array;
SALOME_TYPES::ListOfDouble_var myseq = new SALOME_TYPES::ListOfDouble;
try
{
// PN : En dur
@ -305,13 +305,13 @@ SALOME_MED::double_array * SMESH_MEDMesh_i::getCoordinates
* CORBA: Accessor for Coordinates Names
*/
//=============================================================================
SALOME_MED::string_array *
SALOME_TYPES::ListOfString *
SMESH_MEDMesh_i::getCoordinatesNames()throw(SALOME::SALOME_Exception)
{
if (_mesh_i == 0)
THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
SALOME::INTERNAL_ERROR);
SALOME_MED::string_array_var myseq = new SALOME_MED::string_array;
SALOME_TYPES::ListOfString_var myseq = new SALOME_TYPES::ListOfString;
try
{
// PN : en dur
@ -336,13 +336,13 @@ SMESH_MEDMesh_i::getCoordinatesNames()throw(SALOME::SALOME_Exception)
* CORBA: Accessor for Coordinates Units
*/
//=============================================================================
SALOME_MED::string_array *
SALOME_TYPES::ListOfString *
SMESH_MEDMesh_i::getCoordinatesUnits()throw(SALOME::SALOME_Exception)
{
if (_mesh_i == 0)
THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
SALOME::INTERNAL_ERROR);
SALOME_MED::string_array_var myseq = new SALOME_MED::string_array;
SALOME_TYPES::ListOfString_var myseq = new SALOME_TYPES::ListOfString;
try
{
// PN : en dur
@ -509,7 +509,7 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED::
* CORBA: Accessor for connectivities
*/
//=============================================================================
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch,
SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity,
@ -541,7 +541,7 @@ SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch,
* CORBA: Accessor for connectivities
*/
//=============================================================================
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
SMESH_MEDMesh_i::getConnectivityIndex(SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity)
throw(SALOME::SALOME_Exception)
@ -560,7 +560,7 @@ CORBA::Long
SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity,
SALOME_MED::medGeometryElement type,
const SALOME_MED::long_array & connectivity)
const SALOME_TYPES::ListOfLong & connectivity)
throw(SALOME::SALOME_Exception)
{
const char *LOC = "getElementNumber ";
@ -575,7 +575,7 @@ SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode,
* not implemented for MED_ALL_ENTITIES and MED_MAILLE
*/
//=============================================================================
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
SMESH_MEDMesh_i::getReverseConnectivity(SALOME_MED::
medConnectivity mode) throw(SALOME::SALOME_Exception)
{
@ -589,7 +589,7 @@ SMESH_MEDMesh_i::getReverseConnectivity(SALOME_MED::
* CORBA: Accessor for connectivities
*/
//=============================================================================
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
SMESH_MEDMesh_i::getReverseConnectivityIndex(SALOME_MED::
medConnectivity mode) throw(SALOME::SALOME_Exception)
{
@ -708,7 +708,7 @@ SALOME_MED::GROUP_ptr SMESH_MEDMesh_i::getGroup(SALOME_MED::
* CORBA: Returns references for the global numbering index
*/
//=============================================================================
SALOME_MED::long_array*
SALOME_TYPES::ListOfLong*
SMESH_MEDMesh_i::getGlobalNumberingIndex(SALOME_MED::medEntityMesh entity)
throw (SALOME::SALOME_Exception)
{

20
src/SMESH_I/SMESH_MEDMesh_i.hxx
View File

@ -63,7 +63,7 @@ protected:
int _famIdent;
std::map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts;
SALOME_MED::long_array_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE];
SALOME_TYPES::ListOfLong_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE];
std::map < SALOME_MED::medEntityMesh, int >_mapNbTypes;
std::map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes;
@ -112,13 +112,13 @@ public:
CORBA::Double getCoordinate(CORBA::Long Number, CORBA::Long Axis)
throw (SALOME::SALOME_Exception);
SALOME_MED::double_array * getCoordinates(SALOME_MED::medModeSwitch typeSwitch)
SALOME_TYPES::ListOfDouble * getCoordinates(SALOME_MED::medModeSwitch typeSwitch)
throw(SALOME::SALOME_Exception);
SALOME_MED::string_array * getCoordinatesNames()
SALOME_TYPES::ListOfString * getCoordinatesNames()
throw(SALOME::SALOME_Exception);
SALOME_MED::string_array * getCoordinatesUnits()
SALOME_TYPES::ListOfString * getCoordinatesUnits()
throw(SALOME::SALOME_Exception);
CORBA::Long getNumberOfNodes() throw(SALOME::SALOME_Exception);
@ -139,33 +139,33 @@ public:
SALOME_MED::medGeometryElement geomElement)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getConnectivity(SALOME_MED::medModeSwitch typeSwitch,
SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity,
SALOME_MED::medGeometryElement geomElement)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getConnectivityIndex(SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array*
SALOME_TYPES::ListOfLong*
getGlobalNumberingIndex(SALOME_MED::medEntityMesh entity)
throw (SALOME::SALOME_Exception);
CORBA::Long getElementNumber(SALOME_MED::medConnectivity mode,
SALOME_MED::medEntityMesh entity,
SALOME_MED::medGeometryElement type,
const SALOME_MED::long_array & connectivity)
const SALOME_TYPES::ListOfLong & connectivity)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getReverseConnectivity(SALOME_MED::medConnectivity mode)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getReverseConnectivityIndex(SALOME_MED::medConnectivity mode)
throw(SALOME::SALOME_Exception);

10
src/SMESH_I/SMESH_MEDSupport_i.cxx
View File

@ -296,7 +296,7 @@ CORBA::Long SMESH_MEDSupport_i::getNumberOfElements(SALOME_MED::
*/
//=============================================================================
SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber(
SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumber(
SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
@ -308,7 +308,7 @@ SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber(
if (geomElement != SALOME_MED::MED_NONE)
THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM);
SALOME_MED::long_array_var myseq = new SALOME_MED::long_array;
SALOME_TYPES::ListOfLong_var myseq = new SALOME_TYPES::ListOfLong;
int i = 0;
myseq->length(_subMeshDS->NbNodes());
@ -332,7 +332,7 @@ SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber(
*/
//=============================================================================
SALOME_MED::long_array * SMESH_MEDSupport_i::getNumberFromFile(
SALOME_TYPES::ListOfLong * SMESH_MEDSupport_i::getNumberFromFile(
SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
{
return getNumber(geomElement);
@ -345,7 +345,7 @@ SALOME_MED::long_array * SMESH_MEDSupport_i::getNumberFromFile(
*/
//=============================================================================
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
SMESH_MEDSupport_i::getNumberIndex()throw(SALOME::SALOME_Exception)
{
MESSAGE("Not implemented for SMESH_i");
@ -382,7 +382,7 @@ CORBA::Long SMESH_MEDSupport_i::getNumberOfTypes()
* included in the support
*/
//=============================================================================
SALOME_MED::long_array* SMESH_MEDSupport_i::getNumbersOfGaussPoint()
SALOME_TYPES::ListOfLong* SMESH_MEDSupport_i::getNumbersOfGaussPoint()
throw (SALOME::SALOME_Exception)
{
MESSAGE("!!! NOT YET IMPLEMENTED !!!!");

8
src/SMESH_I/SMESH_MEDSupport_i.hxx
View File

@ -64,25 +64,25 @@ class SMESH_I_EXPORT SMESH_MEDSupport_i:
CORBA::Long getNumberOfTypes() throw (SALOME::SALOME_Exception);
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getNumber(SALOME_MED::medGeometryElement geomElement)
throw(SALOME::SALOME_Exception);
/*!
* Same function as getNumber.
*/
SALOME_MED::long_array *
SALOME_TYPES::ListOfLong *
getNumberFromFile(SALOME_MED::medGeometryElement geomElement)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array * getNumberIndex()
SALOME_TYPES::ListOfLong * getNumberIndex()
throw(SALOME::SALOME_Exception);
CORBA::Long
getNumberOfGaussPoint(SALOME_MED::medGeometryElement geomElement)
throw(SALOME::SALOME_Exception);
SALOME_MED::long_array* getNumbersOfGaussPoint()
SALOME_TYPES::ListOfLong* getNumbersOfGaussPoint()
throw (SALOME::SALOME_Exception);
SALOME_MED::medGeometryElement_array *getTypes()