Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
23304: [EDF 10304] Radial Quadrangle on ellipse
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_MeshEditor_i.cxx
diff --git
a/src/SMESH_I/SMESH_MeshEditor_i.cxx
b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 0b927273c4ada665a02e6ea1013ad3285fcf220a..cecee4596fdb7606e3157d3d4213634293cb5757 100644
(file)
--- a/
src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/
src/SMESH_I/SMESH_MeshEditor_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-285,13
+285,13
@@
namespace MeshEditor_I {
SMDS_MeshElement::Filter & filter = *aFilter;
if ( aType == SMDSAbs_Node )
SMDS_MeshElement::Filter & filter = *aFilter;
if ( aType == SMDSAbs_Node )
- for (
int i=0; i<IDs.length(); i++
) {
+ for (
CORBA::ULong i = 0; i < IDs.length(); i++
) {
const SMDS_MeshElement * elem = aMesh->FindNode( IDs[i] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
}
else
const SMDS_MeshElement * elem = aMesh->FindNode( IDs[i] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
}
else
- for (
int i=
0; i<IDs.length(); i++) {
+ for (
CORBA::ULong i =
0; i<IDs.length(); i++) {
const SMDS_MeshElement * elem = aMesh->FindElement( IDs[i] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
const SMDS_MeshElement * elem = aMesh->FindElement( IDs[i] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
@@
-315,7
+315,7
@@
namespace MeshEditor_I {
SMESH::long_array_var aElementsId = theObject->GetIDs();
if ( types->length() == 1 && types[0] == SMESH::NODE)
{
SMESH::long_array_var aElementsId = theObject->GetIDs();
if ( types->length() == 1 && types[0] == SMESH::NODE)
{
- for
(int i = 0; i < aElementsId->length(); i++
)
+ for
( CORBA::ULong i = 0; i < aElementsId->length(); i++
)
if ( const SMDS_MeshNode * n = theMeshDS->FindNode( aElementsId[i] ))
theNodeSet.insert( theNodeSet.end(), n);
}
if ( const SMDS_MeshNode * n = theMeshDS->FindNode( aElementsId[i] ))
theNodeSet.insert( theNodeSet.end(), n);
}
@@
-323,13
+323,13
@@
namespace MeshEditor_I {
{
SMDS_NodeIteratorPtr nIt = theMeshDS->nodesIterator();
while ( nIt->more( ))
{
SMDS_NodeIteratorPtr nIt = theMeshDS->nodesIterator();
while ( nIt->more( ))
- if( const SMDS_MeshElement * elem = nIt->next() )
+ if
( const SMDS_MeshElement * elem = nIt->next() )
theNodeSet.insert( elem->begin_nodes(), elem->end_nodes());
}
else
{
theNodeSet.insert( elem->begin_nodes(), elem->end_nodes());
}
else
{
- for
(int i = 0; i < aElementsId->length(); i++
)
- if( const SMDS_MeshElement * elem = theMeshDS->FindElement( aElementsId[i] ))
+ for
( CORBA::ULong i = 0; i < aElementsId->length(); i++
)
+ if
( const SMDS_MeshElement * elem = theMeshDS->FindElement( aElementsId[i] ))
theNodeSet.insert( elem->begin_nodes(), elem->end_nodes());
}
}
theNodeSet.insert( elem->begin_nodes(), elem->end_nodes());
}
}
@@
-349,7
+349,7
@@
namespace MeshEditor_I {
SMDSAbs_ElementType elemType = (*theElements.begin())->GetType();
bool sameElemType = ( elemType == (*theElements.rbegin())->GetType() );
if ( sameElemType &&
SMDSAbs_ElementType elemType = (*theElements.begin())->GetType();
bool sameElemType = ( elemType == (*theElements.rbegin())->GetType() );
if ( sameElemType &&
- theMeshDS->GetMeshInfo().NbElements( elemType ) == theElements.size() )
+ theMeshDS->GetMeshInfo().NbElements( elemType ) ==
(int)
theElements.size() )
return; // all the elements are in theElements
if ( !sameElemType )
return; // all the elements are in theElements
if ( !sameElemType )
@@
-794,7
+794,7
@@
SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements)
list< int > IdList;
list< int > IdList;
- for (
int i = 0; i < IDsOfElements.length(); i++
)
+ for (
CORBA::ULong i = 0; i < IDsOfElements.length(); i++
)
IdList.push_back( IDsOfElements[i] );
// Update Python script
IdList.push_back( IDsOfElements[i] );
// Update Python script
@@
-823,7
+823,7
@@
CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNo
initData();
list< int > IdList;
initData();
list< int > IdList;
- for (
int
i = 0; i < IDsOfNodes.length(); i++)
+ for (
CORBA::ULong
i = 0; i < IDsOfNodes.length(); i++)
IdList.push_back( IDsOfNodes[i] );
// Update Python script
IdList.push_back( IDsOfNodes[i] );
// Update Python script
@@
-859,9
+859,7
@@
CORBA::Long SMESH_MeshEditor_i::RemoveOrphanNodes()
SMESH::Controls::Filter::GetElementsId( getMeshDS(), predicate, seq );
// remove orphan nodes (if there are any)
SMESH::Controls::Filter::GetElementsId( getMeshDS(), predicate, seq );
// remove orphan nodes (if there are any)
- list< int > IdList;
- for ( int i = 0; i < seq.size(); i++ )
- IdList.push_back( seq[i] );
+ list< int > IdList( seq.begin(), seq.end() );
int nbNodesBefore = myMesh->NbNodes();
getEditor().Remove( IdList, true );
int nbNodesBefore = myMesh->NbNodes();
getEditor().Remove( IdList, true );
@@
-1584,7
+1582,7
@@
CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme
SMESH_TRY;
initData();
SMESH_TRY;
initData();
- for (
int i = 0; i < IDsOfElements.length(); i++
)
+ for (
CORBA::ULong i = 0; i < IDsOfElements.length(); i++
)
{
CORBA::Long index = IDsOfElements[i];
const SMDS_MeshElement * elem = getMeshDS()->FindElement(index);
{
CORBA::Long index = IDsOfElements[i];
const SMDS_MeshElement * elem = getMeshDS()->FindElement(index);
@@
-2273,7
+2271,7
@@
SMESH_MeshEditor_i::smooth(const SMESH::long_array & IDsOfElements,
arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face);
set<const SMDS_MeshNode*> fixedNodes;
arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face);
set<const SMDS_MeshNode*> fixedNodes;
- for (
int
i = 0; i < IDsOfFixedNodes.length(); i++) {
+ for (
CORBA::ULong
i = 0; i < IDsOfFixedNodes.length(); i++) {
CORBA::Long index = IDsOfFixedNodes[i];
const SMDS_MeshNode * node = aMesh->FindNode(index);
if ( node )
CORBA::Long index = IDsOfFixedNodes[i];
const SMDS_MeshNode * node = aMesh->FindNode(index);
if ( node )
@@
-2866,7
+2864,7
@@
SMESH_MeshEditor_i::ExtrusionAlongPathObjects(const SMESH::ListOfIDSources & the
idSourceToSet( theFaces[i], getMeshDS(), elemsNodes[0], SMDSAbs_Face );
list<double> angles;
idSourceToSet( theFaces[i], getMeshDS(), elemsNodes[0], SMDSAbs_Face );
list<double> angles;
- for (
int i = 0; i < theAngles.length(); i++
) {
+ for (
CORBA::ULong i = 0; i < theAngles.length(); i++
) {
angles.push_back( theAngles[i] );
}
angles.push_back( theAngles[i] );
}
@@
-4091,7
+4089,7
@@
FindCoincidentNodesOnPartBut(SMESH::SMESH_IDSource_ptr theObject,
TIDSortedNodeSet nodes;
idSourceToNodeSet( theObject, getMeshDS(), nodes );
TIDSortedNodeSet nodes;
idSourceToNodeSet( theObject, getMeshDS(), nodes );
- for (
int
i = 0; i < theExceptSubMeshOrGroups.length(); ++i )
+ for (
CORBA::ULong
i = 0; i < theExceptSubMeshOrGroups.length(); ++i )
{
SMDS_ElemIteratorPtr nodeIt = myMesh_i->GetElements( theExceptSubMeshOrGroups[i],
SMESH::NODE );
{
SMDS_ElemIteratorPtr nodeIt = myMesh_i->GetElements( theExceptSubMeshOrGroups[i],
SMESH::NODE );
@@
-4127,7
+4125,7
@@
void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfN
aTPythonDump << this << ".MergeNodes([";
TIDSortedNodeSet setOfNodesToKeep;
aTPythonDump << this << ".MergeNodes([";
TIDSortedNodeSet setOfNodesToKeep;
- for (
int
i = 0; i < NodesToKeep.length(); ++i )
+ for (
CORBA::ULong
i = 0; i < NodesToKeep.length(); ++i )
{
prepareIdSource( NodesToKeep[i] );
SMDS_ElemIteratorPtr nodeIt = myMesh_i->GetElements( NodesToKeep[i], SMESH::NODE );
{
prepareIdSource( NodesToKeep[i] );
SMDS_ElemIteratorPtr nodeIt = myMesh_i->GetElements( NodesToKeep[i], SMESH::NODE );
@@
-4136,12
+4134,12
@@
void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfN
}
::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes;
}
::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes;
- for (
int i = 0; i < GroupsOfNodes.length(); i++
)
+ for (
CORBA::ULong i = 0; i < GroupsOfNodes.length(); i++
)
{
const SMESH::long_array& aNodeGroup = GroupsOfNodes[ i ];
aListOfListOfNodes.push_back( list< const SMDS_MeshNode* >() );
list< const SMDS_MeshNode* >& aListOfNodes = aListOfListOfNodes.back();
{
const SMESH::long_array& aNodeGroup = GroupsOfNodes[ i ];
aListOfListOfNodes.push_back( list< const SMDS_MeshNode* >() );
list< const SMDS_MeshNode* >& aListOfNodes = aListOfListOfNodes.back();
- for (
int
j = 0; j < aNodeGroup.length(); j++ )
+ for (
CORBA::ULong
j = 0; j < aNodeGroup.length(); j++ )
{
CORBA::Long index = aNodeGroup[ j ];
if ( const SMDS_MeshNode * node = aMesh->FindNode( index ))
{
CORBA::Long index = aNodeGroup[ j ];
if ( const SMDS_MeshNode * node = aMesh->FindNode( index ))
@@
-4227,11
+4225,11
@@
void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& GroupsO
::SMESH_MeshEditor::TListOfListOfElementsID aListOfListOfElementsID;
::SMESH_MeshEditor::TListOfListOfElementsID aListOfListOfElementsID;
- for (
int i = 0; i < GroupsOfElementsID.length(); i++
) {
+ for (
CORBA::ULong i = 0; i < GroupsOfElementsID.length(); i++
) {
const SMESH::long_array& anElemsIDGroup = GroupsOfElementsID[ i ];
aListOfListOfElementsID.push_back( list< int >() );
list< int >& aListOfElemsID = aListOfListOfElementsID.back();
const SMESH::long_array& anElemsIDGroup = GroupsOfElementsID[ i ];
aListOfListOfElementsID.push_back( list< int >() );
list< int >& aListOfElemsID = aListOfListOfElementsID.back();
- for (
int
j = 0; j < anElemsIDGroup.length(); j++ ) {
+ for (
CORBA::ULong
j = 0; j < anElemsIDGroup.length(); j++ ) {
CORBA::Long id = anElemsIDGroup[ j ];
aListOfElemsID.push_back( id );
}
CORBA::Long id = anElemsIDGroup[ j ];
aListOfElemsID.push_back( id );
}
@@
-4456,7
+4454,7
@@
SMESH::long_array* SMESH_MeshEditor_i::FindElementsByPoint(CORBA::Double x,
SMDSAbs_ElementType( type ),
foundElems);
res->length( foundElems.size() );
SMDSAbs_ElementType( type ),
foundElems);
res->length( foundElems.size() );
- for (
in
t i = 0; i < foundElems.size(); ++i )
+ for (
size_
t i = 0; i < foundElems.size(); ++i )
res[i] = foundElems[i]->GetID();
return res._retn();
res[i] = foundElems[i]->GetID();
return res._retn();
@@
-4482,13
+4480,15
@@
SMESH_MeshEditor_i::FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elementID
{
SMESH_TRY;
SMESH::long_array_var res = new SMESH::long_array;
{
SMESH_TRY;
SMESH::long_array_var res = new SMESH::long_array;
-
- SMESH::array_of_ElementType_var types = elementIDs->GetTypes();
- if ( types->length() == 1 && // a part contains only nodes or 0D elements
- ( types[0] == SMESH::NODE || types[0] == SMESH::ELEM0D || types[0] == SMESH::BALL) &&
- type != types[0] ) // but search of elements of dim > 0
- return res._retn();
+ if ( type != SMESH::NODE )
+ {
+ SMESH::array_of_ElementType_var types = elementIDs->GetTypes();
+ if ( types->length() == 1 && // a part contains only nodes or 0D elements
+ ( types[0] == SMESH::NODE || types[0] == SMESH::ELEM0D || types[0] == SMESH::BALL) &&
+ type != types[0] ) // but search of elements of dim > 0
+ return res._retn();
+ }
if ( SMESH::DownCast<SMESH_Mesh_i*>( elementIDs )) // elementIDs is the whole mesh
return FindElementsByPoint( x,y,z, type );
if ( SMESH::DownCast<SMESH_Mesh_i*>( elementIDs )) // elementIDs is the whole mesh
return FindElementsByPoint( x,y,z, type );
@@
-4502,7
+4502,8
@@
SMESH_MeshEditor_i::FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elementID
SMESHDS_Mesh* meshDS = SMESH::DownCast<SMESH_Mesh_i*>( mesh )->GetImpl().GetMeshDS();
if ( !idSourceToSet( elementIDs, meshDS, elements,
SMESHDS_Mesh* meshDS = SMESH::DownCast<SMESH_Mesh_i*>( mesh )->GetImpl().GetMeshDS();
if ( !idSourceToSet( elementIDs, meshDS, elements,
- SMDSAbs_ElementType(type), /*emptyIfIsMesh=*/true))
+ ( type == SMESH::NODE ? SMDSAbs_All : (SMDSAbs_ElementType) type ),
+ /*emptyIfIsMesh=*/true))
return res._retn();
typedef SMDS_SetIterator<const SMDS_MeshElement*, TIDSortedElemSet::const_iterator > TIter;
return res._retn();
typedef SMDS_SetIterator<const SMDS_MeshElement*, TIDSortedElemSet::const_iterator > TIter;
@@
-4517,7
+4518,7
@@
SMESH_MeshEditor_i::FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elementID
SMDSAbs_ElementType( type ),
foundElems);
res->length( foundElems.size() );
SMDSAbs_ElementType( type ),
foundElems);
res->length( foundElems.size() );
- for (
in
t i = 0; i < foundElems.size(); ++i )
+ for (
size_
t i = 0; i < foundElems.size(); ++i )
res[i] = foundElems[i]->GetID();
return res._retn();
res[i] = foundElems[i]->GetID();
return res._retn();
@@
-4568,6
+4569,7
@@
static SMESH::SMESH_MeshEditor::Sew_Error convError( const::SMESH_MeshEditor::Se
RETCASE( SEW_TOPO_DIFF_SETS_OF_ELEMENTS );
RETCASE( SEW_BAD_SIDE1_NODES );
RETCASE( SEW_BAD_SIDE2_NODES );
RETCASE( SEW_TOPO_DIFF_SETS_OF_ELEMENTS );
RETCASE( SEW_BAD_SIDE1_NODES );
RETCASE( SEW_BAD_SIDE2_NODES );
+ RETCASE( SEW_INTERNAL_ERROR );
}
return SMESH::SMESH_MeshEditor::SEW_OK;
}
}
return SMESH::SMESH_MeshEditor::SEW_OK;
}
@@
-4651,16
+4653,16
@@
SewCoincidentFreeBorders(const SMESH::CoincidentFreeBorders& freeBorders,
for ( CORBA::ULong iP = 0; iP < aGRP.length(); ++iP )
{
const SMESH::FreeBorderPart& aPART = aGRP[ iP ];
for ( CORBA::ULong iP = 0; iP < aGRP.length(); ++iP )
{
const SMESH::FreeBorderPart& aPART = aGRP[ iP ];
- if ( aPART.border < 0 || aPART.border >= freeBorders.borders.length() )
+ if ( aPART.border < 0 || aPART.border >=
(int)
freeBorders.borders.length() )
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::border index", SALOME::BAD_PARAM);
const SMESH::FreeBorder& aBRD = freeBorders.borders[ aPART.border ];
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::border index", SALOME::BAD_PARAM);
const SMESH::FreeBorder& aBRD = freeBorders.borders[ aPART.border ];
- if ( aPART.node1 < 0 || aPART.node1 > aBRD.nodeIDs.length() )
+ if ( aPART.node1 < 0 || aPART.node1 >
(int)
aBRD.nodeIDs.length() )
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::node1", SALOME::BAD_PARAM);
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::node1", SALOME::BAD_PARAM);
- if ( aPART.node2 < 0 || aPART.node2 > aBRD.nodeIDs.length() )
+ if ( aPART.node2 < 0 || aPART.node2 >
(int)
aBRD.nodeIDs.length() )
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::node2", SALOME::BAD_PARAM);
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::node2", SALOME::BAD_PARAM);
- if ( aPART.nodeLast < 0 || aPART.nodeLast > aBRD.nodeIDs.length() )
+ if ( aPART.nodeLast < 0 || aPART.nodeLast >
(int)
aBRD.nodeIDs.length() )
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::nodeLast", SALOME::BAD_PARAM);
// do not keep these nodes for further sewing as nodes can be removed by the sewing
THROW_SALOME_CORBA_EXCEPTION("Invalid FreeBorderPart::nodeLast", SALOME::BAD_PARAM);
// do not keep these nodes for further sewing as nodes can be removed by the sewing
@@
-5250,10
+5252,10
@@
void SMESH_MeshEditor_i::dumpGroupsList(TPythonDump & theDumpPytho
*/
//================================================================================
*/
//================================================================================
-st
ring SMESH_MeshEditor_i::generateGroupName(const
string& thePrefix)
+st
d::string SMESH_MeshEditor_i::generateGroupName(const std::
string& thePrefix)
{
SMESH::ListOfGroups_var groups = myMesh_i->GetGroups();
{
SMESH::ListOfGroups_var groups = myMesh_i->GetGroups();
- set<string> groupNames;
+ set<st
d::st
ring> groupNames;
// Get existing group names
for (int i = 0, nbGroups = groups->length(); i < nbGroups; i++ ) {
// Get existing group names
for (int i = 0, nbGroups = groups->length(); i < nbGroups; i++ ) {
@@
-5266,7
+5268,7
@@
string SMESH_MeshEditor_i::generateGroupName(const string& thePrefix)
}
// Find new name
}
// Find new name
- string name = thePrefix;
+ st
d::st
ring name = thePrefix;
int index = 0;
while (!groupNames.insert(name).second)
int index = 0;
while (!groupNames.insert(name).second)
@@
-5305,7
+5307,7
@@
bool SMESH_MeshEditor_i::idSourceToSet(SMESH::SMESH_IDSource_ptr theIDSource,
{
if ( error ) *error = IDSource_OK;
{
if ( error ) *error = IDSource_OK;
- if ( CORBA::is_nil( theIDSource )
)
+ if ( CORBA::is_nil( theIDSource ))
{
if ( error ) *error = IDSource_INVALID;
return false;
{
if ( error ) *error = IDSource_INVALID;
return false;
@@
-5574,8
+5576,8
@@
SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes,
// Create group with newly created nodes
SMESH::long_array_var anIds = GetLastCreatedNodes();
if (anIds->length() > 0) {
// Create group with newly created nodes
SMESH::long_array_var anIds = GetLastCreatedNodes();
if (anIds->length() > 0) {
- string anUnindexedName (theNodes->GetName());
- string aNewName = generateGroupName(anUnindexedName + "_double");
+ st
d::st
ring anUnindexedName (theNodes->GetName());
+ st
d::st
ring aNewName = generateGroupName(anUnindexedName + "_double");
aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str());
aNewGroup->Add(anIds);
pyDump << aNewGroup << " = ";
aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str());
aNewGroup->Add(anIds);
pyDump << aNewGroup << " = ";
@@
-5673,8
+5675,8
@@
SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes,
// Create group with newly created nodes
SMESH::long_array_var anIds = GetLastCreatedNodes();
if (anIds->length() > 0) {
// Create group with newly created nodes
SMESH::long_array_var anIds = GetLastCreatedNodes();
if (anIds->length() > 0) {
- string anUnindexedName (theNodes[0]->GetName());
- string aNewName = generateGroupName(anUnindexedName + "_double");
+ st
d::st
ring anUnindexedName (theNodes[0]->GetName());
+ st
d::st
ring aNewName = generateGroupName(anUnindexedName + "_double");
aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str());
aNewGroup->Add(anIds);
pyDump << aNewGroup << " = ";
aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str());
aNewGroup->Add(anIds);
pyDump << aNewGroup << " = ";
@@
-5898,7
+5900,7
@@
SMESH_MeshEditor_i::DoubleNodeElemGroup2New(SMESH::SMESH_GroupBase_ptr theElems,
{
// Create group with newly created elements
CORBA::String_var elemGroupName = theElems->GetName();
{
// Create group with newly created elements
CORBA::String_var elemGroupName = theElems->GetName();
- st
ring aNewName = generateGroupName(
string(elemGroupName.in()) + "_double");
+ st
d::string aNewName = generateGroupName( std::
string(elemGroupName.in()) + "_double");
if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded )
{
SMESH::long_array_var anIds = GetLastCreatedElems();
if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded )
{
SMESH::long_array_var anIds = GetLastCreatedElems();
@@
-6130,7
+6132,7
@@
SMESH_MeshEditor_i::DoubleNodeElemGroups2New(const SMESH::ListOfGroups& theElems
{
// Create group with newly created elements
CORBA::String_var elemGroupName = theElems[0]->GetName();
{
// Create group with newly created elements
CORBA::String_var elemGroupName = theElems[0]->GetName();
- st
ring aNewName = generateGroupName(
string(elemGroupName.in()) + "_double");
+ st
d::string aNewName = generateGroupName( std::
string(elemGroupName.in()) + "_double");
if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded )
{
SMESH::long_array_var anIds = GetLastCreatedElems();
if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded )
{
SMESH::long_array_var anIds = GetLastCreatedElems();
@@
-6500,7
+6502,7
@@
void SMESH_MeshEditor_i::CreateHoleSkin(CORBA::Double radius,
theNodeSearcher = SMESH_MeshAlgos::GetNodeSearcher( *getMeshDS() );
vector<double> nodesCoords;
theNodeSearcher = SMESH_MeshAlgos::GetNodeSearcher( *getMeshDS() );
vector<double> nodesCoords;
- for (
int
i = 0; i < theNodesCoords.length(); i++)
+ for (
CORBA::ULong
i = 0; i < theNodesCoords.length(); i++)
{
nodesCoords.push_back( theNodesCoords[i] );
}
{
nodesCoords.push_back( theNodesCoords[i] );
}
@@
-6666,7
+6668,7
@@
CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim,
groupsOfThisMesh ->length( groups.length() );
groupsOfOtherMesh->length( groups.length() );
int nbGroups = 0, nbGroupsOfOtherMesh = 0;
groupsOfThisMesh ->length( groups.length() );
groupsOfOtherMesh->length( groups.length() );
int nbGroups = 0, nbGroupsOfOtherMesh = 0;
- for (
int
i = 0; i < groups.length(); ++i )
+ for (
CORBA::ULong
i = 0; i < groups.length(); ++i )
{
SMESH::SMESH_Mesh_var m = groups[i]->GetMesh();
if ( myMesh_i != SMESH::DownCast<SMESH_Mesh_i*>( m ))
{
SMESH::SMESH_Mesh_var m = groups[i]->GetMesh();
if ( myMesh_i != SMESH::DownCast<SMESH_Mesh_i*>( m ))