ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-14 10:11:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Replace ::smIdType by SMESH::smIdType

Browse Source 
Fix compilation errors in SMESH_Filter_i.cxx on Debian-8
Fix warnings in SMEHS_MeshEditor_i.cxx
This commit is contained in:
eap 2021-04-29 19:13:38 +03:00
parent 93a9239ed3
commit 21c4d15f62
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Controls/SMESH_ControlsDef.hxx
View File

@ -133,12 +133,12 @@ namespace SMESH{
virtual void SetMesh( const SMDS_Mesh* theMesh );
virtual double GetValue( long theElementId );
virtual double GetValue(const TSequenceOfXYZ& /*thePoints*/) { return -1.0;};
void GetHistogram(int nbIntervals,
std::vector<int>& nbEvents,
std::vector<double>& funValues,
void GetHistogram(int nbIntervals,
std::vector<int>& nbEvents,
std::vector<double>& funValues,
const std::vector<::smIdType>& elements,
const double* minmax=0,
const bool isLogarithmic = false);
const double* minmax=0,
const bool isLogarithmic = false);
bool IsApplicable( long theElementId ) const;
virtual bool IsApplicable( const SMDS_MeshElement* element ) const;
virtual SMDSAbs_ElementType GetType() const = 0;

2
src/SMESHGUI/SMESHGUI.cxx
View File

@ -1226,7 +1226,7 @@ namespace
SMESH::Controls::NumericalFunctor* aNumFun =
dynamic_cast<SMESH::Controls::NumericalFunctor*>( aFunctor.get() );
if ( aNumFun ) {
std::vector<::smIdType> elements;
std::vector<SMESH::smIdType> elements;
SMESH::SMESH_Mesh_var mesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIO);
if ( mesh->_is_nil() ) {
SMESH::SMESH_IDSource_var idSource =

6
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -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 )
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_"
const char** functNames = getFunctNames();
@ -4285,4 +4285,4 @@ namespace SMESH {
return is;
}
}
}

8
src/SMESH_I/SMESH_Group_i.cxx
View File

@ -362,10 +362,10 @@ SMESH::smIdType SMESH_Group_i::Remove( const SMESH::smIdType_array& theIDs )
typedef bool (SMESHDS_Group::*TFunChangeGroup)(const smIdType);
CORBA::Long
ChangeByPredicate( SMESH::Predicate_i* thePredicate,
SMESHDS_GroupBase* theGroupBase,
SMESH::NotifyerAndWaiter* theGroupImpl,
TFunChangeGroup theFun)
ChangeByPredicate( SMESH::Predicate_i* thePredicate,
SMESHDS_GroupBase* theGroupBase,
SMESH::NotifyerAndWaiter* theGroupImpl,
TFunChangeGroup theFun)
{
CORBA::Long aNb = 0;
if(SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>(theGroupBase)){

16
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -279,13 +279,13 @@ namespace MeshEditor_I {
SMDS_MeshElement::Filter & filter = *aFilter;
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] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
}
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] );
if ( filter( elem ))
aMap.insert( aMap.end(), elem );
@ -789,7 +789,7 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::smIdType_array & IDsOfElements)
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] );
// Update Python script
@ -817,7 +817,7 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::smIdType_array & IDs
initData();
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] );
// Update Python script
@ -1578,7 +1578,7 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::smIdType_array & IDsOfE
SMESH_TRY;
initData();
for ( SMESH::smIdType i = 0; i < IDsOfElements.length(); i++ )
for ( CORBA::ULong i = 0; i < IDsOfElements.length(); i++ )
{
SMESH::smIdType index = IDsOfElements[i];
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);
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];
const SMDS_MeshNode * node = aMesh->FindNode(index);
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 )
continue;
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 ]);
}
@ -4353,7 +4353,7 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& theGrou
const SMESH::long_array& anElemsIDGroup = theGroupsOfElementsID[ i ];
aListOfListOfElementsID.push_back( list< smIdType >() );
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 ];
if ( idsToKeep.Contains( id )) aListOfElemsID.push_front( id );