ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

typo-fix by Kunda

Browse Source 
http://www.salome-platform.org/forum/forum_9/621049380
This commit is contained in:
eap 2017-12-05 14:47:35 +03:00
parent 05318c85be
commit de56eb6c9f
14 changed files with 196 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MEDWrapper/Base/MED_Structures.hxx
View File

@ -181,7 +181,7 @@ namespace MED
typedef TIntVector TElemNum; typedef TIntVector TElemNum;
typedef SharedPtr<TElemNum> PElemNum; typedef SharedPtr<TElemNum> PElemNum;
//! Define a parent class for all MED entities that describes mesh entites such as nodes and cells. //! Define a parent class for all MED entities that describes mesh entities such as nodes and cells.
struct MEDWRAPPER_EXPORT TElemInfo: virtual TBase struct MEDWRAPPER_EXPORT TElemInfo: virtual TBase
{ {
PMeshInfo myMeshInfo; //!< A reference to correspondig MED Mesh PMeshInfo myMeshInfo; //!< A reference to correspondig MED Mesh
@ -191,7 +191,7 @@ namespace MED
TInt myNbElem; //<! Number of corresponding mesh entities TInt myNbElem; //<! Number of corresponding mesh entities
TInt GetNbElem() const { return myNbElem;} //! Get number of mesh elements TInt GetNbElem() const { return myNbElem;} //! Get number of mesh elements
//! Defines sequence MED Family indexes for corresponding mesh entites //! Defines sequence MED Family indexes for corresponding mesh entities
PElemNum myFamNum; PElemNum myFamNum;
//! Get number of a MED FAMILY by order number of the mesh element //! Get number of a MED FAMILY by order number of the mesh element
TInt GetFamNum(TInt theId) const; TInt GetFamNum(TInt theId) const;
@ -218,7 +218,7 @@ namespace MED
//! Defines if the mesh elements are named //! Defines if the mesh elements are named
EBooleen myIsElemNames; EBooleen myIsElemNames;
//! Let know if the mesh elements havew names //! Let know if the mesh elements have names
EBooleen IsElemNames() const { return myIsElemNames;} EBooleen IsElemNames() const { return myIsElemNames;}
//! Contains sequence of the names for the mesh elements //! Contains sequence of the names for the mesh elements
@ -1047,7 +1047,7 @@ namespace MED
void SetGrilleStructure(TInt theAxis,TInt theNb); void SetGrilleStructure(TInt theAxis,TInt theNb);
/*! /*!
*Defines sequence MED Family indexes for corresponding mesh entites *Defines sequence MED Family indexes for corresponding mesh entities
*/ */
TElemNum myFamNum; TElemNum myFamNum;
//! Get number of a MED FAMILY by order number of the mesh element //! Get number of a MED FAMILY by order number of the mesh element
@ -1056,7 +1056,7 @@ namespace MED
void SetFamNum(TInt theId, TInt theVal); void SetFamNum(TInt theId, TInt theVal);
/*! /*!
*Defines sequence MED Family indexes for sub entites *Defines sequence MED Family indexes for sub entities
*/ */
TElemNum myFamSubNum; TElemNum myFamSubNum;
//! Get number of a MED FAMILY by order number of sub element //! Get number of a MED FAMILY by order number of sub element

24
src/MEDWrapper/Base/MED_Wrapper.hxx
View File

@ -800,7 +800,7 @@ namespace MED
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//! Read the values for MEDWrapper MED TIEMSTAMP from defined MED file //! Read the values for MEDWrapper MED TIMESTAMP from defined MED file
virtual virtual
void void
GetTimeStampValue(const PTimeStampValueBase& theTimeStampValue, GetTimeStampValue(const PTimeStampValueBase& theTimeStampValue,
@ -808,13 +808,13 @@ namespace MED
const TKey2Gauss& theKey2Gauss, const TKey2Gauss& theKey2Gauss,
TErr* theErr = NULL) = 0; TErr* theErr = NULL) = 0;
//! Write the values for MEDWrapper MED TIEMSTAMP to defined MED file //! Write the values for MEDWrapper MED TIMESTAMP to defined MED file
virtual virtual
void void
SetTimeStampValue(const PTimeStampValueBase& theTimeStampValue, SetTimeStampValue(const PTimeStampValueBase& theTimeStampValue,
TErr* theErr = NULL) = 0; TErr* theErr = NULL) = 0;
//! Creates the values for MEDWrapper MED TIEMSTAMP representation //! Creates the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampValueBase PTimeStampValueBase
CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo, CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo,
@ -822,27 +822,27 @@ namespace MED
const TGeom2Profile& theGeom2Profile = TGeom2Profile(), const TGeom2Profile& theGeom2Profile = TGeom2Profile(),
EModeSwitch theMode = eFULL_INTERLACE) = 0; EModeSwitch theMode = eFULL_INTERLACE) = 0;
//! Creates the values for MEDWrapper MED TIEMSTAMP representation //! Creates the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampValueBase PTimeStampValueBase
CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo, CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo,
const TGeom2Profile& theGeom2Profile = TGeom2Profile(), const TGeom2Profile& theGeom2Profile = TGeom2Profile(),
EModeSwitch theMode = eFULL_INTERLACE); EModeSwitch theMode = eFULL_INTERLACE);
//! A copy-constructor for the values for MEDWrapper MED TIEMSTAMP representation //! A copy-constructor for the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampValueBase PTimeStampValueBase
CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo, CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo,
const PTimeStampValueBase& theInfo, const PTimeStampValueBase& theInfo,
ETypeChamp theTypeChamp) = 0; ETypeChamp theTypeChamp) = 0;
//! A copy-constructor for the values for MEDWrapper MED TIEMSTAMP representation //! A copy-constructor for the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampValueBase PTimeStampValueBase
CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo, CrTimeStampValue(const PTimeStampInfo& theTimeStampInfo,
const PTimeStampValueBase& theInfo); const PTimeStampValueBase& theInfo);
//! Read the values for MEDWrapper MED TIEMSTAMP from defined MED file //! Read the values for MEDWrapper MED TIMESTAMP from defined MED file
PTimeStampValueBase PTimeStampValueBase
GetPTimeStampValue(const PTimeStampInfo& theTimeStampInfo, GetPTimeStampValue(const PTimeStampInfo& theTimeStampInfo,
const TMKey2Profile& theMKey2Profile, const TMKey2Profile& theMKey2Profile,
@ -851,7 +851,7 @@ namespace MED
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Backward compatibility declarations // Backward compatibility declarations
//! Read the values for MEDWrapper MED TIEMSTAMP from defined MED file //! Read the values for MEDWrapper MED TIMESTAMP from defined MED file
virtual virtual
void void
GetTimeStampVal(const PTimeStampVal& theVal, GetTimeStampVal(const PTimeStampVal& theVal,
@ -859,26 +859,26 @@ namespace MED
const TKey2Gauss& theKey2Gauss, const TKey2Gauss& theKey2Gauss,
TErr* theErr = NULL); TErr* theErr = NULL);
//! Write the values for MEDWrapper MED TIEMSTAMP to defined MED file //! Write the values for MEDWrapper MED TIMESTAMP to defined MED file
virtual virtual
void void
SetTimeStamp(const PTimeStampVal& theVal, SetTimeStamp(const PTimeStampVal& theVal,
TErr* theErr = NULL); TErr* theErr = NULL);
//! Creates the values for MEDWrapper MED TIEMSTAMP representation //! Creates the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampVal PTimeStampVal
CrTimeStampVal(const PTimeStampInfo& theTimeStampInfo, CrTimeStampVal(const PTimeStampInfo& theTimeStampInfo,
const TGeom2Profile& theGeom2Profile = TGeom2Profile(), const TGeom2Profile& theGeom2Profile = TGeom2Profile(),
EModeSwitch theMode = eFULL_INTERLACE); EModeSwitch theMode = eFULL_INTERLACE);
//! A copy-constructor for the values for MEDWrapper MED TIEMSTAMP representation //! A copy-constructor for the values for MEDWrapper MED TIMESTAMP representation
virtual virtual
PTimeStampVal PTimeStampVal
CrTimeStampVal(const PTimeStampInfo& theTimeStampInfo, CrTimeStampVal(const PTimeStampInfo& theTimeStampInfo,
const PTimeStampVal& theInfo); const PTimeStampVal& theInfo);
//! Read the values for MEDWrapper MED TIEMSTAMP from defined MED file //! Read the values for MEDWrapper MED TIMESTAMP from defined MED file
PTimeStampVal PTimeStampVal
GetPTimeStampVal(const PTimeStampInfo& theTimeStampInfo, GetPTimeStampVal(const PTimeStampInfo& theTimeStampInfo,
const TMKey2Profile& theMKey2Profile, const TMKey2Profile& theMKey2Profile,

6
src/SMESH/SMESH_MeshEditor.hxx
View File

@ -173,7 +173,7 @@ public:
* \param theElems - The triangles to be fused. * \param theElems - The triangles to be fused.
* \param theCriterion - Is used to choose a neighbour to fuse with. * \param theCriterion - Is used to choose a neighbour to fuse with.
* \param theMaxAngle - Is a max angle between element normals at which fusion * \param theMaxAngle - Is a max angle between element normals at which fusion
* is still performed; theMaxAngle is mesured in radians. * is still performed; theMaxAngle is measured in radians.
* \return bool - Success or not. * \return bool - Success or not.
*/ */
bool TriToQuad (TIDSortedElemSet & theElems, bool TriToQuad (TIDSortedElemSet & theElems,
@ -181,7 +181,7 @@ public:
const double theMaxAngle); const double theMaxAngle);
/*! /*!
* \brief Split quadrangles into triangles. * \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted. * \param theElems - The faces to be split.
* \param theCriterion - Is used to choose a diagonal for splitting. * \param theCriterion - Is used to choose a diagonal for splitting.
* \return bool - Success or not. * \return bool - Success or not.
*/ */
@ -189,7 +189,7 @@ public:
SMESH::Controls::NumericalFunctorPtr theCriterion); SMESH::Controls::NumericalFunctorPtr theCriterion);
/*! /*!
* \brief Split quadrangles into triangles. * \brief Split quadrangles into triangles.
* \param theElems - The faces to be splitted. * \param theElems - The faces to be split.
* \param the13Diag - Is used to choose a diagonal for splitting. * \param the13Diag - Is used to choose a diagonal for splitting.
* \return bool - Success or not. * \return bool - Success or not.
*/ */

2
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -798,7 +798,7 @@ void SMESHGUI_FilterTable::Table::setEditable (bool isEditable,
//======================================================================= //=======================================================================
// name : SMESHGUI_FilterTable::Table::isEditable // name : SMESHGUI_FilterTable::Table::isEditable
// Purpose : Verify wheter cell is editable // Purpose : Verify whether cell is editable
//======================================================================= //=======================================================================
bool SMESHGUI_FilterTable::Table::isEditable (int row, int col) const bool SMESHGUI_FilterTable::Table::isEditable (int row, int col) const
{ {

78
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
View File

@ -322,7 +322,7 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* a2DTriQuad = createField(); QLabel* a2DTriQuad = createField();
a2DTriQuad->setObjectName("nbQuadraticTriangle"); a2DTriQuad->setObjectName("nbQuadraticTriangle");
QLabel* a2DTriBiQuad = createField(); QLabel* a2DTriBiQuad = createField();
a2DTriBiQuad->setObjectName("nbBiQuadraticTriangle"); a2DTriBiQuad->setObjectName("nbBiQuadraticTriangle");
QLabel* a2DQuaLab = new QLabel( tr( "QUADRANGLES_LAB" ), this ); QLabel* a2DQuaLab = new QLabel( tr( "QUADRANGLES_LAB" ), this );
QLabel* a2DQuaTotal = createField(); QLabel* a2DQuaTotal = createField();
a2DQuaTotal->setObjectName("nbQuadrangle"); a2DQuaTotal->setObjectName("nbQuadrangle");
@ -941,7 +941,7 @@ void SMESHGUI_MeshInfo::saveInfo( QTextStream &out )
\param parent parent widget \param parent parent widget
*/ */
SMESHGUI_ElemInfo::SMESHGUI_ElemInfo( QWidget* parent ) SMESHGUI_ElemInfo::SMESHGUI_ElemInfo( QWidget* parent )
: QWidget( parent ), myActor( 0 ), myIsElement( -1 ) : QWidget( parent ), myActor( 0 ), myIsElement( -1 )
{ {
myFrame = new QWidget( this ); myFrame = new QWidget( this );
myExtra = new ExtraWidget( this ); myExtra = new ExtraWidget( this );
@ -1165,7 +1165,7 @@ void SMESHGUI_ElemInfo::updateControls()
\param parent parent widget \param parent parent widget
*/ */
SMESHGUI_SimpleElemInfo::SMESHGUI_SimpleElemInfo( QWidget* parent ) SMESHGUI_SimpleElemInfo::SMESHGUI_SimpleElemInfo( QWidget* parent )
: SMESHGUI_ElemInfo( parent ) : SMESHGUI_ElemInfo( parent )
{ {
myInfo = new QTextBrowser( frame() ); myInfo = new QTextBrowser( frame() );
QVBoxLayout* l = new QVBoxLayout( frame() ); QVBoxLayout* l = new QVBoxLayout( frame() );
@ -1180,12 +1180,12 @@ SMESHGUI_SimpleElemInfo::SMESHGUI_SimpleElemInfo( QWidget* parent )
void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids ) void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
{ {
clearInternal(); clearInternal();
if ( actor() ) { if ( actor() ) {
int grp_details = SMESHGUI::resourceMgr()->booleanValue( "SMESH", "elem_info_grp_details", false ); int grp_details = SMESHGUI::resourceMgr()->booleanValue( "SMESH", "elem_info_grp_details", false );
int precision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "length_precision", 6 ); int precision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "length_precision", 6 );
int cprecision = -1; int cprecision = -1;
if ( SMESHGUI::resourceMgr()->booleanValue( "SMESH", "use_precision", false )) if ( SMESHGUI::resourceMgr()->booleanValue( "SMESH", "use_precision", false ))
cprecision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "controls_precision", -1 ); cprecision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "controls_precision", -1 );
foreach ( long id, ids ) { foreach ( long id, ids ) {
if ( !isElements() ) { if ( !isElements() ) {
@ -1230,7 +1230,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
myInfo->append( QString( "<b>%1</b>" ).arg( SMESHGUI_ElemInfo::tr( "FREE_NODE" )).arg( id )); myInfo->append( QString( "<b>%1</b>" ).arg( SMESHGUI_ElemInfo::tr( "FREE_NODE" )).arg( id ));
} }
// node position // node position
SMESH::SMESH_Mesh_ptr aMeshPtr = actor()->GetObject()->GetMeshServer(); SMESH::SMESH_Mesh_ptr aMeshPtr = actor()->GetObject()->GetMeshServer();
if ( !CORBA::is_nil( aMeshPtr )) { if ( !CORBA::is_nil( aMeshPtr )) {
SMESH::NodePosition_var pos = aMeshPtr->GetNodePosition( id ); SMESH::NodePosition_var pos = aMeshPtr->GetNodePosition( id );
int shapeID = pos->shapeID; int shapeID = pos->shapeID;
@ -1246,8 +1246,8 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
case GEOM::FACE: case GEOM::FACE:
shapeType = SMESHGUI_ElemInfo::tr( "GEOM_FACE" ); shapeType = SMESHGUI_ElemInfo::tr( "GEOM_FACE" );
if ( pos->params.length() == 2 ) { if ( pos->params.length() == 2 ) {
u = pos->params[0]; u = pos->params[0];
v = pos->params[1]; v = pos->params[1];
} }
break; break;
case GEOM::VERTEX: case GEOM::VERTEX:
@ -1291,7 +1291,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
SMESH::SMESH_Group_var aStdGroup = SMESH::SMESH_Group::_narrow( aGrp ); SMESH::SMESH_Group_var aStdGroup = SMESH::SMESH_Group::_narrow( aGrp );
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGrp ); SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGrp );
SMESH::SMESH_GroupOnFilter_var aFltGroup = SMESH::SMESH_GroupOnFilter::_narrow( aGrp ); SMESH::SMESH_GroupOnFilter_var aFltGroup = SMESH::SMESH_GroupOnFilter::_narrow( aGrp );
// type : group on geometry, standalone group, group on filter // type : group on geometry, standalone group, group on filter
if ( !CORBA::is_nil( aStdGroup )) { if ( !CORBA::is_nil( aStdGroup )) {
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )).
@ -1311,11 +1311,11 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )).
arg( SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" )) ); arg( SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" )) );
} }
// size // size
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "SIZE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "SIZE" )).
arg( QString::number( aGrp->Size() )) ); arg( QString::number( aGrp->Size() )) );
// color // color
SALOMEDS::Color color = aGrp->GetColor(); SALOMEDS::Color color = aGrp->GetColor();
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "COLOR" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "COLOR" )).
@ -1328,11 +1328,11 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
else { else {
// //
// show element info // show element info
// //
const SMDS_MeshElement* e = actor()->GetObject()->GetMesh()->FindElement( id ); const SMDS_MeshElement* e = actor()->GetObject()->GetMesh()->FindElement( id );
SMESH::Controls::NumericalFunctorPtr afunctor; SMESH::Controls::NumericalFunctorPtr afunctor;
if ( !e ) return; if ( !e ) return;
// Element ID && Type // Element ID && Type
QString stype; QString stype;
switch( e->GetType() ) { switch( e->GetType() ) {
@ -1346,7 +1346,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
stype = SMESHGUI_ElemInfo::tr( "FACE" ); break; stype = SMESHGUI_ElemInfo::tr( "FACE" ); break;
case SMDSAbs_Volume: case SMDSAbs_Volume:
stype = SMESHGUI_ElemInfo::tr( "VOLUME" ); break; stype = SMESHGUI_ElemInfo::tr( "VOLUME" ); break;
default: default:
break; break;
} }
if ( stype.isEmpty() ) return; if ( stype.isEmpty() ) return;
@ -1387,7 +1387,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
case SMDSEntity_Polyhedra: case SMDSEntity_Polyhedra:
case SMDSEntity_Quad_Polyhedra: case SMDSEntity_Quad_Polyhedra:
gtype = SMESHGUI_ElemInfo::tr( "POLYHEDRON" ); break; gtype = SMESHGUI_ElemInfo::tr( "POLYHEDRON" ); break;
default: default:
break; break;
} }
if ( !gtype.isEmpty() ) if ( !gtype.isEmpty() )
@ -1446,39 +1446,39 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
afunctor.reset( new SMESH::Controls::Length() ); afunctor.reset( new SMESH::Controls::Length() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "LENGTH_EDGES" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "LENGTH_EDGES" )).arg( afunctor->GetValue( id )) );
} }
if( e->GetType() == SMDSAbs_Face ) { if( e->GetType() == SMDSAbs_Face ) {
//Area //Area
afunctor.reset( new SMESH::Controls::Area() ); afunctor.reset( new SMESH::Controls::Area() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "AREA_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "AREA_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//Taper //Taper
afunctor.reset( new SMESH::Controls::Taper() ); afunctor.reset( new SMESH::Controls::Taper() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "TAPER_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "TAPER_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//AspectRatio2D //AspectRatio2D
afunctor.reset( new SMESH::Controls::AspectRatio() ); afunctor.reset( new SMESH::Controls::AspectRatio() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "ASPECTRATIO_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "ASPECTRATIO_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//Minimum angle //Minimum angle
afunctor.reset( new SMESH::Controls::MinimumAngle() ); afunctor.reset( new SMESH::Controls::MinimumAngle() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "MINIMUMANGLE_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "MINIMUMANGLE_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//Wraping angle //Warping angle
afunctor.reset( new SMESH::Controls::Warping() ); afunctor.reset( new SMESH::Controls::Warping() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "WARP_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "WARP_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//Skew //Skew
afunctor.reset( new SMESH::Controls::Skew() ); afunctor.reset( new SMESH::Controls::Skew() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "SKEW_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "SKEW_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//ElemDiam2D //ElemDiam2D
afunctor.reset( new SMESH::Controls::MaxElementLength2D() ); afunctor.reset( new SMESH::Controls::MaxElementLength2D() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
@ -1493,11 +1493,11 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
afunctor.reset( new SMESH::Controls::AspectRatio3D() ); afunctor.reset( new SMESH::Controls::AspectRatio3D() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "ASPECTRATIO_3D_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "ASPECTRATIO_3D_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//Volume //Volume
afunctor.reset( new SMESH::Controls::Volume() ); afunctor.reset( new SMESH::Controls::Volume() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "VOLUME_3D_ELEMENTS" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "VOLUME_3D_ELEMENTS" )).arg( afunctor->GetValue( id )) );
//ElementDiameter3D //ElementDiameter3D
afunctor.reset( new SMESH::Controls::Volume() ); afunctor.reset( new SMESH::Controls::Volume() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "MAX_ELEMENT_LENGTH_3D" )).arg( afunctor->GetValue( id )) ); myInfo->append( QString( "- <b>%1:</b> %2" ).arg( tr( "MAX_ELEMENT_LENGTH_3D" )).arg( afunctor->GetValue( id )) );
@ -1508,7 +1508,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
// Gravity center // Gravity center
XYZ gc = gravityCenter( e ); XYZ gc = gravityCenter( e );
myInfo->append( QString( "<b>%1:</b> (%2, %3, %4)" ).arg( SMESHGUI_ElemInfo::tr( "GRAVITY_CENTER" )).arg( gc.x() ).arg( gc.y() ).arg( gc.z() )); myInfo->append( QString( "<b>%1:</b> (%2, %3, %4)" ).arg( SMESHGUI_ElemInfo::tr( "GRAVITY_CENTER" )).arg( gc.x() ).arg( gc.y() ).arg( gc.z() ));
// Normal vector // Normal vector
if( e->GetType() == SMDSAbs_Face ) { if( e->GetType() == SMDSAbs_Face ) {
XYZ gc = normal( e ); XYZ gc = normal( e );
@ -1517,7 +1517,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
// Element position // Element position
if ( e->GetType() >= SMDSAbs_Edge && e->GetType() <= SMDSAbs_Volume ) { if ( e->GetType() >= SMDSAbs_Edge && e->GetType() <= SMDSAbs_Volume ) {
SMESH::SMESH_Mesh_ptr aMesh = actor()->GetObject()->GetMeshServer(); SMESH::SMESH_Mesh_ptr aMesh = actor()->GetObject()->GetMeshServer();
if ( !CORBA::is_nil( aMesh )) { if ( !CORBA::is_nil( aMesh )) {
SMESH::ElementPosition pos = aMesh->GetElementPosition( id ); SMESH::ElementPosition pos = aMesh->GetElementPosition( id );
int shapeID = pos.shapeID; int shapeID = pos.shapeID;
@ -1557,7 +1557,7 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
SMESH::SMESH_Group_var aStdGroup = SMESH::SMESH_Group::_narrow( aGrp ); SMESH::SMESH_Group_var aStdGroup = SMESH::SMESH_Group::_narrow( aGrp );
SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGrp ); SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGrp );
SMESH::SMESH_GroupOnFilter_var aFltGroup = SMESH::SMESH_GroupOnFilter::_narrow( aGrp ); SMESH::SMESH_GroupOnFilter_var aFltGroup = SMESH::SMESH_GroupOnFilter::_narrow( aGrp );
// type : group on geometry, standalone group, group on filter // type : group on geometry, standalone group, group on filter
if ( !CORBA::is_nil( aStdGroup )) { if ( !CORBA::is_nil( aStdGroup )) {
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )).
@ -1577,10 +1577,10 @@ void SMESHGUI_SimpleElemInfo::information( const QList<long>& ids )
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "TYPE" )).
arg( SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" )) ); arg( SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" )) );
} }
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "SIZE" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "SIZE" )).
arg( QString::number( aGrp->Size() )) ); arg( QString::number( aGrp->Size() )) );
// color // color
SALOMEDS::Color color = aGrp->GetColor(); SALOMEDS::Color color = aGrp->GetColor();
myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "COLOR" )). myInfo->append( QString( " - <b>%1:</b> %2" ).arg( SMESHGUI_AddInfo::tr( "COLOR" )).
@ -1659,7 +1659,7 @@ QWidget* SMESHGUI_TreeElemInfo::ItemDelegate::createEditor( QWidget* parent, con
\param parent parent widget \param parent parent widget
*/ */
SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent ) SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent )
: SMESHGUI_ElemInfo( parent ) : SMESHGUI_ElemInfo( parent )
{ {
myInfo = new QTreeWidget( frame() ); myInfo = new QTreeWidget( frame() );
myInfo->setColumnCount( 2 ); myInfo->setColumnCount( 2 );
@ -1999,7 +1999,7 @@ void SMESHGUI_TreeElemInfo::information( const QList<long>& ids )
QTreeWidgetItem* taperlItem = createItem( cntrItem, Bold ); QTreeWidgetItem* taperlItem = createItem( cntrItem, Bold );
taperlItem->setText( 0, tr( "TAPER_ELEMENTS" )); taperlItem->setText( 0, tr( "TAPER_ELEMENTS" ));
taperlItem->setText( 1, QString( "%1" ).arg( afunctor->GetValue( id )) ); taperlItem->setText( 1, QString( "%1" ).arg( afunctor->GetValue( id )) );
//Wraping angle //Warping angle
afunctor.reset( new SMESH::Controls::Warping() ); afunctor.reset( new SMESH::Controls::Warping() );
afunctor->SetMesh( actor()->GetObject()->GetMesh() ); afunctor->SetMesh( actor()->GetObject()->GetMesh() );
afunctor->SetPrecision( cprecision ); afunctor->SetPrecision( cprecision );
@ -2409,7 +2409,7 @@ void GrpComputor::compute()
\param parent parent widget \param parent parent widget
*/ */
SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ) SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent )
: QTreeWidget( parent ) : QTreeWidget( parent )
{ {
setColumnCount( 2 ); setColumnCount( 2 );
header()->setStretchLastSection( true ); header()->setStretchLastSection( true );
@ -3650,12 +3650,12 @@ void SMESHGUI_CtrlInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
computeOverConstrainedVolumesInfo(); computeOverConstrainedVolumesInfo();
// aspect Ratio 3D histogram // aspect Ratio 3D histogram
computeAspectRatio3D(); computeAspectRatio3D();
} }
else { else {
myButtons[7]->setEnabled( true ); myButtons[7]->setEnabled( true );
myButtons[8]->setEnabled( true ); myButtons[8]->setEnabled( true );
myButtons[9]->setEnabled( true ); myButtons[9]->setEnabled( true );
} }
#ifdef DISABLE_PLOT2DVIEWER #ifdef DISABLE_PLOT2DVIEWER
myMainLayout->setRowStretch(17,0); myMainLayout->setRowStretch(17,0);
for( int i=35; i<=37; i++) for( int i=35; i<=37; i++)
@ -3883,7 +3883,7 @@ void SMESHGUI_CtrlInfo::saveInfo( QTextStream &out ) {
\param parent parent widget \param parent parent widget
*/ */
SMESHGUI_CtrlInfoDlg::SMESHGUI_CtrlInfoDlg( QWidget* parent ) SMESHGUI_CtrlInfoDlg::SMESHGUI_CtrlInfoDlg( QWidget* parent )
: QDialog( parent ) : QDialog( parent )
{ {
setAttribute( Qt::WA_DeleteOnClose, true ); setAttribute( Qt::WA_DeleteOnClose, true );
setWindowTitle( tr( "CTRL_INFO" )); setWindowTitle( tr( "CTRL_INFO" ));

4
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -362,7 +362,7 @@ namespace SMESH
} }
if ( objModified ) { if ( objModified ) {
// PAL16631. Mesurements showed that to show aVisualObj in SHADING(default) mode, // PAL16631. Measurements showed that to show aVisualObj in SHADING(default) mode,
// ~5 times more memory is used than it occupies. // ~5 times more memory is used than it occupies.
// Warn the user if there is less free memory than 30 sizes of a grid // Warn the user if there is less free memory than 30 sizes of a grid
// TODO: estimate memory usage in other modes and take current mode into account // TODO: estimate memory usage in other modes and take current mode into account
@ -396,7 +396,7 @@ namespace SMESH
/*! Return active view window, if it instantiates SVTK_ViewWindow class, /*! Return active view window, if it instantiates SVTK_ViewWindow class,
* overwise find or create corresponding view window, make it active and return it. * otherwise find or create corresponding view window, make it active and return it.
* \note Active VVTK_ViewWindow can be returned, because it inherits SVTK_ViewWindow. * \note Active VVTK_ViewWindow can be returned, because it inherits SVTK_ViewWindow.
*/ */
SVTK_ViewWindow* GetViewWindow (const SalomeApp_Module* theModule, SVTK_ViewWindow* GetViewWindow (const SalomeApp_Module* theModule,

2
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -2148,7 +2148,7 @@ Check algorithm documentation for supported geometry</translation>
</message> </message>
<message> <message>
<source>SMESH_MESHINFO_ALL_TYPES</source> <source>SMESH_MESHINFO_ALL_TYPES</source>
<translation>Heterogenous</translation> <translation>Heterogeneous</translation>
</message> </message>
<message> <message>
<source>SMESH_MESHINFO_EDGES</source> <source>SMESH_MESHINFO_EDGES</source>

248
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -606,7 +606,7 @@ const char* _pyGen::AccessorMethod() const
//================================================================================ //================================================================================
/*! /*!
* \brief Convert a command using a specific converter * \brief Convert a command using a specific converter
* \param theCommand - the command to convert * \param theCommand - the command to convert
*/ */
//================================================================================ //================================================================================
@ -860,8 +860,8 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
aCommand->GetString() += tmpCmd.GetString(); aCommand->GetString() += tmpCmd.GetString();
} }
// IMP issue 0021014 // IMP issue 0021014
// set GetCriterion(elementType,CritType,Compare,Treshold,UnaryOp,BinaryOp,Tolerance) // set GetCriterion(elementType,CritType,Compare,Threshold,UnaryOp,BinaryOp,Tolerance)
// 1 2 3 4 5 6 7 // 1 2 3 4 5 6 7
// instead of "SMESH.Filter.Criterion( // instead of "SMESH.Filter.Criterion(
// Type,Compare,Threshold,ThresholdStr,ThresholdID,UnaryOp,BinaryOp,Tolerance,TypeOfElement,Precision) // Type,Compare,Threshold,ThresholdStr,ThresholdID,UnaryOp,BinaryOp,Tolerance,TypeOfElement,Precision)
// 1 2 3 4 5 6 7 8 9 10 // 1 2 3 4 5 6 7 8 9 10
@ -969,7 +969,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
//================================================================================ //================================================================================
/*! /*!
* \brief Convert the command or remember it for later conversion * \brief Convert the command or remember it for later conversion
* \param theCommand - The python command calling a method of SMESH_Gen * \param theCommand - The python command calling a method of SMESH_Gen
*/ */
//================================================================================ //================================================================================
@ -1278,8 +1278,8 @@ void _pyGen::Free()
//================================================================================ //================================================================================
/*! /*!
* \brief Add access method to mesh that is an argument * \brief Add access method to mesh that is an argument
* \param theCmd - command to add access method * \param theCmd - command to add access method
* \retval bool - true if added * \retval bool - true if added
*/ */
//================================================================================ //================================================================================
@ -1297,8 +1297,8 @@ bool _pyGen::AddMeshAccessorMethod( Handle(_pyCommand) theCmd ) const
//================================================================================ //================================================================================
/*! /*!
* \brief Add access method to algo that is an object or an argument * \brief Add access method to algo that is an object or an argument
* \param theCmd - command to add access method * \param theCmd - command to add access method
* \retval bool - true if added * \retval bool - true if added
*/ */
//================================================================================ //================================================================================
@ -1319,8 +1319,8 @@ bool _pyGen::AddAlgoAccessorMethod( Handle(_pyCommand) theCmd ) const
//================================================================================ //================================================================================
/*! /*!
* \brief Find hypothesis by ID (entry) * \brief Find hypothesis by ID (entry)
* \param theHypID - The hypothesis ID * \param theHypID - The hypothesis ID
* \retval Handle(_pyHypothesis) - The found hypothesis * \retval Handle(_pyHypothesis) - The found hypothesis
*/ */
//================================================================================ //================================================================================
@ -1337,10 +1337,10 @@ Handle(_pyHypothesis) _pyGen::FindHyp( const _pyID& theHypID )
//================================================================================ //================================================================================
/*! /*!
* \brief Find algorithm able to create a hypothesis * \brief Find algorithm able to create a hypothesis
* \param theGeom - The shape ID the algorithm was created on * \param theGeom - The shape ID the algorithm was created on
* \param theMesh - The mesh ID that created the algorithm * \param theMesh - The mesh ID that created the algorithm
* \param theHypothesis - The hypothesis the algorithm should be able to create * \param theHypothesis - The hypothesis the algorithm should be able to create
* \retval Handle(_pyHypothesis) - The found algo * \retval Handle(_pyHypothesis) - The found algo
*/ */
//================================================================================ //================================================================================
@ -1361,8 +1361,8 @@ Handle(_pyHypothesis) _pyGen::FindAlgo( const _pyID& theGeom, const _pyID& theMe
//================================================================================ //================================================================================
/*! /*!
* \brief Find subMesh by ID (entry) * \brief Find subMesh by ID (entry)
* \param theSubMeshID - The subMesh ID * \param theSubMeshID - The subMesh ID
* \retval Handle(_pySubMesh) - The found subMesh * \retval Handle(_pySubMesh) - The found subMesh
*/ */
//================================================================================ //================================================================================
@ -1378,8 +1378,8 @@ Handle(_pySubMesh) _pyGen::FindSubMesh( const _pyID& theSubMeshID )
//================================================================================ //================================================================================
/*! /*!
* \brief Change order of commands in the script * \brief Change order of commands in the script
* \param theCmd1 - One command * \param theCmd1 - One command
* \param theCmd2 - Another command * \param theCmd2 - Another command
*/ */
//================================================================================ //================================================================================
@ -1396,15 +1396,15 @@ void _pyGen::ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) th
int nb1 = theCmd1->GetOrderNb(); int nb1 = theCmd1->GetOrderNb();
theCmd1->SetOrderNb( theCmd2->GetOrderNb() ); theCmd1->SetOrderNb( theCmd2->GetOrderNb() );
theCmd2->SetOrderNb( nb1 ); theCmd2->SetOrderNb( nb1 );
// cout << "BECOME " << theCmd1->GetOrderNb() << "\t" << theCmd1->GetString() << endl // cout << "BECOME " << theCmd1->GetOrderNb() << "\t" << theCmd1->GetString() << endl
// << "BECOME " << theCmd2->GetOrderNb() << "\t" << theCmd2->GetString() << endl << endl; // << "BECOME " << theCmd2->GetOrderNb() << "\t" << theCmd2->GetString() << endl << endl;
} }
//================================================================================ //================================================================================
/*! /*!
* \brief Set one command after the other * \brief Set one command after the other
* \param theCmd - Command to move * \param theCmd - Command to move
* \param theAfterCmd - Command ater which to insert the first one * \param theAfterCmd - Command ater which to insert the first one
*/ */
//================================================================================ //================================================================================
@ -1416,8 +1416,8 @@ void _pyGen::SetCommandAfter( Handle(_pyCommand) theCmd, Handle(_pyCommand) theA
//================================================================================ //================================================================================
/*! /*!
* \brief Set one command before the other * \brief Set one command before the other
* \param theCmd - Command to move * \param theCmd - Command to move
* \param theBeforeCmd - Command before which to insert the first one * \param theBeforeCmd - Command before which to insert the first one
*/ */
//================================================================================ //================================================================================
@ -1429,8 +1429,8 @@ void _pyGen::SetCommandBefore( Handle(_pyCommand) theCmd, Handle(_pyCommand) the
//================================================================================ //================================================================================
/*! /*!
* \brief Set one command before or after the other * \brief Set one command before or after the other
* \param theCmd - Command to move * \param theCmd - Command to move
* \param theOtherCmd - Command ater or before which to insert the first one * \param theOtherCmd - Command ater or before which to insert the first one
*/ */
//================================================================================ //================================================================================
@ -1457,7 +1457,7 @@ void _pyGen::setNeighbourCommand( Handle(_pyCommand)& theCmd,
// void _pyGen::addFilterUser( Handle(_pyCommand)& theCommand, const Handle(_pyObject)& user ) // void _pyGen::addFilterUser( Handle(_pyCommand)& theCommand, const Handle(_pyObject)& user )
// { // {
// No more needed after adding _pyObject::myArgCommands // No more needed after adding _pyObject::myArgCommands
// const char filterPrefix[] = "aFilter0x"; // const char filterPrefix[] = "aFilter0x";
// if ( theCommand->GetString().Search( filterPrefix ) < 1 ) // if ( theCommand->GetString().Search( filterPrefix ) < 1 )
@ -1483,7 +1483,7 @@ void _pyGen::setNeighbourCommand( Handle(_pyCommand)& theCmd,
//================================================================================ //================================================================================
/*! /*!
* \brief Set command be last in list of commands * \brief Set command be last in list of commands
* \param theCmd - Command to be last * \param theCmd - Command to be last
*/ */
//================================================================================ //================================================================================
@ -1495,8 +1495,8 @@ Handle(_pyCommand)& _pyGen::GetLastCommand()
//================================================================================ //================================================================================
/*! /*!
* \brief Set method to access to object wrapped with python class * \brief Set method to access to object wrapped with python class
* \param theID - The wrapped object entry * \param theID - The wrapped object entry
* \param theMethod - The accessor method * \param theMethod - The accessor method
*/ */
//================================================================================ //================================================================================
@ -1508,7 +1508,7 @@ void _pyGen::SetAccessorMethod(const _pyID& theID, const char* theMethod )
//================================================================================ //================================================================================
/*! /*!
* \brief Generated new ID for object and assign with existing name * \brief Generated new ID for object and assign with existing name
* \param theID - ID of existing object * \param theID - ID of existing object
*/ */
//================================================================================ //================================================================================
@ -1548,7 +1548,7 @@ bool _pyGen::AddObject( Handle(_pyObject)& theObj )
} }
else if ( theObj->IsKind( STANDARD_TYPE( _pyMeshEditor ))) { else if ( theObj->IsKind( STANDARD_TYPE( _pyMeshEditor ))) {
add = myMeshEditors.insert( make_pair( theObj->GetID(), add = myMeshEditors.insert( make_pair( theObj->GetID(),
Handle(_pyMeshEditor)::DownCast( theObj ))).second; Handle(_pyMeshEditor)::DownCast( theObj ))).second;
} }
else { else {
add = myObjects.insert( make_pair( theObj->GetID(), theObj )).second; add = myObjects.insert( make_pair( theObj->GetID(), theObj )).second;
@ -1792,7 +1792,7 @@ _pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd, const _pyID& meshId):
//================================================================================ //================================================================================
/*! /*!
* \brief Convert an IDL API command of SMESH::SMESH_Mesh to a method call of python Mesh * \brief Convert an IDL API command of SMESH::SMESH_Mesh to a method call of python Mesh
* \param theCommand - Engine method called for this mesh * \param theCommand - Engine method called for this mesh
*/ */
//================================================================================ //================================================================================
@ -2622,7 +2622,7 @@ bool _pyMeshEditor::CanClear()
//================================================================================ //================================================================================
/*! /*!
* \brief _pyHypothesis constructor * \brief _pyHypothesis constructor
* \param theCreationCmd - * \param theCreationCmd -
*/ */
//================================================================================ //================================================================================
@ -2635,8 +2635,8 @@ _pyHypothesis::_pyHypothesis(const Handle(_pyCommand)& theCreationCmd):
//================================================================================ //================================================================================
/*! /*!
* \brief Creates algorithm or hypothesis * \brief Creates algorithm or hypothesis
* \param theCreationCmd - The engine command creating a hypothesis * \param theCreationCmd - The engine command creating a hypothesis
* \retval Handle(_pyHypothesis) - Result _pyHypothesis * \retval Handle(_pyHypothesis) - Result _pyHypothesis
*/ */
//================================================================================ //================================================================================
@ -2725,9 +2725,9 @@ bool _pyHypothesis::IsWrappable(const _pyID& theMesh) const
//================================================================================ //================================================================================
/*! /*!
* \brief Convert the command adding a hypothesis to mesh into a smesh command * \brief Convert the command adding a hypothesis to mesh into a smesh command
* \param theCmd - The command like mesh.AddHypothesis( geom, hypo ) * \param theCmd - The command like mesh.AddHypothesis( geom, hypo )
* \param theAlgo - The algo that can create this hypo * \param theAlgo - The algo that can create this hypo
* \retval bool - false if the command can't be converted * \retval bool - false if the command can't be converted
*/ */
//================================================================================ //================================================================================
@ -2790,7 +2790,7 @@ bool _pyHypothesis::Addition2Creation( const Handle(_pyCommand)& theCmd,
//================================================================================ //================================================================================
/*! /*!
* \brief Remember hypothesis parameter values * \brief Remember hypothesis parameter values
* \param theCommand - The called hypothesis method * \param theCommand - The called hypothesis method
*/ */
//================================================================================ //================================================================================
@ -3143,7 +3143,7 @@ void _pyHypothesis::setCreationArg( const int argNb, const _AString& arg )
//================================================================================ //================================================================================
/*! /*!
* \brief Remember hypothesis parameter values * \brief Remember hypothesis parameter values
* \param theCommand - The called hypothesis method * \param theCommand - The called hypothesis method
*/ */
//================================================================================ //================================================================================
@ -3198,8 +3198,8 @@ void _pyComplexParamHypo::Process( const Handle(_pyCommand)& theCommand)
{ {
CreationMethod& crMethod = type2meth->second; CreationMethod& crMethod = type2meth->second;
while ( (int) crMethod.myArgs.size() < i+1 ) while ( (int) crMethod.myArgs.size() < i+1 )
crMethod.myArgs.push_back( "[]" ); crMethod.myArgs.push_back( "[]" );
crMethod.myArgs[ i ] = theCommand->GetArg( 1 ); // arg value crMethod.myArgs[ i ] = theCommand->GetArg( 1 ); // arg value
} }
myArgCommands.push_back( theCommand ); myArgCommands.push_back( theCommand );
} }
@ -3243,7 +3243,7 @@ void _pyComplexParamHypo::Flush()
//================================================================================ //================================================================================
/*! /*!
* \brief Convert methods of 1D hypotheses to my own methods * \brief Convert methods of 1D hypotheses to my own methods
* \param theCommand - The called hypothesis method * \param theCommand - The called hypothesis method
*/ */
//================================================================================ //================================================================================
@ -3280,9 +3280,9 @@ void _pyLayerDistributionHypo::Process( const Handle(_pyCommand)& theCommand)
//================================================================================ //================================================================================
/*! /*!
* \brief * \brief
* \param theAdditionCmd - command to be converted * \param theAdditionCmd - command to be converted
* \param theMesh - mesh instance * \param theMesh - mesh instance
* \retval bool - status * \retval bool - status
*/ */
//================================================================================ //================================================================================
@ -3384,9 +3384,9 @@ void _pyLayerDistributionHypo::Flush()
//================================================================================ //================================================================================
/*! /*!
* \brief additionally to Addition2Creation, clears SetDistrType() command * \brief additionally to Addition2Creation, clears SetDistrType() command
* \param theCmd - AddHypothesis() command * \param theCmd - AddHypothesis() command
* \param theMesh - mesh to which a hypothesis is added * \param theMesh - mesh to which a hypothesis is added
* \retval bool - conversion result * \retval bool - conversion result
*/ */
//================================================================================ //================================================================================
@ -3466,9 +3466,9 @@ void _pyNumberOfSegmentsHyp::Flush()
/*! /*!
* \brief Convert the command adding "SegmentLengthAroundVertex" to mesh * \brief Convert the command adding "SegmentLengthAroundVertex" to mesh
* into regular1D.LengthNearVertex( length, vertex ) * into regular1D.LengthNearVertex( length, vertex )
* \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex ) * \param theCmd - The command like mesh.AddHypothesis( vertex, SegmentLengthAroundVertex )
* \param theMesh - The mesh needing this hypo * \param theMesh - The mesh needing this hypo
* \retval bool - false if the command can't be converted * \retval bool - false if the command can't be converted
*/ */
//================================================================================ //================================================================================
@ -3511,7 +3511,7 @@ bool _pySegmentLengthAroundVertexHyp::Addition2Creation( const Handle(_pyCommand
//================================================================================ //================================================================================
/*! /*!
* \brief _pyAlgorithm constructor * \brief _pyAlgorithm constructor
* \param theCreationCmd - The command like "algo = smeshgen.CreateHypothesis(type,lib)" * \param theCreationCmd - The command like "algo = smeshgen.CreateHypothesis(type,lib)"
*/ */
//================================================================================ //================================================================================
@ -3524,9 +3524,9 @@ _pyAlgorithm::_pyAlgorithm(const Handle(_pyCommand)& theCreationCmd)
//================================================================================ //================================================================================
/*! /*!
* \brief Convert the command adding an algorithm to mesh * \brief Convert the command adding an algorithm to mesh
* \param theCmd - The command like mesh.AddHypothesis( geom, algo ) * \param theCmd - The command like mesh.AddHypothesis( geom, algo )
* \param theMesh - The mesh needing this algo * \param theMesh - The mesh needing this algo
* \retval bool - false if the command can't be converted * \retval bool - false if the command can't be converted
*/ */
//================================================================================ //================================================================================
@ -3544,8 +3544,8 @@ bool _pyAlgorithm::Addition2Creation( const Handle(_pyCommand)& theCmd,
//================================================================================ //================================================================================
/*! /*!
* \brief Return starting position of a part of python command * \brief Return starting position of a part of python command
* \param thePartIndex - The index of command part * \param thePartIndex - The index of command part
* \retval int - Part position * \retval int - Part position
*/ */
//================================================================================ //================================================================================
@ -3562,8 +3562,8 @@ int _pyCommand::GetBegPos( int thePartIndex ) const
//================================================================================ //================================================================================
/*! /*!
* \brief Store starting position of a part of python command * \brief Store starting position of a part of python command
* \param thePartIndex - The index of command part * \param thePartIndex - The index of command part
* \param thePosition - Part position * \param thePosition - Part position
*/ */
//================================================================================ //================================================================================
@ -3578,7 +3578,7 @@ void _pyCommand::SetBegPos( int thePartIndex, int thePosition )
//================================================================================ //================================================================================
/*! /*!
* \brief Returns whitespace symbols at the line beginning * \brief Returns whitespace symbols at the line beginning
* \retval TCollection_AsciiString - result * \retval TCollection_AsciiString - result
*/ */
//================================================================================ //================================================================================
@ -3595,7 +3595,7 @@ TCollection_AsciiString _pyCommand::GetIndentation()
//================================================================================ //================================================================================
/*! /*!
* \brief Return substring of python command looking like ResultValue = Obj.Meth() * \brief Return substring of python command looking like ResultValue = Obj.Meth()
* \retval const TCollection_AsciiString & - ResultValue substring * \retval const TCollection_AsciiString & - ResultValue substring
*/ */
//================================================================================ //================================================================================
@ -3735,7 +3735,7 @@ const TCollection_AsciiString & _pyCommand::GetObject()
//================================================================================ //================================================================================
/*! /*!
* \brief Return substring of python command looking like ResVal = Obj.Method() * \brief Return substring of python command looking like ResVal = Obj.Method()
* \retval const TCollection_AsciiString & - Method substring * \retval const TCollection_AsciiString & - Method substring
*/ */
//================================================================================ //================================================================================
@ -3778,7 +3778,7 @@ bool _pyCommand::IsMethodCall()
//================================================================================ //================================================================================
/*! /*!
* \brief Return substring of python command looking like ResVal = Obj.Meth(Arg1,...) * \brief Return substring of python command looking like ResVal = Obj.Meth(Arg1,...)
* \retval const TCollection_AsciiString & - Arg<index> substring * \retval const TCollection_AsciiString & - Arg<index> substring
*/ */
//================================================================================ //================================================================================
@ -3879,8 +3879,8 @@ int _pyCommand::GetArgBeginning() const
//================================================================================ //================================================================================
/*! /*!
* \brief Check if char is a word part * \brief Check if char is a word part
* \param c - The character to check * \param c - The character to check
* \retval bool - The check result * \retval bool - The check result
*/ */
//================================================================================ //================================================================================
@ -3893,10 +3893,10 @@ static inline bool isWord(const char c, const bool dotIsWord)
//================================================================================ //================================================================================
/*! /*!
* \brief Looks for a word in the string and returns word's beginning * \brief Looks for a word in the string and returns word's beginning
* \param theString - The input string * \param theString - The input string
* \param theStartPos - The position to start the search, returning word's beginning * \param theStartPos - The position to start the search, returning word's beginning
* \param theForward - The search direction * \param theForward - The search direction
* \retval TCollection_AsciiString - The found word * \retval TCollection_AsciiString - The found word
*/ */
//================================================================================ //================================================================================
@ -4027,9 +4027,9 @@ std::list< _pyID > _pyCommand::GetStudyEntries( const TCollection_AsciiString& s
//================================================================================ //================================================================================
/*! /*!
* \brief Look for position where not space char is * \brief Look for position where not space char is
* \param theString - The string * \param theString - The string
* \param thePos - The position to search from and which returns result * \param thePos - The position to search from and which returns result
* \retval bool - false if there are only space after thePos in theString * \retval bool - false if there are only space after thePos in theString
*/ */
//================================================================================ //================================================================================
@ -4047,14 +4047,14 @@ bool _pyCommand::SkipSpaces( const TCollection_AsciiString & theString, int & th
//================================================================================ //================================================================================
/*! /*!
* \brief Modify a part of the command * \brief Modify a part of the command
* \param thePartIndex - The index of the part * \param thePartIndex - The index of the part
* \param thePart - The new part string * \param thePart - The new part string
* \param theOldPart - The old part * \param theOldPart - The old part
*/ */
//================================================================================ //================================================================================
void _pyCommand::SetPart(int thePartIndex, const TCollection_AsciiString& thePart, void _pyCommand::SetPart(int thePartIndex, const TCollection_AsciiString& thePart,
TCollection_AsciiString& theOldPart) TCollection_AsciiString& theOldPart)
{ {
int pos = GetBegPos( thePartIndex ); int pos = GetBegPos( thePartIndex );
if ( pos <= Length() && theOldPart != thePart) if ( pos <= Length() && theOldPart != thePart)
@ -4087,8 +4087,8 @@ void _pyCommand::SetPart(int thePartIndex, const TCollection_AsciiString& thePar
//================================================================================ //================================================================================
/*! /*!
* \brief Set agrument * \brief Set agrument
* \param index - The argument index, it counts from 1 * \param index - The argument index, it counts from 1
* \param theArg - The argument string * \param theArg - The argument string
*/ */
//================================================================================ //================================================================================
@ -4189,9 +4189,9 @@ bool _pyCommand::SetDependentCmdsAfter() const
//================================================================================ //================================================================================
/*! /*!
* \brief Insert accessor method after theObjectID * \brief Insert accessor method after theObjectID
* \param theObjectID - id of the accessed object * \param theObjectID - id of the accessed object
* \param theAcsMethod - name of the method giving access to the object * \param theAcsMethod - name of the method giving access to the object
* \retval bool - false if theObjectID is not found in the command string * \retval bool - false if theObjectID is not found in the command string
*/ */
//================================================================================ //================================================================================
@ -4279,7 +4279,7 @@ void _pyObject::ClearCommands()
//================================================================================ //================================================================================
/*! /*!
* \brief Return method name giving access to an interaface object wrapped by python class * \brief Return method name giving access to an interaface object wrapped by python class
* \retval const char* - method name * \retval const char* - method name
*/ */
//================================================================================ //================================================================================
@ -4411,39 +4411,39 @@ _pySubMesh::_pySubMesh(const Handle(_pyCommand)& theCreationCmd, bool toKeepAgrC
bool _pySubMesh::CanBeArgOfMethod(const _AString& theMethodName) bool _pySubMesh::CanBeArgOfMethod(const _AString& theMethodName)
{ {
return false; return false;
// // names of all methods where a sub-mesh can be used as argument // names of all methods where a sub-mesh can be used as argument
// static TStringSet methods; // static TStringSet methods;
// if ( methods.empty() ) { // if ( methods.empty() ) {
// const char * names[] = { // const char * names[] = {
// // methods of SMESH_Gen // // methods of SMESH_Gen
// "CopyMesh", // "CopyMesh",
// // methods of SMESH_Group // // methods of SMESH_Group
// "AddFrom", // "AddFrom",
// // methods of SMESH_Measurements // // methods of SMESH_Measurements
// "MinDistance", // "MinDistance",
// // methods of SMESH_Mesh // // methods of SMESH_Mesh
// "ExportPartToMED","ExportCGNS","ExportPartToDAT","ExportPartToUNV","ExportPartToSTL", // "ExportPartToMED","ExportCGNS","ExportPartToDAT","ExportPartToUNV","ExportPartToSTL",
// "RemoveSubMesh", // "RemoveSubMesh",
// // methods of SMESH_MeshEditor // // methods of SMESH_MeshEditor
// "ReorientObject","Reorient2D","TriToQuadObject","QuadToTriObject","SplitQuadObject", // "ReorientObject","Reorient2D","TriToQuadObject","QuadToTriObject","SplitQuadObject",
// "SplitVolumesIntoTetra","SmoothObject","SmoothParametricObject","ConvertFromQuadraticObject", // "SplitVolumesIntoTetra","SmoothObject","SmoothParametricObject","ConvertFromQuadraticObject",
// "RotationSweepObject","RotationSweepObjectMakeGroups","RotationSweepObject1D", // "RotationSweepObject","RotationSweepObjectMakeGroups","RotationSweepObject1D",
// "RotationSweepObject1DMakeGroups","RotationSweepObject2D","RotationSweepObject2DMakeGroups", // "RotationSweepObject1DMakeGroups","RotationSweepObject2D","RotationSweepObject2DMakeGroups",
// "ExtrusionSweepObject","ExtrusionSweepObjectMakeGroups","ExtrusionSweepObject0D", // "ExtrusionSweepObject","ExtrusionSweepObjectMakeGroups","ExtrusionSweepObject0D",
// "ExtrusionSweepObject0DMakeGroups","ExtrusionSweepObject1D","ExtrusionSweepObject2D", // "ExtrusionSweepObject0DMakeGroups","ExtrusionSweepObject1D","ExtrusionSweepObject2D",
// "ExtrusionSweepObject1DMakeGroups","ExtrusionSweepObject2DMakeGroups", // "ExtrusionSweepObject1DMakeGroups","ExtrusionSweepObject2DMakeGroups",
// "ExtrusionAlongPathObjX","ExtrusionAlongPathObject","ExtrusionAlongPathObjectMakeGroups", // "ExtrusionAlongPathObjX","ExtrusionAlongPathObject","ExtrusionAlongPathObjectMakeGroups",
// "ExtrusionAlongPathObject1D","ExtrusionAlongPathObject1DMakeGroups", // "ExtrusionAlongPathObject1D","ExtrusionAlongPathObject1DMakeGroups",
// "ExtrusionAlongPathObject2D","ExtrusionAlongPathObject2DMakeGroups","MirrorObject", // "ExtrusionAlongPathObject2D","ExtrusionAlongPathObject2DMakeGroups","MirrorObject",
// "MirrorObjectMakeGroups","MirrorObjectMakeMesh","TranslateObject","Scale", // "MirrorObjectMakeGroups","MirrorObjectMakeMesh","TranslateObject","Scale",
// "TranslateObjectMakeGroups","TranslateObjectMakeMesh","ScaleMakeGroups","ScaleMakeMesh", // "TranslateObjectMakeGroups","TranslateObjectMakeMesh","ScaleMakeGroups","ScaleMakeMesh",
// "RotateObject","RotateObjectMakeGroups","RotateObjectMakeMesh","FindCoincidentNodesOnPart", // "RotateObject","RotateObjectMakeGroups","RotateObjectMakeMesh","FindCoincidentNodesOnPart",
// "FindCoincidentNodesOnPartBut","FindEqualElements","FindAmongElementsByPoint", // "FindCoincidentNodesOnPartBut","FindEqualElements","FindAmongElementsByPoint",
// "MakeBoundaryMesh","Create0DElementsOnAllNodes", // "MakeBoundaryMesh","Create0DElementsOnAllNodes",
// "" }; // <- mark of end // "" }; // <- mark of end
// methods.Insert( names ); // methods.Insert( names );
// } // }
// return methods.Contains( theMethodName ); // return methods.Contains( theMethodName );
} }
//================================================================================ //================================================================================
@ -4510,13 +4510,13 @@ _pyGroup::_pyGroup(const Handle(_pyCommand)& theCreationCmd, const _pyID & id)
//} //}
//else { //else {
// ------------------------->>>>> GroupOnGeom( geom, name, typ ) // ------------------------->>>>> GroupOnGeom( geom, name, typ )
_pyID type = theCreationCmd->GetArg( 1 ); _pyID type = theCreationCmd->GetArg( 1 );
_pyID name = theCreationCmd->GetArg( 2 ); _pyID name = theCreationCmd->GetArg( 2 );
theCreationCmd->SetMethod( "GroupOnGeom" ); theCreationCmd->SetMethod( "GroupOnGeom" );
theCreationCmd->RemoveArgs(); theCreationCmd->RemoveArgs();
theCreationCmd->SetArg( 1, geom ); theCreationCmd->SetArg( 1, geom );
theCreationCmd->SetArg( 2, name ); theCreationCmd->SetArg( 2, name );
theCreationCmd->SetArg( 3, type ); theCreationCmd->SetArg( 3, type );
//} //}
} }
else if ( method == "CreateGroupFromFilter" ) else if ( method == "CreateGroupFromFilter" )

4
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -3489,7 +3489,7 @@ static inline LDOMString toString( CORBA::Long theType )
case FT_LogicalOR : return "Or"; case FT_LogicalOR : return "Or";
case FT_GroupColor : return "Color of Group"; case FT_GroupColor : return "Color of Group";
case FT_LinearOrQuadratic : return "Linear or Quadratic"; case FT_LinearOrQuadratic : return "Linear or Quadratic";
case FT_ElemGeomType : return "Element geomtry type"; case FT_ElemGeomType : return "Element geometry type";
case FT_EntityType : return "Entity type"; case FT_EntityType : return "Entity type";
case FT_Undefined : return ""; case FT_Undefined : return "";
default : return ""; default : return "";
@ -3544,7 +3544,7 @@ static inline SMESH::FunctorType toFunctorType( const LDOMString& theStr )
else if ( theStr.equals( "Or" ) ) return FT_LogicalOR; else if ( theStr.equals( "Or" ) ) return FT_LogicalOR;
else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor; else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor;
else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic; else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic;
else if ( theStr.equals( "Element geomtry type" ) ) return FT_ElemGeomType; else if ( theStr.equals( "Element geometry type" ) ) return FT_ElemGeomType;
else if ( theStr.equals( "Entity type" ) ) return FT_EntityType; else if ( theStr.equals( "Entity type" ) ) return FT_EntityType;
else if ( theStr.equals( "" ) ) return FT_Undefined; else if ( theStr.equals( "" ) ) return FT_Undefined;
else return FT_Undefined; else return FT_Undefined;

4
src/SMESH_SWIG/smeshBuilder.py
View File

@ -3249,7 +3249,7 @@ class Mesh:
# Type SMESH.FunctorType._items in the Python Console to see all items. # Type SMESH.FunctorType._items in the Python Console to see all items.
# Note that not all items correspond to numerical functors. # Note that not all items correspond to numerical functors.
# @param MaxAngle is the maximum angle between element normals at which the fusion # @param MaxAngle is the maximum angle between element normals at which the fusion
# is still performed; theMaxAngle is mesured in radians. # is still performed; theMaxAngle is measured in radians.
# Also it could be a name of variable which defines angle in degrees. # Also it could be a name of variable which defines angle in degrees.
# @return TRUE in case of success, FALSE otherwise. # @return TRUE in case of success, FALSE otherwise.
# @ingroup l2_modif_unitetri # @ingroup l2_modif_unitetri
@ -3268,7 +3268,7 @@ class Mesh:
# Type SMESH.FunctorType._items in the Python Console to see all items. # Type SMESH.FunctorType._items in the Python Console to see all items.
# Note that not all items correspond to numerical functors. # Note that not all items correspond to numerical functors.
# @param MaxAngle a max angle between element normals at which the fusion # @param MaxAngle a max angle between element normals at which the fusion
# is still performed; theMaxAngle is mesured in radians. # is still performed; theMaxAngle is measured in radians.
# @return TRUE in case of success, FALSE otherwise. # @return TRUE in case of success, FALSE otherwise.
# @ingroup l2_modif_unitetri # @ingroup l2_modif_unitetri
def TriToQuadObject (self, theObject, theCriterion, MaxAngle): def TriToQuadObject (self, theObject, theCriterion, MaxAngle):

2
src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx
View File

@ -588,7 +588,7 @@ namespace
const SMDS_MeshElement* cornerQuad, const SMDS_MeshElement* cornerQuad,
const SMDS_MeshNode* nCorner) const SMDS_MeshNode* nCorner)
{ {
// Find out size of block side mesured in nodes and by the way find two rows // Find out size of block side measured in nodes and by the way find two rows
// of nodes in two directions. // of nodes in two directions.
int x, y, nbX, nbY; int x, y, nbX, nbY;

4
src/Tools/MacMesh/MacMesh/PublishGroups.py
View File

@ -97,7 +97,7 @@ def Publish (ObjToPublish):
def RevolveMesh(MainMesh,**args): def RevolveMesh(MainMesh,**args):
""" """
This function premits to revolute and scale a 2D mesh while transforming the edge This function permits to revolute and scale a 2D mesh while transforming the edge
groups into face groups. Moreover, the function automatically creates the face groups groups into face groups. Moreover, the function automatically creates the face groups
corresponding to the symmetry lower and upper faces corresponding to the symmetry lower and upper faces
Facultatif arguments are : Facultatif arguments are :
@ -171,7 +171,7 @@ def RevolveMesh(MainMesh,**args):
def ExtrudeMesh(MainMesh,**args): def ExtrudeMesh(MainMesh,**args):
""" """
This function premits to extrude and scale a 2D mesh while transforming the edge This function permits to extrude and scale a 2D mesh while transforming the edge
groups into face groups. Moreover, the function automatically creates the face groups groups into face groups. Moreover, the function automatically creates the face groups
corresponding to the symmetry lower and upper faces corresponding to the symmetry lower and upper faces
Facultatif arguments are : Facultatif arguments are :

2
src/Tools/MeshCut/MeshCut_Maillage.cxx
View File

@ -324,7 +324,7 @@ void Maillage::inputMED(std::string fichierMED)
// Lecture des infos concernant le premier maillage // Lecture des infos concernant le premier maillage
if (MEDmeshInfo(fid, 1, maa, &spacedim, &mdim, &type, desc, dtunit, &sortingtype, &nPasTemps, &axistype, axisname, if (MEDmeshInfo(fid, 1, maa, &spacedim, &mdim, &type, desc, dtunit, &sortingtype, &nPasTemps, &axistype, axisname,
unitname) < 0) unitname) < 0)
ERREUR("Error while reading mesh informations "); ERREUR("Error while reading mesh information ");
//cout << chrono() << " --- inputMED: MEDmeshInfo: OK" << endl; //cout << chrono() << " --- inputMED: MEDmeshInfo: OK" << endl;
// cerr << "maa=" << maa << endl; // cerr << "maa=" << maa << endl;

2
src/Tools/YamsPlug/doc/Generics_params.rst
View File

@ -15,7 +15,7 @@ You usually don't have to set this parameter but you can choose to limit the amo
- **File** - **File**
You can change the file used to store remeshing hypotheses, see :ref:`hypothesis-label` for further informations. You can change the file used to store remeshing hypotheses, see :ref:`hypothesis-label` for further information.
.. image:: images/Generic.png .. image:: images/Generic.png
:align: center :align: center