X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Filter.cxx;h=1aba21f879a5b1803ec7f8e24e7b5defd2613273;hp=c346e836e9ef2bc4e62003e6c834d8b6964f03a1;hb=refs%2Ftags%2FV9_7_0a1;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115 diff --git a/src/SMESHGUI/SMESHGUI_Filter.cxx b/src/SMESHGUI/SMESHGUI_Filter.cxx old mode 100755 new mode 100644 index c346e836e..1aba21f87 --- a/src/SMESHGUI/SMESHGUI_Filter.cxx +++ b/src/SMESHGUI/SMESHGUI_Filter.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 @@ -33,25 +33,12 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_Filter, VTKViewer_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_Filter, VTKViewer_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_PredicateFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_PredicateFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_QuadrangleFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_TriangleFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_TriangleFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_FacesFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_FacesFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_VolumesFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumesFilter, SMESHGUI_Filter) - -IMPLEMENT_STANDARD_HANDLE(SMESHGUI_VolumeShapeFilter, SMESHGUI_Filter) IMPLEMENT_STANDARD_RTTIEXT(SMESHGUI_VolumeShapeFilter, SMESHGUI_Filter) /* @@ -76,7 +63,7 @@ SMESHGUI_PredicateFilter::~SMESHGUI_PredicateFilter() // name : SMESHGUI_PredicateFilter::IsValid // Purpose : Verify whether entry id satisfies to criterion of the filter //======================================================================= -bool SMESHGUI_PredicateFilter::IsValid( const int theCellId ) const +bool SMESHGUI_PredicateFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 || myPred->_is_nil() ) return false; @@ -189,7 +176,7 @@ int SMESHGUI_PredicateFilter::GetId() const /* Class : SMESHGUI_QuadrangleFilter - Description : Verify whether selected cell is quadranle + Description : Verify whether selected cell is quadrangle */ //======================================================================= @@ -207,9 +194,9 @@ SMESHGUI_QuadrangleFilter::~SMESHGUI_QuadrangleFilter() //======================================================================= // name : SMESHGUI_QuadrangleFilter::IsValid -// Purpose : Verify whether selected cell is quadranle +// Purpose : Verify whether selected cell is quadrangle //======================================================================= -bool SMESHGUI_QuadrangleFilter::IsValid( const int theCellId ) const +bool SMESHGUI_QuadrangleFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 ) return false; @@ -227,7 +214,7 @@ bool SMESHGUI_QuadrangleFilter::IsValid( const int theCellId ) const //======================================================================= // name : SMESHGUI_QuadrangleFilter::IsValid -// Purpose : Verify whether selected cell is quadranle +// Purpose : Verify whether selected cell is quadrangle //======================================================================= bool SMESHGUI_QuadrangleFilter::IsObjValid( const int theObjId ) const { @@ -288,7 +275,7 @@ SMESHGUI_TriangleFilter::~SMESHGUI_TriangleFilter() // name : SMESHGUI_TriangleFilter::IsValid // Purpose : Verify whether selected cell is triangle //======================================================================= -bool SMESHGUI_TriangleFilter::IsValid( const int theCellId ) const +bool SMESHGUI_TriangleFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 ) return false; @@ -366,7 +353,7 @@ SMESHGUI_FacesFilter::~SMESHGUI_FacesFilter() // name : SMESHGUI_FacesFilter::IsValid // Purpose : Verify whether selected cell is face //======================================================================= -bool SMESHGUI_FacesFilter::IsValid( const int theCellId ) const +bool SMESHGUI_FacesFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 ) return false; @@ -443,7 +430,7 @@ SMESHGUI_VolumesFilter::~SMESHGUI_VolumesFilter() // name : SMESHGUI_VolumesFilter::IsValid // Purpose : Verify whether selected cell is volume //======================================================================= -bool SMESHGUI_VolumesFilter::IsValid( const int theCellId ) const +bool SMESHGUI_VolumesFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 || theCellId < 1 ) return false; @@ -516,7 +503,7 @@ SMESHGUI_VolumeShapeFilter::SMESHGUI_VolumeShapeFilter(const SMDSAbs_GeometryTyp // name : SMESHGUI_VolumeShapeFilter::IsValid // Purpose : Verify whether selected cell is a volume of a certain shape //======================================================================= -bool SMESHGUI_VolumeShapeFilter::IsValid( const int theCellId ) const +bool SMESHGUI_VolumeShapeFilter::IsValid( const vtkIdType theCellId ) const { if ( myActor == 0 || theCellId < 1 ) return false;