mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-03-16 03:41:27 +05:00
Replace ::smIdType by SMESH::smIdType
Fix compilation errors in SMESH_Filter_i.cxx on Debian-8 Fix warnings in SMEHS_MeshEditor_i.cxx
This commit is contained in:
parent
93a9239ed3
commit
21c4d15f62
@ -1226,7 +1226,7 @@ namespace
|
|||||||
SMESH::Controls::NumericalFunctor* aNumFun =
|
SMESH::Controls::NumericalFunctor* aNumFun =
|
||||||
dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
|
dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
|
||||||
if ( aNumFun ) {
|
if ( aNumFun ) {
|
||||||
std::vector<::smIdType> elements;
|
std::vector<SMESH::smIdType> elements;
|
||||||
SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
|
SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
|
||||||
if ( mesh->_is_nil() ) {
|
if ( mesh->_is_nil() ) {
|
||||||
SMESH::SMESH_IDSource_var idSource =
|
SMESH::SMESH_IDSource_var idSource =
|
||||||
|
@ -4200,7 +4200,7 @@ namespace SMESH {
|
|||||||
*/
|
*/
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
|
||||||
const char* SMESH::FunctorTypeToString(SMESH::FunctorType ft)
|
const char* FunctorTypeToString(FunctorType ft)
|
||||||
{
|
{
|
||||||
if ( ft < 0 || ft > SMESH::FT_Undefined )
|
if ( ft < 0 || ft > SMESH::FT_Undefined )
|
||||||
return "FT_Undefined";
|
return "FT_Undefined";
|
||||||
@ -4213,7 +4213,7 @@ namespace SMESH {
|
|||||||
*/
|
*/
|
||||||
//================================================================================
|
//================================================================================
|
||||||
|
|
||||||
SMESH::FunctorType SMESH::StringToFunctorType(const char* str)
|
FunctorType StringToFunctorType(const char* str)
|
||||||
{
|
{
|
||||||
std::string name( str + 3 ); // skip "FT_"
|
std::string name( str + 3 ); // skip "FT_"
|
||||||
const char** functNames = getFunctNames();
|
const char** functNames = getFunctNames();
|
||||||
|
@ -279,13 +279,13 @@ namespace MeshEditor_I {
|
|||||||
SMDS_MeshElement::Filter & filter = *aFilter;
|
SMDS_MeshElement::Filter & filter = *aFilter;
|
||||||
|
|
||||||
if ( aType == SMDSAbs_Node )
|
if ( aType == SMDSAbs_Node )
|
||||||
for ( SMESH::smIdType i = 0; i < IDs.length(); i++ ) {
|
for ( CORBA::ULong i = 0; i < IDs.length(); i++ ) {
|
||||||
const SMDS_MeshElement * elem = aMesh->FindNode( IDs[i] );
|
const SMDS_MeshElement * elem = aMesh->FindNode( IDs[i] );
|
||||||
if ( filter( elem ))
|
if ( filter( elem ))
|
||||||
aMap.insert( aMap.end(), elem );
|
aMap.insert( aMap.end(), elem );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for ( SMESH::smIdType i = 0; i<IDs.length(); i++) {
|
for ( CORBA::ULong i = 0; i<IDs.length(); i++) {
|
||||||
const SMDS_MeshElement * elem = aMesh->FindElement( IDs[i] );
|
const SMDS_MeshElement * elem = aMesh->FindElement( IDs[i] );
|
||||||
if ( filter( elem ))
|
if ( filter( elem ))
|
||||||
aMap.insert( aMap.end(), elem );
|
aMap.insert( aMap.end(), elem );
|
||||||
@ -789,7 +789,7 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::smIdType_array & IDsOfElements)
|
|||||||
|
|
||||||
list< smIdType > IdList;
|
list< smIdType > IdList;
|
||||||
|
|
||||||
for ( SMESH::smIdType i = 0; i < IDsOfElements.length(); i++ )
|
for ( CORBA::ULong i = 0; i < IDsOfElements.length(); i++ )
|
||||||
IdList.push_back( IDsOfElements[i] );
|
IdList.push_back( IDsOfElements[i] );
|
||||||
|
|
||||||
// Update Python script
|
// Update Python script
|
||||||
@ -817,7 +817,7 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::smIdType_array & IDs
|
|||||||
initData();
|
initData();
|
||||||
|
|
||||||
list< smIdType > IdList;
|
list< smIdType > IdList;
|
||||||
for ( SMESH::smIdType i = 0; i < IDsOfNodes.length(); i++)
|
for ( CORBA::ULong i = 0; i < IDsOfNodes.length(); i++)
|
||||||
IdList.push_back( IDsOfNodes[i] );
|
IdList.push_back( IDsOfNodes[i] );
|
||||||
|
|
||||||
// Update Python script
|
// Update Python script
|
||||||
@ -1578,7 +1578,7 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::smIdType_array & IDsOfE
|
|||||||
SMESH_TRY;
|
SMESH_TRY;
|
||||||
initData();
|
initData();
|
||||||
|
|
||||||
for ( SMESH::smIdType i = 0; i < IDsOfElements.length(); i++ )
|
for ( CORBA::ULong i = 0; i < IDsOfElements.length(); i++ )
|
||||||
{
|
{
|
||||||
SMESH::smIdType index = IDsOfElements[i];
|
SMESH::smIdType index = IDsOfElements[i];
|
||||||
const SMDS_MeshElement * elem = getMeshDS()->FindElement(index);
|
const SMDS_MeshElement * elem = getMeshDS()->FindElement(index);
|
||||||
@ -2252,7 +2252,7 @@ SMESH_MeshEditor_i::smooth(const SMESH::smIdType_array & IDsOfElements,
|
|||||||
arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face);
|
arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face);
|
||||||
|
|
||||||
set<const SMDS_MeshNode*> fixedNodes;
|
set<const SMDS_MeshNode*> fixedNodes;
|
||||||
for ( SMESH::smIdType i = 0; i < IDsOfFixedNodes.length(); i++) {
|
for ( CORBA::ULong i = 0; i < IDsOfFixedNodes.length(); i++) {
|
||||||
SMESH::smIdType index = IDsOfFixedNodes[i];
|
SMESH::smIdType index = IDsOfFixedNodes[i];
|
||||||
const SMDS_MeshNode * node = aMesh->FindNode(index);
|
const SMDS_MeshNode * node = aMesh->FindNode(index);
|
||||||
if ( node )
|
if ( node )
|
||||||
@ -4342,7 +4342,7 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou
|
|||||||
if ( elemTypes->length() == 1 && elemTypes[0] == SMESH::NODE )
|
if ( elemTypes->length() == 1 && elemTypes[0] == SMESH::NODE )
|
||||||
continue;
|
continue;
|
||||||
SMESH::smIdType_array_var elementsId = theElementsToKeep[i]->GetIDs();
|
SMESH::smIdType_array_var elementsId = theElementsToKeep[i]->GetIDs();
|
||||||
for ( SMESH::smIdType j = 0; j < elementsId->length(); ++j )
|
for ( CORBA::ULong j = 0; j < elementsId->length(); ++j )
|
||||||
idsToKeep.Add( elementsId[ j ]);
|
idsToKeep.Add( elementsId[ j ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4353,7 +4353,7 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou
|
|||||||
const SMESH::long_array& anElemsIDGroup = theGroupsOfElementsID[ i ];
|
const SMESH::long_array& anElemsIDGroup = theGroupsOfElementsID[ i ];
|
||||||
aListOfListOfElementsID.push_back( list< smIdType >() );
|
aListOfListOfElementsID.push_back( list< smIdType >() );
|
||||||
list< smIdType >& aListOfElemsID = aListOfListOfElementsID.back();
|
list< smIdType >& aListOfElemsID = aListOfListOfElementsID.back();
|
||||||
for ( SMESH::smIdType j = 0; j < anElemsIDGroup.length(); j++ )
|
for ( CORBA::ULong j = 0; j < anElemsIDGroup.length(); j++ )
|
||||||
{
|
{
|
||||||
SMESH::smIdType id = anElemsIDGroup[ j ];
|
SMESH::smIdType id = anElemsIDGroup[ j ];
|
||||||
if ( idsToKeep.Contains( id )) aListOfElemsID.push_front( id );
|
if ( idsToKeep.Contains( id )) aListOfElemsID.push_front( id );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user