From: rnv Date: Thu, 29 Apr 2021 15:04:20 +0000 (+0300) Subject: Fix compilation problems under windows. X-Git-Tag: V9_7_0rc1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=61bac50f78623aabd9e4ddbcbba072c63ea02165;p=modules%2Fsmesh.git Fix compilation problems under windows. --- diff --git a/src/Controls/SMESH_ControlsDef.hxx b/src/Controls/SMESH_ControlsDef.hxx index 1ce5f4da5..c1fe797bc 100644 --- a/src/Controls/SMESH_ControlsDef.hxx +++ b/src/Controls/SMESH_ControlsDef.hxx @@ -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& nbEvents, - std::vector& funValues, - const std::vector& elements, - const double* minmax=0, - const bool isLogarithmic = false); + void GetHistogram(int nbIntervals, + std::vector& nbEvents, + std::vector& funValues, + const std::vector<::smIdType>& elements, + 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; @@ -147,7 +147,7 @@ namespace SMESH{ void SetPrecision( const long thePrecision ); double Round( const double & value ); - bool GetPoints(const smIdType theId, TSequenceOfXYZ& theRes) const; + bool GetPoints(const ::smIdType theId, TSequenceOfXYZ& theRes) const; static bool GetPoints(const SMDS_MeshElement* theElem, TSequenceOfXYZ& theRes); protected: const SMDS_Mesh* myMesh; @@ -594,7 +594,7 @@ namespace SMESH{ virtual void SetMesh( const SMDS_Mesh* theMesh ); virtual bool IsSatisfy( long theElementId ); virtual SMDSAbs_ElementType GetType() const; - static bool IsFreeEdge( const SMDS_MeshNode** theNodes, const smIdType theFaceId ); + static bool IsFreeEdge( const SMDS_MeshNode** theNodes, const ::smIdType theFaceId ); typedef long TElemId; struct Border{ TElemId myElemId; @@ -653,8 +653,8 @@ namespace SMESH{ protected: const SMDS_Mesh* myMesh; - std::vector< smIdType > myMin; - std::vector< smIdType > myMax; + std::vector< ::smIdType > myMin; + std::vector< ::smIdType > myMax; TIDsMap myIds; SMDSAbs_ElementType myType; @@ -1165,9 +1165,9 @@ namespace SMESH{ public: ConnectedElements(); //virtual Predicate* clone() const { return new ConnectedElements( *this ); } - void SetNode( smIdType nodeID ); + void SetNode( ::smIdType nodeID ); void SetPoint( double x, double y, double z ); - smIdType GetNode() const; + ::smIdType GetNode() const; std::vector GetPoint() const; void SetType( SMDSAbs_ElementType theType ); @@ -1179,14 +1179,14 @@ namespace SMESH{ //const std::set& GetDomainIDs() const { return myOkIDs; } private: - smIdType myNodeID; - std::vector myXYZ; - SMDSAbs_ElementType myType; - TMeshModifTracer myMeshModifTracer; + ::smIdType myNodeID; + std::vector myXYZ; + SMDSAbs_ElementType myType; + TMeshModifTracer myMeshModifTracer; - void clearOkIDs(); - bool myOkIDsReady; - std::set myOkIDs; // empty means that there is one domain + void clearOkIDs(); + bool myOkIDsReady; + std::set<::smIdType> myOkIDs; // empty means that there is one domain }; typedef boost::shared_ptr ConnectedElementsPtr; diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx index f79f01ae8..203f7931b 100644 --- a/src/OBJECT/SMESH_ActorUtils.cxx +++ b/src/OBJECT/SMESH_ActorUtils.cxx @@ -157,17 +157,17 @@ namespace SMESH } } - std::map GetEntitiesFromObject(SMESH_VisualObj *theObject) { - std::map entities; - entities.insert(std::pair(SMDSAbs_0DElement, + std::map GetEntitiesFromObject(SMESH_VisualObj *theObject) { + std::map entities; + entities.insert(std::pair(SMDSAbs_0DElement, theObject ? theObject->GetNbEntities(SMDSAbs_0DElement) : 0)); - entities.insert(std::pair(SMDSAbs_Ball, + entities.insert(std::pair(SMDSAbs_Ball, theObject ? theObject->GetNbEntities(SMDSAbs_Ball) : 0)); - entities.insert(std::pair(SMDSAbs_Edge, + entities.insert(std::pair(SMDSAbs_Edge, theObject ? theObject->GetNbEntities(SMDSAbs_Edge) : 0)); - entities.insert(std::pair(SMDSAbs_Face, + entities.insert(std::pair(SMDSAbs_Face, theObject ? theObject->GetNbEntities(SMDSAbs_Face) : 0)); - entities.insert(std::pair(SMDSAbs_Volume, + entities.insert(std::pair(SMDSAbs_Volume, theObject ? theObject->GetNbEntities(SMDSAbs_Volume) : 0)); return entities; } diff --git a/src/OBJECT/SMESH_ActorUtils.h b/src/OBJECT/SMESH_ActorUtils.h index a6ea963a5..4167e5ae1 100644 --- a/src/OBJECT/SMESH_ActorUtils.h +++ b/src/OBJECT/SMESH_ActorUtils.h @@ -84,7 +84,7 @@ SMESHOBJECT_EXPORT QString def); SMESHOBJECT_EXPORT - std::map + std::map GetEntitiesFromObject(SMESH_VisualObj *theObject); SMESHOBJECT_EXPORT diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx index 6f8551d09..846c81562 100644 --- a/src/OBJECT/SMESH_Object.cxx +++ b/src/OBJECT/SMESH_Object.cxx @@ -557,7 +557,7 @@ void SMESH_VisualObjDef::updateEntitiesFlags() unsigned int tmp = myEntitiesState; ClearEntitiesFlags(); - map entities = SMESH::GetEntitiesFromObject(this); + map entities = SMESH::GetEntitiesFromObject(this); if( myEntitiesCache[SMDSAbs_0DElement] != 0 || diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx index eb7a7e5bf..e3d6adeab 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx @@ -1226,8 +1226,8 @@ namespace SMESH int GetEdgeNodes(SVTK_Selector* theSelector, const TVisualObjPtr& theVisualObject, - smIdType& theId1, - smIdType& theId2) + ::smIdType& theId1, + ::smIdType& theId2) { const SALOME_ListIO& selected = theSelector->StoredIObjects(); @@ -1243,9 +1243,9 @@ namespace SMESH if ( aMapIndex.Extent() != 2 ) return -1; - smIdType anObjId = -1, anEdgeNum = -1; - for ( smIdType i = 1; i <= aMapIndex.Extent(); i++ ) { - smIdType aVal = aMapIndex( i ); + ::smIdType anObjId = -1, anEdgeNum = -1; + for ( ::smIdType i = 1; i <= aMapIndex.Extent(); i++ ) { + ::smIdType aVal = aMapIndex( i ); if ( aVal > 0 ) anObjId = aVal; else @@ -1343,7 +1343,7 @@ namespace SMESH } - int GetEdgeNodes( LightApp_SelectionMgr* theMgr, smIdType& theId1, smIdType& theId2 ) + int GetEdgeNodes( LightApp_SelectionMgr* theMgr, ::smIdType& theId1, ::smIdType& theId2 ) { SALOME_ListIO selected; theMgr->selectedObjects( selected ); @@ -1363,9 +1363,9 @@ namespace SMESH if ( aMapIndex.Extent() != 2 ) return -1; - smIdType anObjId = -1, anEdgeNum = -1; - for ( smIdType i = 1; i <= aMapIndex.Extent(); i++ ) { - smIdType aVal = aMapIndex( i ); + ::smIdType anObjId = -1, anEdgeNum = -1; + for ( ::smIdType i = 1; i <= aMapIndex.Extent(); i++ ) { + ::smIdType aVal = aMapIndex( i ); if ( aVal > 0 ) anObjId = aVal; else diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index dec7bdc65..1adcd5c56 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -169,7 +169,7 @@ SMESHGUI_EXPORT const Handle(SALOME_InteractiveObject)&, QString& ); SMESHGUI_EXPORT - int GetEdgeNodes( SVTK_Selector*, const TVisualObjPtr&, smIdType&, smIdType& ); + int GetEdgeNodes( SVTK_Selector*, const TVisualObjPtr&, ::smIdType&, ::smIdType& ); //---------------------------------------------------------------------------- SMESHGUI_EXPORT @@ -189,7 +189,7 @@ SMESHGUI_EXPORT const bool = true ); SMESHGUI_EXPORT - int GetEdgeNodes( LightApp_SelectionMgr*, smIdType&, smIdType& ); + int GetEdgeNodes( LightApp_SelectionMgr*, ::smIdType&, ::smIdType& ); SMESHGUI_EXPORT void SetControlsPrecision( const long ); diff --git a/src/SMESH_I/SMESH_Filter_i.cxx b/src/SMESH_I/SMESH_Filter_i.cxx index 2429d5fc1..40b20acbb 100644 --- a/src/SMESH_I/SMESH_Filter_i.cxx +++ b/src/SMESH_I/SMESH_Filter_i.cxx @@ -60,8 +60,8 @@ #include #include -using namespace SMESH; -using namespace SMESH::Controls; +//using namespace SMESH; +//using namespace SMESH::Controls; namespace SMESH @@ -79,9 +79,9 @@ namespace SMESH inline const SMDS_Mesh* -MeshPtr2SMDSMesh( SMESH_Mesh_ptr theMesh ) +MeshPtr2SMDSMesh( SMESH::SMESH_Mesh_ptr theMesh ) { - SMESH_Mesh_i* anImplPtr = DownCast(theMesh); + SMESH_Mesh_i* anImplPtr = SMESH::DownCast(theMesh); return anImplPtr ? anImplPtr->GetImpl().GetMeshDS() : 0; } @@ -117,11 +117,11 @@ static SMESH::Filter::Criterion createCriterion() { SMESH::Filter::Criterion aCriterion; - aCriterion.Type = FT_Undefined; - aCriterion.Compare = FT_Undefined; + aCriterion.Type = SMESH::FT_Undefined; + aCriterion.Compare = SMESH::FT_Undefined; aCriterion.Threshold = 0; - aCriterion.UnaryOp = FT_Undefined; - aCriterion.BinaryOp = FT_Undefined; + aCriterion.UnaryOp = SMESH::FT_Undefined; + aCriterion.BinaryOp = SMESH::FT_Undefined; aCriterion.ThresholdStr = ""; aCriterion.ThresholdID = ""; aCriterion.Tolerance = Precision::Confusion(); @@ -181,4107 +181,4108 @@ static TopoDS_Shape getShapeByID (const char* theID) FUNCTORS */ -/* - Class : Functor_i - Description : An abstract class for all functors -*/ -Functor_i::Functor_i(): - SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() ) -{ - //Base class Salome_GenericObject do it inmplicitly by overriding PortableServer::POA_ptr _default_POA() method - //PortableServer::ObjectId_var anObjectId = - // SMESH_Gen_i::GetPOA()->activate_object( this ); -} +//============================================================================= +/*! + * SMESH_Gen_i::CreateFilterManager + * + * Create filter manager + */ + //============================================================================= -Functor_i::~Functor_i() +SMESH::FilterManager_ptr SMESH_Gen_i::CreateFilterManager() { - //TPythonDump()<_this(); + return anObj._retn(); } -void Functor_i::SetMesh( SMESH_Mesh_ptr theMesh ) -{ - myFunctorPtr->SetMesh( MeshPtr2SMDSMesh( theMesh ) ); - TPythonDump()<activate_object( this ); + } -ElementType Functor_i::GetElementType() -{ - return ( ElementType )myFunctorPtr->GetType(); -} + Functor_i::~Functor_i() + { + //TPythonDump()<SetMesh( MeshPtr2SMDSMesh( theMesh ) ); + TPythonDump()<GetValue( theId ); -} + ElementType Functor_i::GetElementType() + { + return ( ElementType )myFunctorPtr->GetType(); + } -CORBA::Boolean NumericalFunctor_i::IsApplicable( SMESH::smIdType theElementId ) -{ - return myNumericalFunctorPtr->IsApplicable( theElementId ); -} -SMESH::Histogram* NumericalFunctor_i::GetHistogram(CORBA::Short nbIntervals, CORBA::Boolean isLogarithmic) -{ - std::vector nbEvents; - std::vector funValues; - std::vector elements; - myNumericalFunctorPtr->GetHistogram(nbIntervals,nbEvents,funValues,elements,0,isLogarithmic); + /* + Class : NumericalFunctor_i + Description : Base class for numerical functors + */ + CORBA::Double NumericalFunctor_i::GetValue( SMESH::smIdType theId ) + { + return myNumericalFunctorPtr->GetValue( theId ); + } - SMESH::Histogram_var histogram = new SMESH::Histogram; + CORBA::Boolean NumericalFunctor_i::IsApplicable( SMESH::smIdType theElementId ) + { + return myNumericalFunctorPtr->IsApplicable( theElementId ); + } - nbIntervals = CORBA::Short( Min( int( nbEvents.size()), - int( funValues.size() - 1 ))); - if ( nbIntervals > 0 ) + SMESH::Histogram* NumericalFunctor_i::GetHistogram(CORBA::Short nbIntervals, CORBA::Boolean isLogarithmic) { - histogram->length( nbIntervals ); - for ( int i = 0; i < nbIntervals; ++i ) + std::vector nbEvents; + std::vector funValues; + std::vector<::smIdType> elements; + myNumericalFunctorPtr->GetHistogram(nbIntervals, nbEvents, funValues ,elements, 0, isLogarithmic); + + SMESH::Histogram_var histogram = new SMESH::Histogram; + + nbIntervals = CORBA::Short( Min( int( nbEvents.size()), + int( funValues.size() - 1 ))); + if ( nbIntervals > 0 ) { - HistogramRectangle& rect = histogram[i]; - rect.nbEvents = nbEvents[i]; - rect.min = funValues[i]; - rect.max = funValues[i+1]; + histogram->length( nbIntervals ); + for ( int i = 0; i < nbIntervals; ++i ) + { + HistogramRectangle& rect = histogram[i]; + rect.nbEvents = nbEvents[i]; + rect.min = funValues[i]; + rect.max = funValues[i+1]; + } } + return histogram._retn(); } - return histogram._retn(); -} -SMESH::Histogram* NumericalFunctor_i::GetLocalHistogram(CORBA::Short nbIntervals, - CORBA::Boolean isLogarithmic, - SMESH::SMESH_IDSource_ptr object) -{ - SMESH::Histogram_var histogram = new SMESH::Histogram; + SMESH::Histogram* NumericalFunctor_i::GetLocalHistogram(CORBA::Short nbIntervals, + CORBA::Boolean isLogarithmic, + SMESH::SMESH_IDSource_ptr object) + { + SMESH::Histogram_var histogram = new SMESH::Histogram; - std::vector nbEvents; - std::vector funValues; - std::vector elements; + std::vector nbEvents; + std::vector funValues; + std::vector<::smIdType> elements; - SMDS_ElemIteratorPtr elemIt; - if ( SMESH::DownCast< SMESH_GroupOnFilter_i* >( object ) || - SMESH::DownCast< SMESH::Filter_i* >( object )) - { - elemIt = SMESH_Mesh_i::GetElements( object, GetElementType() ); - if ( !elemIt ) return histogram._retn(); - } - else - { - SMESH::SMESH_Mesh_var mesh = object->GetMesh(); - SMESH::smIdType_array_var objNbElems = object->GetNbElementsByType(); - SMESH::smIdType_array_var meshNbElems = mesh-> GetNbElementsByType(); - if ( meshNbElems[ GetElementType() ] != - objNbElems [ GetElementType() ] ) + SMDS_ElemIteratorPtr elemIt; + if ( SMESH::DownCast< SMESH_GroupOnFilter_i* >( object ) || + SMESH::DownCast< SMESH::Filter_i* >( object )) { - elements.reserve( objNbElems[ GetElementType() ]); elemIt = SMESH_Mesh_i::GetElements( object, GetElementType() ); + if ( !elemIt ) return histogram._retn(); + } + else + { + SMESH::SMESH_Mesh_var mesh = object->GetMesh(); + SMESH::smIdType_array_var objNbElems = object->GetNbElementsByType(); + SMESH::smIdType_array_var meshNbElems = mesh-> GetNbElementsByType(); + if ( meshNbElems[ GetElementType() ] != + objNbElems [ GetElementType() ] ) + { + elements.reserve( objNbElems[ GetElementType() ]); + elemIt = SMESH_Mesh_i::GetElements( object, GetElementType() ); + } + } + if ( elemIt ) + { + while ( elemIt->more() ) + elements.push_back( elemIt->next()->GetID() ); + if ( elements.empty() ) return histogram._retn(); + } + + myNumericalFunctorPtr->GetHistogram(nbIntervals,nbEvents,funValues, elements, 0, isLogarithmic); + + nbIntervals = CORBA::Short( Min( int( nbEvents.size()), + int( funValues.size() - 1 ))); + if ( nbIntervals > 0 ) + { + histogram->length( nbIntervals ); + for ( int i = 0; i < nbIntervals; ++i ) + { + HistogramRectangle& rect = histogram[i]; + rect.nbEvents = nbEvents[i]; + rect.min = funValues[i]; + rect.max = funValues[i+1]; + } } + return histogram._retn(); } - if ( elemIt ) + + void NumericalFunctor_i::SetPrecision( CORBA::Long thePrecision ) { - while ( elemIt->more() ) - elements.push_back( elemIt->next()->GetID() ); - if ( elements.empty() ) return histogram._retn(); + myNumericalFunctorPtr->SetPrecision( thePrecision ); + TPythonDump()<GetHistogram(nbIntervals,nbEvents,funValues,elements,0,isLogarithmic); + CORBA::Long NumericalFunctor_i::GetPrecision() + { + return myNumericalFunctorPtr->GetPrecision(); + } - nbIntervals = CORBA::Short( Min( int( nbEvents.size()), - int( funValues.size() - 1 ))); - if ( nbIntervals > 0 ) + Controls::NumericalFunctorPtr NumericalFunctor_i::GetNumericalFunctor() { - histogram->length( nbIntervals ); - for ( int i = 0; i < nbIntervals; ++i ) - { - HistogramRectangle& rect = histogram[i]; - rect.nbEvents = nbEvents[i]; - rect.min = funValues[i]; - rect.max = funValues[i+1]; - } + return myNumericalFunctorPtr; } - return histogram._retn(); -} -void NumericalFunctor_i::SetPrecision( CORBA::Long thePrecision ) -{ - myNumericalFunctorPtr->SetPrecision( thePrecision ); - TPythonDump()<GetPrecision(); -} + /* + Class : SMESH_MinimumAngle + Description : Functor for calculation of minimum angle + */ + MinimumAngle_i::MinimumAngle_i() + { + myNumericalFunctorPtr.reset( new Controls::MinimumAngle() ); + myFunctorPtr = myNumericalFunctorPtr; + } -Controls::NumericalFunctorPtr NumericalFunctor_i::GetNumericalFunctor() -{ - return myNumericalFunctorPtr; -} + FunctorType MinimumAngle_i::GetFunctorType() + { + return SMESH::FT_MinimumAngle; + } -/* - Class : SMESH_MinimumAngle - Description : Functor for calculation of minimum angle -*/ -MinimumAngle_i::MinimumAngle_i() -{ - myNumericalFunctorPtr.reset( new Controls::MinimumAngle() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : AspectRatio + Description : Functor for calculating aspect ratio + */ + AspectRatio_i::AspectRatio_i() + { + myNumericalFunctorPtr.reset( new Controls::AspectRatio() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType MinimumAngle_i::GetFunctorType() -{ - return SMESH::FT_MinimumAngle; -} + FunctorType AspectRatio_i::GetFunctorType() + { + return SMESH::FT_AspectRatio; + } -/* - Class : AspectRatio - Description : Functor for calculating aspect ratio -*/ -AspectRatio_i::AspectRatio_i() -{ - myNumericalFunctorPtr.reset( new Controls::AspectRatio() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : AspectRatio3D + Description : Functor for calculating aspect ratio 3D + */ + AspectRatio3D_i::AspectRatio3D_i() + { + myNumericalFunctorPtr.reset( new Controls::AspectRatio3D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType AspectRatio_i::GetFunctorType() -{ - return SMESH::FT_AspectRatio; -} + FunctorType AspectRatio3D_i::GetFunctorType() + { + return SMESH::FT_AspectRatio3D; + } -/* - Class : AspectRatio3D - Description : Functor for calculating aspect ratio 3D -*/ -AspectRatio3D_i::AspectRatio3D_i() -{ - myNumericalFunctorPtr.reset( new Controls::AspectRatio3D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : Warping_i + Description : Functor for calculating warping + */ + Warping_i::Warping_i() + { + myNumericalFunctorPtr.reset( new Controls::Warping() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType AspectRatio3D_i::GetFunctorType() -{ - return SMESH::FT_AspectRatio3D; -} + FunctorType Warping_i::GetFunctorType() + { + return SMESH::FT_Warping; + } -/* - Class : Warping_i - Description : Functor for calculating warping -*/ -Warping_i::Warping_i() -{ - myNumericalFunctorPtr.reset( new Controls::Warping() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : Taper_i + Description : Functor for calculating taper + */ + Taper_i::Taper_i() + { + myNumericalFunctorPtr.reset( new Controls::Taper() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType Warping_i::GetFunctorType() -{ - return SMESH::FT_Warping; -} + FunctorType Taper_i::GetFunctorType() + { + return SMESH::FT_Taper; + } + /* + Class : Skew_i + Description : Functor for calculating skew in degrees + */ + Skew_i::Skew_i() + { + myNumericalFunctorPtr.reset( new Controls::Skew() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : Taper_i - Description : Functor for calculating taper -*/ -Taper_i::Taper_i() -{ - myNumericalFunctorPtr.reset( new Controls::Taper() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType Skew_i::GetFunctorType() + { + return SMESH::FT_Skew; + } -FunctorType Taper_i::GetFunctorType() -{ - return SMESH::FT_Taper; -} + /* + Class : Area_i + Description : Functor for calculating area + */ + Area_i::Area_i() + { + myNumericalFunctorPtr.reset( new Controls::Area() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : Skew_i - Description : Functor for calculating skew in degrees -*/ -Skew_i::Skew_i() -{ - myNumericalFunctorPtr.reset( new Controls::Skew() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType Area_i::GetFunctorType() + { + return SMESH::FT_Area; + } -FunctorType Skew_i::GetFunctorType() -{ - return SMESH::FT_Skew; -} + /* + Class : Volume3D_i + Description : Functor for calculating volume of 3D element + */ + Volume3D_i::Volume3D_i() + { + myNumericalFunctorPtr.reset( new Controls::Volume() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : Area_i - Description : Functor for calculating area -*/ -Area_i::Area_i() -{ - myNumericalFunctorPtr.reset( new Controls::Area() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType Volume3D_i::GetFunctorType() + { + return SMESH::FT_Volume3D; + } -FunctorType Area_i::GetFunctorType() -{ - return SMESH::FT_Area; -} + /* + Class : MaxElementLength2D_i + Description : Functor for calculating maximum length of 2D element + */ + MaxElementLength2D_i::MaxElementLength2D_i() + { + myNumericalFunctorPtr.reset( new Controls::MaxElementLength2D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : Volume3D_i - Description : Functor for calculating volume of 3D element -*/ -Volume3D_i::Volume3D_i() -{ - myNumericalFunctorPtr.reset( new Controls::Volume() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType MaxElementLength2D_i::GetFunctorType() + { + return SMESH::FT_MaxElementLength2D; + } -FunctorType Volume3D_i::GetFunctorType() -{ - return SMESH::FT_Volume3D; -} + /* + Class : MaxElementLength3D_i + Description : Functor for calculating maximum length of 3D element + */ + MaxElementLength3D_i::MaxElementLength3D_i() + { + myNumericalFunctorPtr.reset( new Controls::MaxElementLength3D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : MaxElementLength2D_i - Description : Functor for calculating maximum length of 2D element -*/ -MaxElementLength2D_i::MaxElementLength2D_i() -{ - myNumericalFunctorPtr.reset( new Controls::MaxElementLength2D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType MaxElementLength3D_i::GetFunctorType() + { + return SMESH::FT_MaxElementLength3D; + } -FunctorType MaxElementLength2D_i::GetFunctorType() -{ - return SMESH::FT_MaxElementLength2D; -} + /* + Class : Length_i + Description : Functor for calculating length off edge + */ + Length_i::Length_i() + { + myNumericalFunctorPtr.reset( new Controls::Length() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : MaxElementLength3D_i - Description : Functor for calculating maximum length of 3D element -*/ -MaxElementLength3D_i::MaxElementLength3D_i() -{ - myNumericalFunctorPtr.reset( new Controls::MaxElementLength3D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType Length_i::GetFunctorType() + { + return SMESH::FT_Length; + } -FunctorType MaxElementLength3D_i::GetFunctorType() -{ - return SMESH::FT_MaxElementLength3D; -} + /* + Class : Length2D_i + Description : Functor for calculating length of edge + */ + Length2D_i::Length2D_i() + { + myNumericalFunctorPtr.reset( new Controls::Length2D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -/* - Class : Length_i - Description : Functor for calculating length off edge -*/ -Length_i::Length_i() -{ - myNumericalFunctorPtr.reset( new Controls::Length() ); - myFunctorPtr = myNumericalFunctorPtr; -} + FunctorType Length2D_i::GetFunctorType() + { + return SMESH::FT_Length2D; + } -FunctorType Length_i::GetFunctorType() -{ - return SMESH::FT_Length; -} + SMESH::Length2D::Values* Length2D_i::GetValues() + { + SMESH::Controls::Length2D::TValues aValues; + (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); -/* - Class : Length2D_i - Description : Functor for calculating length of edge -*/ -Length2D_i::Length2D_i() -{ - myNumericalFunctorPtr.reset( new Controls::Length2D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + long i = 0, iEnd = aValues.size(); -FunctorType Length2D_i::GetFunctorType() -{ - return SMESH::FT_Length2D; -} + SMESH::Length2D::Values_var aResult = new SMESH::Length2D::Values(iEnd); + aResult->length(iEnd); -SMESH::Length2D::Values* Length2D_i::GetValues() -{ - SMESH::Controls::Length2D::TValues aValues; - (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); + SMESH::Controls::Length2D::TValues::const_iterator anIter; + for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) + { + const SMESH::Controls::Length2D::Value& aVal = *anIter; + SMESH::Length2D::Value &aValue = aResult[ i ]; + + aValue.myLength = aVal.myLength; + aValue.myPnt1 = aVal.myPntId[ 0 ]; + aValue.myPnt2 = aVal.myPntId[ 1 ]; + } - long i = 0, iEnd = aValues.size(); + return aResult._retn(); + } - SMESH::Length2D::Values_var aResult = new SMESH::Length2D::Values(iEnd); - aResult->length(iEnd); - SMESH::Controls::Length2D::TValues::const_iterator anIter; - for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) + /* + Class : Length3D_i + Description : Functor for calculating length of edge + */ + Length3D_i::Length3D_i() { - const SMESH::Controls::Length2D::Value& aVal = *anIter; - SMESH::Length2D::Value &aValue = aResult[ i ]; + myNumericalFunctorPtr.reset( new Controls::Length3D() ); + myFunctorPtr = myNumericalFunctorPtr; + } - aValue.myLength = aVal.myLength; - aValue.myPnt1 = aVal.myPntId[ 0 ]; - aValue.myPnt2 = aVal.myPntId[ 1 ]; + FunctorType Length3D_i::GetFunctorType() + { + return SMESH::FT_Length3D; } - return aResult._retn(); -} + // SMESH::Length3D::Values* Length3D_i::GetValues() + // { + // SMESH::Controls::Length3D::TValues aValues; + // (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); + // long i = 0, iEnd = aValues.size(); -/* - Class : Length3D_i - Description : Functor for calculating length of edge -*/ -Length3D_i::Length3D_i() -{ - myNumericalFunctorPtr.reset( new Controls::Length3D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + // SMESH::Length3D::Values_var aResult = new SMESH::Length3D::Values(iEnd); + // aResult->length(iEnd); -FunctorType Length3D_i::GetFunctorType() -{ - return SMESH::FT_Length3D; -} + // SMESH::Controls::Length3D::TValues::const_iterator anIter; + // for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) + // { + // const SMESH::Controls::Length3D::Value& aVal = *anIter; + // SMESH::Length3D::Value &aValue = aResult[ i ]; -// SMESH::Length3D::Values* Length3D_i::GetValues() -// { -// SMESH::Controls::Length3D::TValues aValues; -// (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); + // aValue.myLength = aVal.myLength; + // aValue.myPnt1 = aVal.myPntId[ 0 ]; + // aValue.myPnt2 = aVal.myPntId[ 1 ]; + // } -// long i = 0, iEnd = aValues.size(); + // return aResult._retn(); + // } -// SMESH::Length3D::Values_var aResult = new SMESH::Length3D::Values(iEnd); -// aResult->length(iEnd); + /* + Class : Deflection2D_i + Description : Functor for calculating distance between a face and geometry + */ + Deflection2D_i::Deflection2D_i() + { + myNumericalFunctorPtr.reset( new Controls::Deflection2D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -// SMESH::Controls::Length3D::TValues::const_iterator anIter; -// for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) -// { -// const SMESH::Controls::Length3D::Value& aVal = *anIter; -// SMESH::Length3D::Value &aValue = aResult[ i ]; + FunctorType Deflection2D_i::GetFunctorType() + { + return SMESH::FT_Deflection2D; + } -// aValue.myLength = aVal.myLength; -// aValue.myPnt1 = aVal.myPntId[ 0 ]; -// aValue.myPnt2 = aVal.myPntId[ 1 ]; -// } + /* + Class : MultiConnection_i + Description : Functor for calculating number of faces conneted to the edge + */ + MultiConnection_i::MultiConnection_i() + { + myNumericalFunctorPtr.reset( new Controls::MultiConnection() ); + myFunctorPtr = myNumericalFunctorPtr; + } -// return aResult._retn(); -// } + FunctorType MultiConnection_i::GetFunctorType() + { + return SMESH::FT_MultiConnection; + } -/* - Class : Deflection2D_i - Description : Functor for calculating distance between a face and geometry -*/ -Deflection2D_i::Deflection2D_i() -{ - myNumericalFunctorPtr.reset( new Controls::Deflection2D() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : BallDiameter_i + Description : Functor returning diameter of a ball element + */ + BallDiameter_i::BallDiameter_i() + { + myNumericalFunctorPtr.reset( new Controls::BallDiameter() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType Deflection2D_i::GetFunctorType() -{ - return SMESH::FT_Deflection2D; -} + FunctorType BallDiameter_i::GetFunctorType() + { + return SMESH::FT_BallDiameter; + } -/* - Class : MultiConnection_i - Description : Functor for calculating number of faces conneted to the edge -*/ -MultiConnection_i::MultiConnection_i() -{ - myNumericalFunctorPtr.reset( new Controls::MultiConnection() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : NodeConnectivityNumber_i + Description : Functor returning diameter of a ball element + */ + NodeConnectivityNumber_i::NodeConnectivityNumber_i() + { + myNumericalFunctorPtr.reset( new Controls::NodeConnectivityNumber() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType MultiConnection_i::GetFunctorType() -{ - return SMESH::FT_MultiConnection; -} + FunctorType NodeConnectivityNumber_i::GetFunctorType() + { + return SMESH::FT_NodeConnectivityNumber; + } -/* - Class : BallDiameter_i - Description : Functor returning diameter of a ball element -*/ -BallDiameter_i::BallDiameter_i() -{ - myNumericalFunctorPtr.reset( new Controls::BallDiameter() ); - myFunctorPtr = myNumericalFunctorPtr; -} + /* + Class : MultiConnection2D_i + Description : Functor for calculating number of faces conneted to the edge + */ + MultiConnection2D_i::MultiConnection2D_i() + { + myNumericalFunctorPtr.reset( new Controls::MultiConnection2D() ); + myFunctorPtr = myNumericalFunctorPtr; + } -FunctorType BallDiameter_i::GetFunctorType() -{ - return SMESH::FT_BallDiameter; -} + FunctorType MultiConnection2D_i::GetFunctorType() + { + return SMESH::FT_MultiConnection2D; + } -/* - Class : NodeConnectivityNumber_i - Description : Functor returning diameter of a ball element -*/ -NodeConnectivityNumber_i::NodeConnectivityNumber_i() -{ - myNumericalFunctorPtr.reset( new Controls::NodeConnectivityNumber() ); - myFunctorPtr = myNumericalFunctorPtr; -} + SMESH::MultiConnection2D::Values* MultiConnection2D_i::GetValues() + { + SMESH::Controls::MultiConnection2D::MValues aValues; + (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); + + long i = 0, iEnd = aValues.size(); -FunctorType NodeConnectivityNumber_i::GetFunctorType() -{ - return SMESH::FT_NodeConnectivityNumber; -} + SMESH::MultiConnection2D::Values_var aResult = new SMESH::MultiConnection2D::Values(iEnd); + aResult->length(iEnd); -/* - Class : MultiConnection2D_i - Description : Functor for calculating number of faces conneted to the edge -*/ -MultiConnection2D_i::MultiConnection2D_i() -{ - myNumericalFunctorPtr.reset( new Controls::MultiConnection2D() ); - myFunctorPtr = myNumericalFunctorPtr; -} - -FunctorType MultiConnection2D_i::GetFunctorType() -{ - return SMESH::FT_MultiConnection2D; -} - -SMESH::MultiConnection2D::Values* MultiConnection2D_i::GetValues() -{ - SMESH::Controls::MultiConnection2D::MValues aValues; - (dynamic_cast(myFunctorPtr.get()))->GetValues( aValues ); - - long i = 0, iEnd = aValues.size(); - - SMESH::MultiConnection2D::Values_var aResult = new SMESH::MultiConnection2D::Values(iEnd); - aResult->length(iEnd); + SMESH::Controls::MultiConnection2D::MValues::const_iterator anIter; + for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) + { + const SMESH::Controls::MultiConnection2D::Value& aVal = (*anIter).first; + SMESH::MultiConnection2D::Value &aValue = aResult[ i ]; - SMESH::Controls::MultiConnection2D::MValues::const_iterator anIter; - for ( anIter = aValues.begin() ; anIter != aValues.end(); anIter++, i++ ) - { - const SMESH::Controls::MultiConnection2D::Value& aVal = (*anIter).first; - SMESH::MultiConnection2D::Value &aValue = aResult[ i ]; + aValue.myPnt1 = aVal.myPntId[ 0 ]; + aValue.myPnt2 = aVal.myPntId[ 1 ]; + aValue.myNbConnects = (*anIter).second; + } - aValue.myPnt1 = aVal.myPntId[ 0 ]; - aValue.myPnt2 = aVal.myPntId[ 1 ]; - aValue.myNbConnects = (*anIter).second; + return aResult._retn(); } - return aResult._retn(); -} - -/* - PREDICATES -*/ + /* + PREDICATES + */ -/* - Class : Predicate_i - Description : Base class for all predicates -*/ -CORBA::Boolean Predicate_i::IsSatisfy( CORBA::Long theId ) -{ - return myPredicatePtr->IsSatisfy( theId ); -} + /* + Class : Predicate_i + Description : Base class for all predicates + */ + CORBA::Boolean Predicate_i::IsSatisfy( CORBA::Long theId ) + { + return myPredicatePtr->IsSatisfy( theId ); + } -CORBA::Long Predicate_i::NbSatisfying( SMESH::SMESH_IDSource_ptr obj ) -{ - SMESH::SMESH_Mesh_var meshVar = obj->GetMesh(); - const SMDS_Mesh* meshDS = MeshPtr2SMDSMesh( meshVar ); - if ( !meshDS ) - return 0; - myPredicatePtr->SetMesh( meshDS ); - - SMDSAbs_ElementType elemType = SMDSAbs_ElementType( GetElementType() ); - - int nb = 0; - SMDS_ElemIteratorPtr elemIt = - SMESH::DownCast( meshVar )->GetElements( obj, GetElementType() ); - if ( elemIt ) - while ( elemIt->more() ) - { - const SMDS_MeshElement* e = elemIt->next(); - if ( e && e->GetType() == elemType ) - nb += myPredicatePtr->IsSatisfy( e->GetID() ); - } - return nb; -} + CORBA::Long Predicate_i::NbSatisfying( SMESH::SMESH_IDSource_ptr obj ) + { + SMESH::SMESH_Mesh_var meshVar = obj->GetMesh(); + const SMDS_Mesh* meshDS = MeshPtr2SMDSMesh( meshVar ); + if ( !meshDS ) + return 0; + myPredicatePtr->SetMesh( meshDS ); + + SMDSAbs_ElementType elemType = SMDSAbs_ElementType( GetElementType() ); + + int nb = 0; + SMDS_ElemIteratorPtr elemIt = + SMESH::DownCast( meshVar )->GetElements( obj, GetElementType() ); + if ( elemIt ) + while ( elemIt->more() ) + { + const SMDS_MeshElement* e = elemIt->next(); + if ( e && e->GetType() == elemType ) + nb += myPredicatePtr->IsSatisfy( e->GetID() ); + } + return nb; + } -Controls::PredicatePtr Predicate_i::GetPredicate() -{ - return myPredicatePtr; -} + Controls::PredicatePtr Predicate_i::GetPredicate() + { + return myPredicatePtr; + } -/* - Class : BadOrientedVolume_i - Description : Verify whether a mesh volume is incorrectly oriented from - the point of view of MED convention -*/ -BadOrientedVolume_i::BadOrientedVolume_i() -{ - Controls::PredicatePtr control( new Controls::BadOrientedVolume() ); - myFunctorPtr = myPredicatePtr = control; -} + /* + Class : BadOrientedVolume_i + Description : Verify whether a mesh volume is incorrectly oriented from + the point of view of MED convention + */ + BadOrientedVolume_i::BadOrientedVolume_i() + { + Controls::PredicatePtr control( new Controls::BadOrientedVolume() ); + myFunctorPtr = myPredicatePtr = control; + } -FunctorType BadOrientedVolume_i::GetFunctorType() -{ - return SMESH::FT_BadOrientedVolume; -} + FunctorType BadOrientedVolume_i::GetFunctorType() + { + return SMESH::FT_BadOrientedVolume; + } -/* - Class : BareBorderVolume_i - Description : Verify whether a mesh volume has a free facet without a face on it -*/ -BareBorderVolume_i::BareBorderVolume_i() -{ - Controls::PredicatePtr control( new Controls::BareBorderVolume() ); - myFunctorPtr = myPredicatePtr = control; -} + /* + Class : BareBorderVolume_i + Description : Verify whether a mesh volume has a free facet without a face on it + */ + BareBorderVolume_i::BareBorderVolume_i() + { + Controls::PredicatePtr control( new Controls::BareBorderVolume() ); + myFunctorPtr = myPredicatePtr = control; + } -FunctorType BareBorderVolume_i::GetFunctorType() -{ - return SMESH::FT_BareBorderVolume; -} + FunctorType BareBorderVolume_i::GetFunctorType() + { + return SMESH::FT_BareBorderVolume; + } -/* - Class : BareBorderFace_i - Description : Verify whether a mesh face has a free border without an edge on it -*/ -BareBorderFace_i::BareBorderFace_i() -{ - Controls::PredicatePtr control( new Controls::BareBorderFace() ); - myFunctorPtr = myPredicatePtr = control; -} + /* + Class : BareBorderFace_i + Description : Verify whether a mesh face has a free border without an edge on it + */ + BareBorderFace_i::BareBorderFace_i() + { + Controls::PredicatePtr control( new Controls::BareBorderFace() ); + myFunctorPtr = myPredicatePtr = control; + } -FunctorType BareBorderFace_i::GetFunctorType() -{ - return SMESH::FT_BareBorderFace; -} + FunctorType BareBorderFace_i::GetFunctorType() + { + return SMESH::FT_BareBorderFace; + } -/* - Class : OverConstrainedVolume_i - Description : Verify whether a mesh volume has only one facet shared with other volumes -*/ -OverConstrainedVolume_i::OverConstrainedVolume_i() -{ - Controls::PredicatePtr control( new Controls::OverConstrainedVolume() ); - myFunctorPtr = myPredicatePtr = control; -} + /* + Class : OverConstrainedVolume_i + Description : Verify whether a mesh volume has only one facet shared with other volumes + */ + OverConstrainedVolume_i::OverConstrainedVolume_i() + { + Controls::PredicatePtr control( new Controls::OverConstrainedVolume() ); + myFunctorPtr = myPredicatePtr = control; + } -FunctorType OverConstrainedVolume_i::GetFunctorType() -{ - return SMESH::FT_OverConstrainedVolume; -} + FunctorType OverConstrainedVolume_i::GetFunctorType() + { + return SMESH::FT_OverConstrainedVolume; + } -/* - Class : OverConstrainedFace_i - Description : Verify whether a mesh face has only one border shared with other faces -*/ -OverConstrainedFace_i::OverConstrainedFace_i() -{ - Controls::PredicatePtr control( new Controls::OverConstrainedFace() ); - myFunctorPtr = myPredicatePtr = control; -} + /* + Class : OverConstrainedFace_i + Description : Verify whether a mesh face has only one border shared with other faces + */ + OverConstrainedFace_i::OverConstrainedFace_i() + { + Controls::PredicatePtr control( new Controls::OverConstrainedFace() ); + myFunctorPtr = myPredicatePtr = control; + } -FunctorType OverConstrainedFace_i::GetFunctorType() -{ - return SMESH::FT_OverConstrainedFace; -} + FunctorType OverConstrainedFace_i::GetFunctorType() + { + return SMESH::FT_OverConstrainedFace; + } -/* - Class : BelongToMeshGroup_i - Description : Verify whether a mesh element is included into a mesh group -*/ -BelongToMeshGroup_i::BelongToMeshGroup_i() -{ - myBelongToMeshGroup = Controls::BelongToMeshGroupPtr( new Controls::BelongToMeshGroup() ); - myFunctorPtr = myPredicatePtr = myBelongToMeshGroup; -} + /* + Class : BelongToMeshGroup_i + Description : Verify whether a mesh element is included into a mesh group + */ + BelongToMeshGroup_i::BelongToMeshGroup_i() + { + myBelongToMeshGroup = Controls::BelongToMeshGroupPtr( new Controls::BelongToMeshGroup() ); + myFunctorPtr = myPredicatePtr = myBelongToMeshGroup; + } -BelongToMeshGroup_i::~BelongToMeshGroup_i() -{ - SetGroup( SMESH::SMESH_GroupBase::_nil() ); -} + BelongToMeshGroup_i::~BelongToMeshGroup_i() + { + SetGroup( SMESH::SMESH_GroupBase::_nil() ); + } -void BelongToMeshGroup_i::SetGroup( SMESH::SMESH_GroupBase_ptr theGroup ) -{ - if ( myGroup->_is_equivalent( theGroup )) - return; + void BelongToMeshGroup_i::SetGroup( SMESH::SMESH_GroupBase_ptr theGroup ) + { + if ( myGroup->_is_equivalent( theGroup )) + return; - if ( ! myGroup->_is_nil() ) - myGroup->UnRegister(); + if ( ! myGroup->_is_nil() ) + myGroup->UnRegister(); - myGroup = SMESH_GroupBase::_duplicate( theGroup ); + myGroup = SMESH_GroupBase::_duplicate( theGroup ); - myBelongToMeshGroup->SetGroup( 0 ); - if ( SMESH_GroupBase_i* gr_i = SMESH::DownCast< SMESH_GroupBase_i* >( myGroup )) - { - myBelongToMeshGroup->SetGroup( gr_i->GetGroupDS() ); - myGroup->Register(); + myBelongToMeshGroup->SetGroup( 0 ); + if ( SMESH_GroupBase_i* gr_i = SMESH::DownCast< SMESH_GroupBase_i* >( myGroup )) + { + myBelongToMeshGroup->SetGroup( gr_i->GetGroupDS() ); + myGroup->Register(); + } } -} -void BelongToMeshGroup_i::SetGroupID( const char* theID ) // IOR or StoreName -{ - myID = theID; - if ( strncmp( "IOR:", myID.c_str(), 4 ) == 0 ) // transient mode, no GUI + void BelongToMeshGroup_i::SetGroupID( const char* theID ) // IOR or StoreName { - CORBA::Object_var obj = SMESH_Gen_i::GetORB()->string_to_object( myID.c_str() ); - SetGroup( SMESH::SMESH_GroupBase::_narrow( obj )); - } - else if ( strncmp( "0:", myID.c_str(), 2 ) == 0 ) // transient mode + GUI - { - SALOMEDS::SObject_wrap aSObj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( myID.c_str() ); - if ( !aSObj->_is_nil() ) { - CORBA::Object_var obj = aSObj->GetObject(); + myID = theID; + if ( strncmp( "IOR:", myID.c_str(), 4 ) == 0 ) // transient mode, no GUI + { + CORBA::Object_var obj = SMESH_Gen_i::GetORB()->string_to_object( myID.c_str() ); SetGroup( SMESH::SMESH_GroupBase::_narrow( obj )); } + else if ( strncmp( "0:", myID.c_str(), 2 ) == 0 ) // transient mode + GUI + { + SALOMEDS::SObject_wrap aSObj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( myID.c_str() ); + if ( !aSObj->_is_nil() ) { + CORBA::Object_var obj = aSObj->GetObject(); + SetGroup( SMESH::SMESH_GroupBase::_narrow( obj )); + } + } + else if ( !myID.empty() ) // persistent mode + { + myBelongToMeshGroup->SetStoreName( myID ); + } } - else if ( !myID.empty() ) // persistent mode - { - myBelongToMeshGroup->SetStoreName( myID ); - } -} -std::string BelongToMeshGroup_i::GetGroupID() -{ - if ( myGroup->_is_nil() ) - SMESH::SMESH_GroupBase_var( GetGroup() ); // decref the returned pointer + std::string BelongToMeshGroup_i::GetGroupID() + { + if ( myGroup->_is_nil() ) + SMESH::SMESH_GroupBase_var( GetGroup() ); // decref the returned pointer - if ( !myGroup->_is_nil() ) - myID = SMESH_Gen_i::GetORB()->object_to_string( myGroup ); + if ( !myGroup->_is_nil() ) + myID = SMESH_Gen_i::GetORB()->object_to_string( myGroup ); - return myID; -} + return myID; + } -SMESH::SMESH_GroupBase_ptr BelongToMeshGroup_i::GetGroup() -{ - if ( myGroup->_is_nil() && myBelongToMeshGroup->GetGroup() ) + SMESH::SMESH_GroupBase_ptr BelongToMeshGroup_i::GetGroup() { - // search for a group in a current study - SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); - if ( StudyContext* sc = aSMESHGen->GetStudyContext() ) + if ( myGroup->_is_nil() && myBelongToMeshGroup->GetGroup() ) { - int id = 1; - std::string ior; - while (true) + // search for a group in a current study + SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); + if ( StudyContext* sc = aSMESHGen->GetStudyContext() ) { - ior = sc->getIORbyId( id++ ); - if ( ior.empty() ) break; - CORBA::Object_var obj = aSMESHGen->GetORB()->string_to_object( ior.c_str() ); - if ( SMESH_GroupBase_i* g_i = SMESH::DownCast( obj )) - if ( g_i->GetGroupDS() == myBelongToMeshGroup->GetGroup() ) - { - SetGroup( g_i->_this() ); - break; - } + int id = 1; + std::string ior; + while (true) + { + ior = sc->getIORbyId( id++ ); + if ( ior.empty() ) break; + CORBA::Object_var obj = aSMESHGen->GetORB()->string_to_object( ior.c_str() ); + if ( SMESH_GroupBase_i* g_i = SMESH::DownCast( obj )) + if ( g_i->GetGroupDS() == myBelongToMeshGroup->GetGroup() ) + { + SetGroup( g_i->_this() ); + break; + } + } } } + return SMESH::SMESH_GroupBase::_duplicate( myGroup ); } - return SMESH::SMESH_GroupBase::_duplicate( myGroup ); -} -FunctorType BelongToMeshGroup_i::GetFunctorType() -{ - return SMESH::FT_BelongToMeshGroup; -} + FunctorType BelongToMeshGroup_i::GetFunctorType() + { + return SMESH::FT_BelongToMeshGroup; + } -/* - Class : BelongToGeom_i - Description : Predicate for selection on geometrical support -*/ -BelongToGeom_i::BelongToGeom_i() -{ - myBelongToGeomPtr.reset( new Controls::BelongToGeom() ); - myFunctorPtr = myPredicatePtr = myBelongToGeomPtr; - myShapeName = 0; - myShapeID = 0; -} + /* + Class : BelongToGeom_i + Description : Predicate for selection on geometrical support + */ + BelongToGeom_i::BelongToGeom_i() + { + myBelongToGeomPtr.reset( new Controls::BelongToGeom() ); + myFunctorPtr = myPredicatePtr = myBelongToGeomPtr; + myShapeName = 0; + myShapeID = 0; + } -BelongToGeom_i::~BelongToGeom_i() -{ - CORBA::string_free( myShapeName ); - CORBA::string_free( myShapeID ); -} + BelongToGeom_i::~BelongToGeom_i() + { + CORBA::string_free( myShapeName ); + CORBA::string_free( myShapeID ); + } -void BelongToGeom_i::SetGeom( GEOM::GEOM_Object_ptr theGeom ) -{ - if ( theGeom->_is_nil() ) - return; - TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); - myBelongToGeomPtr->SetGeom( aLocShape ); - TPythonDump()<_is_nil() ) + return; + TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); + myBelongToGeomPtr->SetGeom( aLocShape ); + TPythonDump()<SetGeom( theShape ); -} + void BelongToGeom_i::SetGeom( const TopoDS_Shape& theShape ) + { + myBelongToGeomPtr->SetGeom( theShape ); + } -void BelongToGeom_i::SetElementType(ElementType theType) -{ - myBelongToGeomPtr->SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<SetGeom( getShapeByName( myShapeName ) ); - TPythonDump()<SetGeom( getShapeByName( myShapeName ) ); + TPythonDump()<SetGeom( S ); + } - TopoDS_Shape S; - if ( hasName && hasID ) + char* BelongToGeom_i::GetShapeName() { - S = getShapeByID( myShapeID ); - if ( S.IsNull() ) - S = getShapeByName( myShapeName ); + return CORBA::string_dup( myShapeName ); } - else + + char* BelongToGeom_i::GetShapeID() { - S = hasID ? getShapeByID( myShapeID ) : getShapeByName( myShapeName ); + return CORBA::string_dup( myShapeID ); } - myBelongToGeomPtr->SetGeom( S ); -} -char* BelongToGeom_i::GetShapeName() -{ - return CORBA::string_dup( myShapeName ); -} + void BelongToGeom_i::SetTolerance( CORBA::Double theToler ) + { + myBelongToGeomPtr->SetTolerance( theToler ); + TPythonDump()<GetTolerance(); + } -void BelongToGeom_i::SetTolerance( CORBA::Double theToler ) -{ - myBelongToGeomPtr->SetTolerance( theToler ); - TPythonDump()<GetTolerance(); -} + BelongToSurface_i::~BelongToSurface_i() + { + CORBA::string_free( myShapeName ); + CORBA::string_free( myShapeID ); + } -/* - Class : BelongToSurface_i - Description : Predicate for selection on geometrical support -*/ -BelongToSurface_i::BelongToSurface_i( const Handle(Standard_Type)& theSurfaceType ) -{ - myElementsOnSurfacePtr.reset( new Controls::ElementsOnSurface() ); - myFunctorPtr = myPredicatePtr = myElementsOnSurfacePtr; - myShapeName = 0; - myShapeID = 0; - mySurfaceType = theSurfaceType; -} + void BelongToSurface_i::SetSurface( GEOM::GEOM_Object_ptr theGeom, ElementType theType ) + { + if ( theGeom->_is_nil() ) + return; + TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); -BelongToSurface_i::~BelongToSurface_i() -{ - CORBA::string_free( myShapeName ); - CORBA::string_free( myShapeID ); -} + if ( aLocShape.ShapeType() == TopAbs_FACE ) + { + Handle(Geom_Surface) aSurf = BRep_Tool::Surface( TopoDS::Face( aLocShape ) ); + if ( !aSurf.IsNull() && aSurf->DynamicType() == mySurfaceType ) + { + myElementsOnSurfacePtr->SetSurface( aLocShape, (SMDSAbs_ElementType)theType ); + return; + } + } -void BelongToSurface_i::SetSurface( GEOM::GEOM_Object_ptr theGeom, ElementType theType ) -{ - if ( theGeom->_is_nil() ) - return; - TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); + myElementsOnSurfacePtr->SetSurface( TopoDS_Shape(), (SMDSAbs_ElementType)theType ); + } + + void BelongToSurface_i::SetShapeName( const char* theName, ElementType theType ) + { + CORBA::string_free( myShapeName ); + myShapeName = CORBA::string_dup( theName ); + myElementsOnSurfacePtr->SetSurface( getShapeByName( myShapeName ), (SMDSAbs_ElementType)theType ); + TPythonDump()<DynamicType() == mySurfaceType ) + CORBA::string_free( myShapeName ); + CORBA::string_free( myShapeID ); + myShapeName = CORBA::string_dup( theName ); + myShapeID = CORBA::string_dup( theID ); + bool hasName = ( theName && theName[0] ); + bool hasID = ( theID && theID[0] ); + + TopoDS_Shape S; + if ( hasName && hasID ) { - myElementsOnSurfacePtr->SetSurface( aLocShape, (SMDSAbs_ElementType)theType ); - return; + S = getShapeByID( myShapeID ); + if ( S.IsNull() ) + S = getShapeByName( myShapeName ); + } + else + { + S = hasID ? getShapeByID( myShapeID ) : getShapeByName( myShapeName ); } + myElementsOnSurfacePtr->SetSurface( S, (SMDSAbs_ElementType)theType ); } - myElementsOnSurfacePtr->SetSurface( TopoDS_Shape(), (SMDSAbs_ElementType)theType ); -} + char* BelongToSurface_i::GetShapeName() + { + return CORBA::string_dup( myShapeName ); + } -void BelongToSurface_i::SetShapeName( const char* theName, ElementType theType ) -{ - CORBA::string_free( myShapeName ); - myShapeName = CORBA::string_dup( theName ); - myElementsOnSurfacePtr->SetSurface( getShapeByName( myShapeName ), (SMDSAbs_ElementType)theType ); - TPythonDump()<SetTolerance( theToler ); + TPythonDump()<GetTolerance(); } - else + + void BelongToSurface_i::SetUseBoundaries( CORBA::Boolean theUseBndRestrictions ) { - S = hasID ? getShapeByID( myShapeID ) : getShapeByName( myShapeName ); + myElementsOnSurfacePtr->SetUseBoundaries( theUseBndRestrictions ); + TPythonDump()<SetSurface( S, (SMDSAbs_ElementType)theType ); -} -char* BelongToSurface_i::GetShapeName() -{ - return CORBA::string_dup( myShapeName ); -} + CORBA::Boolean BelongToSurface_i::GetUseBoundaries() + { + return myElementsOnSurfacePtr->GetUseBoundaries(); + } -char* BelongToSurface_i::GetShapeID() -{ - return CORBA::string_dup( myShapeID ); -} -void BelongToSurface_i::SetTolerance( CORBA::Double theToler ) -{ - myElementsOnSurfacePtr->SetTolerance( theToler ); - TPythonDump()<GetTolerance(); -} + BelongToPlane_i::BelongToPlane_i() + : BelongToSurface_i( STANDARD_TYPE( Geom_Plane ) ) + { + } -void BelongToSurface_i::SetUseBoundaries( CORBA::Boolean theUseBndRestrictions ) -{ - myElementsOnSurfacePtr->SetUseBoundaries( theUseBndRestrictions ); - TPythonDump()<GetUseBoundaries(); -} + FunctorType BelongToPlane_i::GetFunctorType() + { + return FT_BelongToPlane; + } + /* + Class : BelongToCylinder_i + Description : Verify whether mesh element lie in pointed Geom planar object + */ -/* - Class : BelongToPlane_i - Description : Verify whether mesh element lie in pointed Geom planar object -*/ + BelongToCylinder_i::BelongToCylinder_i() + : BelongToSurface_i( STANDARD_TYPE( Geom_CylindricalSurface ) ) + { + } -BelongToPlane_i::BelongToPlane_i() -: BelongToSurface_i( STANDARD_TYPE( Geom_Plane ) ) -{ -} + void BelongToCylinder_i::SetCylinder( GEOM::GEOM_Object_ptr theGeom, ElementType theType ) + { + BelongToSurface_i::SetSurface( theGeom, theType ); + TPythonDump()<_is_nil() ) + return; + TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); + if ( !aLocShape.IsNull() && aLocShape.ShapeType() != TopAbs_FACE ) + aLocShape.Nullify(); + + BelongToSurface_i::myElementsOnSurfacePtr->SetSurface( aLocShape, (SMDSAbs_ElementType)theType ); + TPythonDump()<_is_nil() ) + return; + TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); + myLyingOnGeomPtr->SetGeom( aLocShape ); + TPythonDump()<_is_nil() ) - return; - TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); - if ( !aLocShape.IsNull() && aLocShape.ShapeType() != TopAbs_FACE ) - aLocShape.Nullify(); - - BelongToSurface_i::myElementsOnSurfacePtr->SetSurface( aLocShape, (SMDSAbs_ElementType)theType ); - TPythonDump()<SetGeom( theShape ); + } -FunctorType BelongToGenSurface_i::GetFunctorType() -{ - return FT_BelongToGenSurface; -} + void LyingOnGeom_i::SetElementType(ElementType theType){ + myLyingOnGeomPtr->SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<SetGeom( getShapeByName( myShapeName ) ); + TPythonDump()<_is_nil() ) - return; - TopoDS_Shape aLocShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theGeom ); - myLyingOnGeomPtr->SetGeom( aLocShape ); - TPythonDump()<SetGeom( S ); + } -void LyingOnGeom_i::SetGeom( const TopoDS_Shape& theShape ) -{ - myLyingOnGeomPtr->SetGeom( theShape ); -} + char* LyingOnGeom_i::GetShapeName() + { + return CORBA::string_dup( myShapeName ); + } -void LyingOnGeom_i::SetElementType(ElementType theType){ - myLyingOnGeomPtr->SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetTolerance( theToler ); + TPythonDump()<SetGeom( getShapeByName( myShapeName ) ); - TPythonDump()<GetTolerance(); + } -void LyingOnGeom_i::SetShape( const char* theID, const char* theName ) -{ - CORBA::string_free( myShapeName ); - CORBA::string_free( myShapeID ); - myShapeName = CORBA::string_dup( theName ); - myShapeID = CORBA::string_dup( theID ); - bool hasName = ( theName && theName[0] ); - bool hasID = ( theID && theID[0] ); + /* + Class : FreeBorders_i + Description : Predicate for free borders + */ + FreeBorders_i::FreeBorders_i() + { + myPredicatePtr.reset(new Controls::FreeBorders()); + myFunctorPtr = myPredicatePtr; + } - TopoDS_Shape S; - if ( hasName && hasID ) + FunctorType FreeBorders_i::GetFunctorType() { - S = getShapeByID( myShapeID ); - if ( S.IsNull() ) - S = getShapeByName( myShapeName ); + return SMESH::FT_FreeBorders; } - else + + /* + Class : FreeEdges_i + Description : Predicate for free borders + */ + FreeEdges_i::FreeEdges_i() + : myFreeEdgesPtr( new Controls::FreeEdges() ) { - S = hasID ? getShapeByID( myShapeID ) : getShapeByName( myShapeName ); + myFunctorPtr = myPredicatePtr = myFreeEdgesPtr; } - myLyingOnGeomPtr->SetGeom( S ); -} -char* LyingOnGeom_i::GetShapeName() -{ - return CORBA::string_dup( myShapeName ); -} + SMESH::FreeEdges::Borders* FreeEdges_i::GetBorders() + { + SMESH::Controls::FreeEdges::TBorders aBorders; + myFreeEdgesPtr->GetBoreders( aBorders ); -char* LyingOnGeom_i::GetShapeID() -{ - return CORBA::string_dup( myShapeID ); -} + long i = 0, iEnd = aBorders.size(); -void LyingOnGeom_i::SetTolerance( CORBA::Double theToler ) -{ - myLyingOnGeomPtr->SetTolerance( theToler ); - TPythonDump()<length(iEnd); -CORBA::Double LyingOnGeom_i::GetTolerance() -{ - return myLyingOnGeomPtr->GetTolerance(); -} + SMESH::Controls::FreeEdges::TBorders::const_iterator anIter; + for ( anIter = aBorders.begin() ; anIter != aBorders.end(); anIter++, i++ ) + { + const SMESH::Controls::FreeEdges::Border& aBord = *anIter; + SMESH::FreeEdges::Border &aBorder = aResult[ i ]; -/* - Class : FreeBorders_i - Description : Predicate for free borders -*/ -FreeBorders_i::FreeBorders_i() -{ - myPredicatePtr.reset(new Controls::FreeBorders()); - myFunctorPtr = myPredicatePtr; -} + aBorder.myElemId = aBord.myElemId; + aBorder.myPnt1 = aBord.myPntId[ 0 ]; + aBorder.myPnt2 = aBord.myPntId[ 1 ]; + } + return aResult._retn(); + } -FunctorType FreeBorders_i::GetFunctorType() -{ - return SMESH::FT_FreeBorders; -} + FunctorType FreeEdges_i::GetFunctorType() + { + return SMESH::FT_FreeEdges; + } -/* - Class : FreeEdges_i - Description : Predicate for free borders -*/ -FreeEdges_i::FreeEdges_i() -: myFreeEdgesPtr( new Controls::FreeEdges() ) -{ - myFunctorPtr = myPredicatePtr = myFreeEdgesPtr; -} + /* + Class : FreeFaces_i + Description : Predicate for free faces + */ + FreeFaces_i::FreeFaces_i() + { + myPredicatePtr.reset(new Controls::FreeFaces()); + myFunctorPtr = myPredicatePtr; + } -SMESH::FreeEdges::Borders* FreeEdges_i::GetBorders() -{ - SMESH::Controls::FreeEdges::TBorders aBorders; - myFreeEdgesPtr->GetBoreders( aBorders ); + FunctorType FreeFaces_i::GetFunctorType() + { + return SMESH::FT_FreeFaces; + } - long i = 0, iEnd = aBorders.size(); + /* + Class : FreeNodes_i + Description : Predicate for free nodes + */ + FreeNodes_i::FreeNodes_i() + { + myPredicatePtr.reset(new Controls::FreeNodes()); + myFunctorPtr = myPredicatePtr; + } - SMESH::FreeEdges::Borders_var aResult = new SMESH::FreeEdges::Borders; - aResult->length(iEnd); + FunctorType FreeNodes_i::GetFunctorType() + { + return SMESH::FT_FreeNodes; + } - SMESH::Controls::FreeEdges::TBorders::const_iterator anIter; - for ( anIter = aBorders.begin() ; anIter != aBorders.end(); anIter++, i++ ) + /* + Class : EqualNodes_i + Description : Predicate for Equal nodes + */ + EqualNodes_i::EqualNodes_i() { - const SMESH::Controls::FreeEdges::Border& aBord = *anIter; - SMESH::FreeEdges::Border &aBorder = aResult[ i ]; + myCoincidentNodesPtr.reset(new Controls::CoincidentNodes()); + myFunctorPtr = myPredicatePtr = myCoincidentNodesPtr; + } - aBorder.myElemId = aBord.myElemId; - aBorder.myPnt1 = aBord.myPntId[ 0 ]; - aBorder.myPnt2 = aBord.myPntId[ 1 ]; + FunctorType EqualNodes_i::GetFunctorType() + { + return SMESH::FT_EqualNodes; } - return aResult._retn(); -} -FunctorType FreeEdges_i::GetFunctorType() -{ - return SMESH::FT_FreeEdges; -} + void EqualNodes_i::SetTolerance( double tol ) + { + myCoincidentNodesPtr->SetTolerance( tol ); + } -/* - Class : FreeFaces_i - Description : Predicate for free faces -*/ -FreeFaces_i::FreeFaces_i() -{ - myPredicatePtr.reset(new Controls::FreeFaces()); - myFunctorPtr = myPredicatePtr; -} + double EqualNodes_i::GetTolerance() + { + return myCoincidentNodesPtr->GetTolerance(); + } -FunctorType FreeFaces_i::GetFunctorType() -{ - return SMESH::FT_FreeFaces; -} + /* + Class : EqualEdges_i + Description : Predicate for Equal Edges + */ + EqualEdges_i::EqualEdges_i() + { + myPredicatePtr.reset(new Controls::CoincidentElements1D()); + myFunctorPtr = myPredicatePtr; + } -/* - Class : FreeNodes_i - Description : Predicate for free nodes -*/ -FreeNodes_i::FreeNodes_i() -{ - myPredicatePtr.reset(new Controls::FreeNodes()); - myFunctorPtr = myPredicatePtr; -} + FunctorType EqualEdges_i::GetFunctorType() + { + return SMESH::FT_EqualEdges; + } -FunctorType FreeNodes_i::GetFunctorType() -{ - return SMESH::FT_FreeNodes; -} + /* + Class : EqualFaces_i + Description : Predicate for Equal Faces + */ + EqualFaces_i::EqualFaces_i() + { + myPredicatePtr.reset(new Controls::CoincidentElements2D()); + myFunctorPtr = myPredicatePtr; + } -/* - Class : EqualNodes_i - Description : Predicate for Equal nodes -*/ -EqualNodes_i::EqualNodes_i() -{ - myCoincidentNodesPtr.reset(new Controls::CoincidentNodes()); - myFunctorPtr = myPredicatePtr = myCoincidentNodesPtr; -} + FunctorType EqualFaces_i::GetFunctorType() + { + return SMESH::FT_EqualFaces; + } -FunctorType EqualNodes_i::GetFunctorType() -{ - return SMESH::FT_EqualNodes; -} + /* + Class : EqualVolumes_i + Description : Predicate for Equal Volumes + */ + EqualVolumes_i::EqualVolumes_i() + { + myPredicatePtr.reset(new Controls::CoincidentElements3D()); + myFunctorPtr = myPredicatePtr; + } -void EqualNodes_i::SetTolerance( double tol ) -{ - myCoincidentNodesPtr->SetTolerance( tol ); -} + FunctorType EqualVolumes_i::GetFunctorType() + { + return SMESH::FT_EqualVolumes; + } -double EqualNodes_i::GetTolerance() -{ - return myCoincidentNodesPtr->GetTolerance(); -} -/* - Class : EqualEdges_i - Description : Predicate for Equal Edges -*/ -EqualEdges_i::EqualEdges_i() -{ - myPredicatePtr.reset(new Controls::CoincidentElements1D()); - myFunctorPtr = myPredicatePtr; -} + /* + Class : RangeOfIds_i + Description : Predicate for Range of Ids. + Range may be specified with two ways. + 1. Using AddToRange method + 2. With SetRangeStr method. Parameter of this method is a string + like as "1,2,3,50-60,63,67,70-" + */ -FunctorType EqualEdges_i::GetFunctorType() -{ - return SMESH::FT_EqualEdges; -} + RangeOfIds_i::RangeOfIds_i() + { + myRangeOfIdsPtr.reset( new Controls::RangeOfIds() ); + myFunctorPtr = myPredicatePtr = myRangeOfIdsPtr; + } -/* - Class : EqualFaces_i - Description : Predicate for Equal Faces -*/ -EqualFaces_i::EqualFaces_i() -{ - myPredicatePtr.reset(new Controls::CoincidentElements2D()); - myFunctorPtr = myPredicatePtr; -} + void RangeOfIds_i::SetRange( const SMESH::smIdType_array& theIds ) + { + SMESH::smIdType iEnd = theIds.length(); + for ( SMESH::smIdType i = 0; i < iEnd; i++ ) + myRangeOfIdsPtr->AddToRange( theIds[ i ] ); + TPythonDump()<SetRangeStr( + TCollection_AsciiString( (Standard_CString)theRange ) ); + } -/* - Class : EqualVolumes_i - Description : Predicate for Equal Volumes -*/ -EqualVolumes_i::EqualVolumes_i() -{ - myPredicatePtr.reset(new Controls::CoincidentElements3D()); - myFunctorPtr = myPredicatePtr; -} + char* RangeOfIds_i::GetRangeStr() + { + TCollection_AsciiString aStr; + myRangeOfIdsPtr->GetRangeStr( aStr ); + return CORBA::string_dup( aStr.ToCString() ); + } -FunctorType EqualVolumes_i::GetFunctorType() -{ - return SMESH::FT_EqualVolumes; -} + void RangeOfIds_i::SetElementType( ElementType theType ) + { + myRangeOfIdsPtr->SetType( SMDSAbs_ElementType( theType ) ); + TPythonDump()<SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<AddToRange( theIds[ i ] ); - TPythonDump()<SetRangeStr( - TCollection_AsciiString( (Standard_CString)theRange ) ); -} + /* + Class : GroupColor_i + Description : Functor for check color of group to which mesh element belongs to + */ + GroupColor_i::GroupColor_i() + { + myGroupColorPtr.reset(new Controls::GroupColor()); + myFunctorPtr = myPredicatePtr = myGroupColorPtr; + } -char* RangeOfIds_i::GetRangeStr() -{ - TCollection_AsciiString aStr; - myRangeOfIdsPtr->GetRangeStr( aStr ); - return CORBA::string_dup( aStr.ToCString() ); -} + FunctorType GroupColor_i::GetFunctorType() + { + return SMESH::FT_GroupColor; + } -void RangeOfIds_i::SetElementType( ElementType theType ) -{ - myRangeOfIdsPtr->SetType( SMDSAbs_ElementType( theType ) ); - TPythonDump()<SetColorStr( + TCollection_AsciiString( (Standard_CString)theColor ) ); + TPythonDump()<GetColorStr( aStr ); + return CORBA::string_dup( aStr.ToCString() ); + } -/* - Class : LinearOrQuadratic_i - Description : Predicate to verify whether a mesh element is linear -*/ -LinearOrQuadratic_i::LinearOrQuadratic_i() -{ - myLinearOrQuadraticPtr.reset(new Controls::LinearOrQuadratic()); - myFunctorPtr = myPredicatePtr = myLinearOrQuadraticPtr; -} + void GroupColor_i::SetElementType(ElementType theType) + { + myGroupColorPtr->SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<SetGeomType(SMDSAbs_GeometryType(theType)); + TPythonDump()<GetGeomType(); + } -void GroupColor_i::SetColorStr( const char* theColor ) -{ - myGroupColorPtr->SetColorStr( - TCollection_AsciiString( (Standard_CString)theColor ) ); - TPythonDump()<GetColorStr( aStr ); - return CORBA::string_dup( aStr.ToCString() ); -} + /* + Class : ElemEntityType_i + Description : Predicate check is element has indicated entity type + */ + ElemEntityType_i::ElemEntityType_i() + { + myElemEntityTypePtr.reset(new Controls::ElemEntityType()); + myFunctorPtr = myPredicatePtr = myElemEntityTypePtr; + } -void GroupColor_i::SetElementType(ElementType theType) -{ - myGroupColorPtr->SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetType(SMDSAbs_ElementType(theType)); + TPythonDump()<SetElemEntityType(SMDSAbs_EntityType (theEntityType)); + TPythonDump()<GetElemEntityType(); + } -void ElemGeomType_i::SetElementType(ElementType theType) -{ - myElemGeomTypePtr->SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetGeomType(SMDSAbs_GeometryType(theType)); - TPythonDump()<GetGeomType(); -} - -FunctorType ElemGeomType_i::GetFunctorType() -{ - return SMESH::FT_ElemGeomType; -} - -/* - Class : ElemEntityType_i - Description : Predicate check is element has indicated entity type -*/ -ElemEntityType_i::ElemEntityType_i() -{ - myElemEntityTypePtr.reset(new Controls::ElemEntityType()); - myFunctorPtr = myPredicatePtr = myElemEntityTypePtr; -} - -void ElemEntityType_i::SetElementType(ElementType theType) -{ - myElemEntityTypePtr->SetType(SMDSAbs_ElementType(theType)); - TPythonDump()<SetElemEntityType(SMDSAbs_EntityType (theEntityType)); - TPythonDump()<GetElemEntityType(); -} - -FunctorType ElemEntityType_i::GetFunctorType() -{ - return SMESH::FT_EntityType; -} - -/* - Class : CoplanarFaces_i - Description : Returns true if a mesh face is a coplanar neighbour to a given one -*/ -CoplanarFaces_i::CoplanarFaces_i() -{ - myCoplanarFacesPtr.reset(new Controls::CoplanarFaces()); - myFunctorPtr = myPredicatePtr = myCoplanarFacesPtr; -} + /* + Class : CoplanarFaces_i + Description : Returns true if a mesh face is a coplanar neighbour to a given one + */ + CoplanarFaces_i::CoplanarFaces_i() + { + myCoplanarFacesPtr.reset(new Controls::CoplanarFaces()); + myFunctorPtr = myPredicatePtr = myCoplanarFacesPtr; + } -void CoplanarFaces_i::SetFace ( CORBA::Long theFaceID ) -{ - myCoplanarFacesPtr->SetFace(theFaceID); - TPythonDump()<SetFace(theFaceID); + TPythonDump()<SetTolerance(theToler); - TPythonDump()<SetTolerance(theToler); + TPythonDump()<GetFace(); -} + CORBA::Long CoplanarFaces_i::GetFace () const + { + return myCoplanarFacesPtr->GetFace(); + } -char* CoplanarFaces_i::GetFaceAsString () const -{ - TCollection_AsciiString str(Standard_Integer(myCoplanarFacesPtr->GetFace())); - return CORBA::string_dup( str.ToCString() ); -} + char* CoplanarFaces_i::GetFaceAsString () const + { + TCollection_AsciiString str(Standard_Integer(myCoplanarFacesPtr->GetFace())); + return CORBA::string_dup( str.ToCString() ); + } -CORBA::Double CoplanarFaces_i::GetTolerance() const -{ - return myCoplanarFacesPtr->GetTolerance(); -} + CORBA::Double CoplanarFaces_i::GetTolerance() const + { + return myCoplanarFacesPtr->GetTolerance(); + } -FunctorType CoplanarFaces_i::GetFunctorType() -{ - return SMESH::FT_CoplanarFaces; -} + FunctorType CoplanarFaces_i::GetFunctorType() + { + return SMESH::FT_CoplanarFaces; + } -/* - * Class : ConnectedElements_i - * Description : Returns true if an element is connected via other elements to the element - * located at a given point. - */ -ConnectedElements_i::ConnectedElements_i() -{ - myConnectedElementsPtr.reset(new Controls::ConnectedElements()); - myFunctorPtr = myPredicatePtr = myConnectedElementsPtr; -} + /* + * Class : ConnectedElements_i + * Description : Returns true if an element is connected via other elements to the element + * located at a given point. + */ + ConnectedElements_i::ConnectedElements_i() + { + myConnectedElementsPtr.reset(new Controls::ConnectedElements()); + myFunctorPtr = myPredicatePtr = myConnectedElementsPtr; + } -FunctorType ConnectedElements_i::GetFunctorType() -{ - return FT_ConnectedElements; -} + FunctorType ConnectedElements_i::GetFunctorType() + { + return FT_ConnectedElements; + } -void ConnectedElements_i::SetElementType( ElementType theType ) -{ - myConnectedElementsPtr->SetType( SMDSAbs_ElementType( theType )); - TPythonDump() << this << ".SetElementType( " << theType << " )"; -} + void ConnectedElements_i::SetElementType( ElementType theType ) + { + myConnectedElementsPtr->SetType( SMDSAbs_ElementType( theType )); + TPythonDump() << this << ".SetElementType( " << theType << " )"; + } -void ConnectedElements_i::SetPoint( CORBA::Double x, CORBA::Double y, CORBA::Double z ) -{ - myConnectedElementsPtr->SetPoint( x,y,z ); - myVertexID.clear(); - TPythonDump() << this << ".SetPoint( " << x << ", " << y << ", " << z << " )"; -} + void ConnectedElements_i::SetPoint( CORBA::Double x, CORBA::Double y, CORBA::Double z ) + { + myConnectedElementsPtr->SetPoint( x,y,z ); + myVertexID.clear(); + TPythonDump() << this << ".SetPoint( " << x << ", " << y << ", " << z << " )"; + } -void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex ) -{ - TopoDS_Shape shape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( vertex ); - if ( shape.IsNull() ) - THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetVertex(): NULL Vertex", - SALOME::BAD_PARAM ); - - TopExp_Explorer v( shape, TopAbs_VERTEX ); - if ( !v.More() ) - THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetVertex(): empty vertex", - SALOME::BAD_PARAM ); - - gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( v.Current() )); - myConnectedElementsPtr->SetPoint( p.X(), p.Y(), p.Z() ); - // - CORBA::String_var id = vertex->GetStudyEntry(); - myVertexID = id.in(); - - TPythonDump() << this << ".SetVertex( " << vertex << " )"; -} + void ConnectedElements_i::SetVertex( GEOM::GEOM_Object_ptr vertex ) + { + TopoDS_Shape shape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( vertex ); + if ( shape.IsNull() ) + THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetVertex(): NULL Vertex", + SALOME::BAD_PARAM ); + + TopExp_Explorer v( shape, TopAbs_VERTEX ); + if ( !v.More() ) + THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetVertex(): empty vertex", + SALOME::BAD_PARAM ); + + gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( v.Current() )); + myConnectedElementsPtr->SetPoint( p.X(), p.Y(), p.Z() ); + // + CORBA::String_var id = vertex->GetStudyEntry(); + myVertexID = id.in(); + + TPythonDump() << this << ".SetVertex( " << vertex << " )"; + } -void ConnectedElements_i::SetNode ( SMESH::smIdType nodeID ) -{ - if ( nodeID < 1 ) - THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetNode(): nodeID must be > 0", - SALOME::BAD_PARAM ); + void ConnectedElements_i::SetNode ( SMESH::smIdType nodeID ) + { + if ( nodeID < 1 ) + THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetNode(): nodeID must be > 0", + SALOME::BAD_PARAM ); - myConnectedElementsPtr->SetNode( nodeID ); - myVertexID.clear(); - TPythonDump() << this << ".SetNode( " << nodeID << " )"; -} + myConnectedElementsPtr->SetNode( nodeID ); + myVertexID.clear(); + TPythonDump() << this << ".SetNode( " << nodeID << " )"; + } -/*! - * \brief This is a comfort method for Filter dialog - */ -void ConnectedElements_i::SetThreshold ( const char* threshold, - SMESH::ConnectedElements::ThresholdType type ) -{ - if ( !threshold ) - THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetThreshold(): NULL threshold", - SALOME::BAD_PARAM ); - switch ( type ) + /*! + * \brief This is a comfort method for Filter dialog + */ + void ConnectedElements_i::SetThreshold ( const char* threshold, + SMESH::ConnectedElements::ThresholdType type ) { - case SMESH::ConnectedElements::POINT: // read 3 node coordinates /////////////////// + if ( !threshold ) + THROW_SALOME_CORBA_EXCEPTION( "ConnectedElements_i::SetThreshold(): NULL threshold", + SALOME::BAD_PARAM ); + switch ( type ) { - std::vector< double > xyz; - char* endptr; - do + case SMESH::ConnectedElements::POINT: // read 3 node coordinates /////////////////// { - // skip a separator - while ( *threshold && - *threshold != '+' && - *threshold != '-' && - !isdigit( *threshold )) - ++threshold; - if ( !*threshold ) - break; - // read a coordinate - xyz.push_back( strtod( threshold, &endptr )); - if ( threshold == endptr ) + std::vector< double > xyz; + char* endptr; + do { - xyz.resize( xyz.size() - 1 ); - break; + // skip a separator + while ( *threshold && + *threshold != '+' && + *threshold != '-' && + !isdigit( *threshold )) + ++threshold; + if ( !*threshold ) + break; + // read a coordinate + xyz.push_back( strtod( threshold, &endptr )); + if ( threshold == endptr ) + { + xyz.resize( xyz.size() - 1 ); + break; + } + threshold = endptr; } - threshold = endptr; - } - while ( xyz.size() < 3 ); + while ( xyz.size() < 3 ); - if ( xyz.size() < 3 ) - THROW_SALOME_CORBA_EXCEPTION - ( "ConnectedElements_i::SetThreshold(): invalid point coordinates", SALOME::BAD_PARAM ); + if ( xyz.size() < 3 ) + THROW_SALOME_CORBA_EXCEPTION + ( "ConnectedElements_i::SetThreshold(): invalid point coordinates", SALOME::BAD_PARAM ); - SetPoint( xyz[0], xyz[1], xyz[2] ); - break; + SetPoint( xyz[0], xyz[1], xyz[2] ); + break; + } + case SMESH::ConnectedElements::VERTEX: // get a VERTEX by its entry ///////////////// + { + SALOMEDS::SObject_wrap sobj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( threshold ); + if ( sobj->_is_nil() ) + THROW_SALOME_CORBA_EXCEPTION + ( "ConnectedElements_i::SetThreshold(): invalid vertex study entry", SALOME::BAD_PARAM ); + CORBA::Object_var obj = sobj->GetObject(); + GEOM::GEOM_Object_var vertex = GEOM::GEOM_Object::_narrow( obj ); + if ( vertex->_is_nil() ) + THROW_SALOME_CORBA_EXCEPTION + ( "ConnectedElements_i::SetThreshold(): no GEOM_Object in SObject", SALOME::BAD_PARAM ); + SetVertex( vertex ); + break; + } + case SMESH::ConnectedElements::NODE: // read a node ID //////////////////////////// + { + char* endptr; + int id = strtol( threshold, &endptr, 10 ); + if ( threshold == endptr ) + THROW_SALOME_CORBA_EXCEPTION + ( "ConnectedElements_i::SetThreshold(): invalid node ID", SALOME::BAD_PARAM ); + SetNode( id ); + break; + } + default: + THROW_SALOME_CORBA_EXCEPTION + ( "ConnectedElements_i::SetThreshold(): invalid ThresholdType", SALOME::BAD_PARAM ); } - case SMESH::ConnectedElements::VERTEX: // get a VERTEX by its entry ///////////////// + } + + char* ConnectedElements_i::GetThreshold ( SMESH::ConnectedElements::ThresholdType& type ) + { + std::string threshold; + if ( !myVertexID.empty() ) { - SALOMEDS::SObject_wrap sobj = SMESH_Gen_i::GetSMESHGen()->getStudyServant()->FindObjectID( threshold ); - if ( sobj->_is_nil() ) - THROW_SALOME_CORBA_EXCEPTION - ( "ConnectedElements_i::SetThreshold(): invalid vertex study entry", SALOME::BAD_PARAM ); - CORBA::Object_var obj = sobj->GetObject(); - GEOM::GEOM_Object_var vertex = GEOM::GEOM_Object::_narrow( obj ); - if ( vertex->_is_nil() ) - THROW_SALOME_CORBA_EXCEPTION - ( "ConnectedElements_i::SetThreshold(): no GEOM_Object in SObject", SALOME::BAD_PARAM ); - SetVertex( vertex ); - break; + threshold = myVertexID; + type = SMESH::ConnectedElements::VERTEX; } - case SMESH::ConnectedElements::NODE: // read a node ID //////////////////////////// + else { - char* endptr; - int id = strtol( threshold, &endptr, 10 ); - if ( threshold == endptr ) - THROW_SALOME_CORBA_EXCEPTION - ( "ConnectedElements_i::SetThreshold(): invalid node ID", SALOME::BAD_PARAM ); - SetNode( id ); - break; + std::vector xyz = myConnectedElementsPtr->GetPoint(); + if ( xyz.size() == 3 ) + { + threshold = SMESH_Comment( xyz[0] ) << "; " << xyz[1] << "; " << xyz[2]; + type = SMESH::ConnectedElements::POINT; + } + else + { + threshold = SMESH_Comment( myConnectedElementsPtr->GetNode() ); + type = SMESH::ConnectedElements::NODE; + } } - default: - THROW_SALOME_CORBA_EXCEPTION - ( "ConnectedElements_i::SetThreshold(): invalid ThresholdType", SALOME::BAD_PARAM ); + return CORBA::string_dup( threshold.c_str() ); } -} -char* ConnectedElements_i::GetThreshold ( SMESH::ConnectedElements::ThresholdType& type ) -{ - std::string threshold; - if ( !myVertexID.empty() ) + /* + Class : Comparator_i + Description : Base class for comparators + */ + Comparator_i::Comparator_i(): + myNumericalFunctor( NULL ) + {} + + Comparator_i::~Comparator_i() { - threshold = myVertexID; - type = SMESH::ConnectedElements::VERTEX; + if ( myNumericalFunctor ) + myNumericalFunctor->UnRegister(); } - else + + void Comparator_i::SetMargin( CORBA::Double theValue ) { - std::vector xyz = myConnectedElementsPtr->GetPoint(); - if ( xyz.size() == 3 ) - { - threshold = SMESH_Comment( xyz[0] ) << "; " << xyz[1] << "; " << xyz[2]; - type = SMESH::ConnectedElements::POINT; - } - else + myComparatorPtr->SetMargin( theValue ); + TPythonDump()<GetMargin(); + } + + void Comparator_i::SetNumFunctor( NumericalFunctor_ptr theFunct ) + { + if ( myNumericalFunctor ) + myNumericalFunctor->UnRegister(); + + myNumericalFunctor = DownCast(theFunct); + + if ( myNumericalFunctor ) { - threshold = SMESH_Comment( myConnectedElementsPtr->GetNode() ); - type = SMESH::ConnectedElements::NODE; + myComparatorPtr->SetNumFunctor( myNumericalFunctor->GetNumericalFunctor() ); + myNumericalFunctor->Register(); + TPythonDump()<UnRegister(); -} + NumericalFunctor_i* Comparator_i::GetNumFunctor_i() + { + return myNumericalFunctor; + } -void Comparator_i::SetMargin( CORBA::Double theValue ) -{ - myComparatorPtr->SetMargin( theValue ); - TPythonDump()<GetMargin(); -} + /* + Class : LessThan_i + Description : Comparator "<" + */ + LessThan_i::LessThan_i() + { + myComparatorPtr.reset( new Controls::LessThan() ); + myFunctorPtr = myPredicatePtr = myComparatorPtr; + } -void Comparator_i::SetNumFunctor( NumericalFunctor_ptr theFunct ) -{ - if ( myNumericalFunctor ) - myNumericalFunctor->UnRegister(); + FunctorType LessThan_i::GetFunctorType() + { + return SMESH::FT_LessThan; + } - myNumericalFunctor = DownCast(theFunct); - if ( myNumericalFunctor ) + /* + Class : MoreThan_i + Description : Comparator ">" + */ + MoreThan_i::MoreThan_i() { - myComparatorPtr->SetNumFunctor( myNumericalFunctor->GetNumericalFunctor() ); - myNumericalFunctor->Register(); - TPythonDump()<SetTolerance( theToler ); + TPythonDump()<GetTolerance(); + } + FunctorType EqualTo_i::GetFunctorType() + { + return SMESH::FT_EqualTo; + } -/* - Class : MoreThan_i - Description : Comparator ">" -*/ -MoreThan_i::MoreThan_i() -{ - myComparatorPtr.reset( new Controls::MoreThan() ); - myFunctorPtr = myPredicatePtr = myComparatorPtr; -} + /* + Class : LogicalNOT_i + Description : Logical NOT predicate + */ + LogicalNOT_i::LogicalNOT_i(): + myLogicalNOTPtr( new Controls::LogicalNOT() ), + myPredicate( NULL ) + { + myFunctorPtr = myPredicatePtr = myLogicalNOTPtr; + } -FunctorType MoreThan_i::GetFunctorType() -{ - return SMESH::FT_MoreThan; -} + LogicalNOT_i::~LogicalNOT_i() + { + if ( myPredicate ) + myPredicate->UnRegister(); + } + void LogicalNOT_i::SetPredicate( Predicate_ptr thePredicate ) + { + if ( myPredicate ) + myPredicate->UnRegister(); -/* - Class : EqualTo_i - Description : Comparator "=" -*/ -EqualTo_i::EqualTo_i() -: myEqualToPtr( new Controls::EqualTo() ) -{ - myFunctorPtr = myPredicatePtr = myComparatorPtr = myEqualToPtr; -} + myPredicate = SMESH::GetPredicate(thePredicate); -void EqualTo_i::SetTolerance( CORBA::Double theToler ) -{ - myEqualToPtr->SetTolerance( theToler ); - TPythonDump()<SetPredicate(myPredicate->GetPredicate()); + myPredicate->Register(); + TPythonDump()<GetTolerance(); -} + FunctorType LogicalNOT_i::GetFunctorType() + { + return SMESH::FT_LogicalNOT; + } -FunctorType EqualTo_i::GetFunctorType() -{ - return SMESH::FT_EqualTo; -} + Predicate_i* LogicalNOT_i::GetPredicate_i() + { + return myPredicate; + } -/* - Class : LogicalNOT_i - Description : Logical NOT predicate -*/ -LogicalNOT_i::LogicalNOT_i(): - myLogicalNOTPtr( new Controls::LogicalNOT() ), - myPredicate( NULL ) -{ - myFunctorPtr = myPredicatePtr = myLogicalNOTPtr; -} -LogicalNOT_i::~LogicalNOT_i() -{ - if ( myPredicate ) - myPredicate->UnRegister(); -} -void LogicalNOT_i::SetPredicate( Predicate_ptr thePredicate ) -{ - if ( myPredicate ) - myPredicate->UnRegister(); + /* + Class : LogicalBinary_i + Description : Base class for binary logical predicate + */ + LogicalBinary_i::LogicalBinary_i() + : myPredicate1( NULL ), + myPredicate2( NULL ) + {} - myPredicate = SMESH::GetPredicate(thePredicate); + LogicalBinary_i::~LogicalBinary_i() + { + if ( myPredicate1 ) + myPredicate1->UnRegister(); - if ( myPredicate ){ - myLogicalNOTPtr->SetPredicate(myPredicate->GetPredicate()); - myPredicate->Register(); - TPythonDump()<UnRegister(); } -} -FunctorType LogicalNOT_i::GetFunctorType() -{ - return SMESH::FT_LogicalNOT; -} + void LogicalBinary_i::SetMesh( SMESH_Mesh_ptr theMesh ) + { + if ( myPredicate1 ) + myPredicate1->SetMesh( theMesh ); -Predicate_i* LogicalNOT_i::GetPredicate_i() -{ - return myPredicate; -} + if ( myPredicate2 ) + myPredicate2->SetMesh( theMesh ); + } + void LogicalBinary_i::SetPredicate1( Predicate_ptr thePredicate ) + { + if ( myPredicate1 ) + myPredicate1->UnRegister(); + myPredicate1 = SMESH::GetPredicate(thePredicate); -/* - Class : LogicalBinary_i - Description : Base class for binary logical predicate -*/ -LogicalBinary_i::LogicalBinary_i() -: myPredicate1( NULL ), - myPredicate2( NULL ) -{} + if ( myPredicate1 ){ + myLogicalBinaryPtr->SetPredicate1(myPredicate1->GetPredicate()); + myPredicate1->Register(); + TPythonDump()<UnRegister(); + void LogicalBinary_i::SetPredicate2( Predicate_ptr thePredicate ) + { + if ( myPredicate2 ) + myPredicate2->UnRegister(); - if ( myPredicate2 ) - myPredicate2->UnRegister(); -} + myPredicate2 = SMESH::GetPredicate(thePredicate); -void LogicalBinary_i::SetMesh( SMESH_Mesh_ptr theMesh ) -{ - if ( myPredicate1 ) - myPredicate1->SetMesh( theMesh ); + if ( myPredicate2 ){ + myLogicalBinaryPtr->SetPredicate2(myPredicate2->GetPredicate()); + myPredicate2->Register(); + TPythonDump()<SetMesh( theMesh ); -} + Controls::LogicalBinaryPtr LogicalBinary_i::GetLogicalBinary() + { + return myLogicalBinaryPtr; + } -void LogicalBinary_i::SetPredicate1( Predicate_ptr thePredicate ) -{ - if ( myPredicate1 ) - myPredicate1->UnRegister(); + Predicate_i* LogicalBinary_i::GetPredicate1_i() + { + return myPredicate1; + } + Predicate_i* LogicalBinary_i::GetPredicate2_i() + { + return myPredicate2; + } - myPredicate1 = SMESH::GetPredicate(thePredicate); - if ( myPredicate1 ){ - myLogicalBinaryPtr->SetPredicate1(myPredicate1->GetPredicate()); - myPredicate1->Register(); - TPythonDump()<UnRegister(); + FunctorType LogicalAND_i::GetFunctorType() + { + return SMESH::FT_LogicalAND; + } - myPredicate2 = SMESH::GetPredicate(thePredicate); - if ( myPredicate2 ){ - myLogicalBinaryPtr->SetPredicate2(myPredicate2->GetPredicate()); - myPredicate2->Register(); - TPythonDump()<activate_object( this ); + } -FunctorType LogicalAND_i::GetFunctorType() -{ - return SMESH::FT_LogicalAND; -} + FilterManager_i::~FilterManager_i() + { + //TPythonDump()<activate_object( this ); -} - - -FilterManager_i::~FilterManager_i() -{ - //TPythonDump()<_this(); - TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); - TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); + TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); - TPythonDump()<_this(); + TPythonDump()<_this(); + TPythonDump()<_this(); + TPythonDump()<_this(); - return anObj._retn(); -} + FilterLibrary_ptr FilterManager_i::CreateLibrary() + { + SMESH::FilterLibrary_i* aServant = new SMESH::FilterLibrary_i(); + SMESH::FilterLibrary_var anObj = aServant->_this(); + TPythonDump()<UnRegister(); -//======================================================================= -// name : Filter_i::Filter_i -// Purpose : Constructor -//======================================================================= -Filter_i::Filter_i() -: myPredicate( NULL ) -{} - -//======================================================================= -// name : Filter_i::~Filter_i -// Purpose : Destructor -//======================================================================= -Filter_i::~Filter_i() -{ - if ( myPredicate ) - myPredicate->UnRegister(); + if(!CORBA::is_nil(myMesh)) + myMesh->UnRegister(); - if(!CORBA::is_nil(myMesh)) - myMesh->UnRegister(); + myPredicate = 0; + FindBaseObjects(); + } - myPredicate = 0; - FindBaseObjects(); -} + //======================================================================= + // name : Filter_i::SetPredicate + // Purpose : Set predicate + //======================================================================= + void Filter_i::SetPredicate( Predicate_ptr thePredicate ) + { + if ( myPredicate ) + myPredicate->UnRegister(); -//======================================================================= -// name : Filter_i::SetPredicate -// Purpose : Set predicate -//======================================================================= -void Filter_i::SetPredicate( Predicate_ptr thePredicate ) -{ - if ( myPredicate ) - myPredicate->UnRegister(); + myPredicate = SMESH::GetPredicate(thePredicate); - myPredicate = SMESH::GetPredicate(thePredicate); + if ( myPredicate ) + { + myFilter.SetPredicate( myPredicate->GetPredicate() ); + myPredicate->Register(); + if ( const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh)) + myPredicate->GetPredicate()->SetMesh( aMesh ); + TPythonDump()<GetPredicate() ); - myPredicate->Register(); - if ( const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh)) - myPredicate->GetPredicate()->SetMesh( aMesh ); - TPythonDump()<GetElementType() : SMESH::ALL; } - NotifyerAndWaiter::Modified(); -} - -//======================================================================= -// name : Filter_i::GetElementType -// Purpose : Get entity type -//======================================================================= -SMESH::ElementType Filter_i::GetElementType() -{ - return myPredicate != 0 ? myPredicate->GetElementType() : SMESH::ALL; -} -//======================================================================= -// name : Filter_i::SetMesh -// Purpose : Set mesh -//======================================================================= -void -Filter_i:: -SetMesh( SMESH_Mesh_ptr theMesh ) -{ - if(!CORBA::is_nil(theMesh)) - theMesh->Register(); - - if(!CORBA::is_nil(myMesh)) - myMesh->UnRegister(); + //======================================================================= + // name : Filter_i::SetMesh + // Purpose : Set mesh + //======================================================================= + void + Filter_i:: + SetMesh( SMESH_Mesh_ptr theMesh ) + { + if(!CORBA::is_nil(theMesh)) + theMesh->Register(); - myMesh = SMESH_Mesh::_duplicate( theMesh ); - TPythonDump()<UnRegister(); - if ( myPredicate ) - if ( const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(theMesh)) - myPredicate->GetPredicate()->SetMesh( aMesh ); -} + myMesh = SMESH_Mesh::_duplicate( theMesh ); + TPythonDump()<GetPredicate()->SetMesh( aMesh ); + } -//======================================================================= -// name : Filter_i::GetElementsId -// Purpose : Get ids of entities -//======================================================================= -void -Filter_i:: -GetElementsId( Predicate_i* thePredicate, - const SMDS_Mesh* theMesh, - Controls::Filter::TIdSequence& theSequence ) -{ - if (thePredicate) - Controls::Filter::GetElementsId(theMesh,thePredicate->GetPredicate(),theSequence); -} + SMESH::smIdType_array* + Filter_i:: + GetIDs() + { + return GetElementsId(myMesh); + } -void -Filter_i:: -GetElementsId( Predicate_i* thePredicate, - SMESH_Mesh_ptr theMesh, - Controls::Filter::TIdSequence& theSequence ) -{ - if (thePredicate) - if(const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(theMesh)) - Controls::Filter::GetElementsId(aMesh,thePredicate->GetPredicate(),theSequence); -} + //======================================================================= + // name : Filter_i::GetElementsId + // Purpose : Get ids of entities + //======================================================================= + void + Filter_i:: + GetElementsId( Predicate_i* thePredicate, + const SMDS_Mesh* theMesh, + Controls::Filter::TIdSequence& theSequence ) + { + if (thePredicate) + Controls::Filter::GetElementsId(theMesh,thePredicate->GetPredicate(),theSequence); + } -SMESH::smIdType_array* -Filter_i:: -GetElementsId( SMESH_Mesh_ptr theMesh ) -{ - SMESH::smIdType_array_var anArray = new SMESH::smIdType_array; - if(!CORBA::is_nil(theMesh) && myPredicate){ - theMesh->Load(); - Controls::Filter::TIdSequence aSequence; - GetElementsId(myPredicate,theMesh,aSequence); - long i = 0, iEnd = aSequence.size(); - anArray->length( iEnd ); - for ( ; i < iEnd; i++ ) - anArray[ i ] = aSequence[i]; + void + Filter_i:: + GetElementsId( Predicate_i* thePredicate, + SMESH_Mesh_ptr theMesh, + Controls::Filter::TIdSequence& theSequence ) + { + if (thePredicate) + if(const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(theMesh)) + Controls::Filter::GetElementsId(aMesh,thePredicate->GetPredicate(),theSequence); } - return anArray._retn(); -} -SMESH::smIdType_array* -Filter_i:: -GetElementsIdFromParts( const ListOfIDSources& theParts ) -{ - SMESH::smIdType_array_var array = new SMESH::smIdType_array; - if ( theParts.length() > 0 && myPredicate ) - { - SMESH_Mesh_ptr mesh = theParts[0]->GetMesh(); - mesh->Load(); - const SMDS_Mesh* meshDS = MeshPtr2SMDSMesh( mesh ); - Controls::Filter::TIdSequence totalSequence; - for ( CORBA::ULong i = 0; i < theParts.length(); ++i ) - { - if ( SMESH::Filter_i* filter = SMESH::DownCast( theParts[i] )) - filter->SetMesh( mesh ); - SMDS_ElemIteratorPtr iter = SMESH_Mesh_i::GetElements( theParts[i], GetElementType() ); - if ( iter && meshDS ) - { - Controls::Filter::TIdSequence sequence; - Controls::Filter::GetElementsId( meshDS, myPredicate->GetPredicate(), sequence, iter ); - totalSequence.insert( totalSequence.end(), sequence.begin(), sequence.end() ); - } + SMESH::smIdType_array* + Filter_i:: + GetElementsId( SMESH_Mesh_ptr theMesh ) + { + SMESH::smIdType_array_var anArray = new SMESH::smIdType_array; + if(!CORBA::is_nil(theMesh) && myPredicate){ + theMesh->Load(); + Controls::Filter::TIdSequence aSequence; + GetElementsId(myPredicate,theMesh,aSequence); + long i = 0, iEnd = aSequence.size(); + anArray->length( iEnd ); + for ( ; i < iEnd; i++ ) + anArray[ i ] = aSequence[i]; } - array->length( totalSequence.size() ); - for ( size_t i = 0; i < totalSequence.size(); ++i ) - array[ i ] = totalSequence[ i ]; + return anArray._retn(); } - return array._retn(); -} - -//============================================================================= -/*! - * \brief Returns number of mesh elements per each \a EntityType - */ -//============================================================================= -SMESH::smIdType_array* ::Filter_i::GetMeshInfo() -{ - SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); - aRes->length(SMESH::Entity_Last); - for (int i = 0; i < SMESH::Entity_Last; i++) - aRes[i] = 0; - - if ( !CORBA::is_nil(myMesh) && myPredicate ) + SMESH::smIdType_array* + Filter_i:: + GetElementsIdFromParts( const ListOfIDSources& theParts ) { - const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); - SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); - while ( it->more() ) + SMESH::smIdType_array_var array = new SMESH::smIdType_array; + if ( theParts.length() > 0 && myPredicate ) { - const SMDS_MeshElement* anElem = it->next(); - if ( myPredicate->IsSatisfy( anElem->GetID() ) ) - aRes[ anElem->GetEntityType() ]++; + SMESH_Mesh_ptr mesh = theParts[0]->GetMesh(); + mesh->Load(); + const SMDS_Mesh* meshDS = MeshPtr2SMDSMesh( mesh ); + Controls::Filter::TIdSequence totalSequence; + for ( CORBA::ULong i = 0; i < theParts.length(); ++i ) + { + if ( SMESH::Filter_i* filter = SMESH::DownCast( theParts[i] )) + filter->SetMesh( mesh ); + SMDS_ElemIteratorPtr iter = SMESH_Mesh_i::GetElements( theParts[i], GetElementType() ); + if ( iter && meshDS ) + { + Controls::Filter::TIdSequence sequence; + Controls::Filter::GetElementsId( meshDS, myPredicate->GetPredicate(), sequence, iter ); + totalSequence.insert( totalSequence.end(), sequence.begin(), sequence.end() ); + } + } + array->length( totalSequence.size() ); + for ( size_t i = 0; i < totalSequence.size(); ++i ) + array[ i ] = totalSequence[ i ]; } + return array._retn(); } - return aRes._retn(); -} + //============================================================================= + /*! + * \brief Returns number of mesh elements per each \a EntityType + */ + //============================================================================= -//============================================================================= -/*! - * \brief Returns number of mesh elements of each \a ElementType - */ -//============================================================================= + SMESH::smIdType_array* Filter_i::GetMeshInfo() + { + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); + aRes->length(SMESH::Entity_Last); + for (int i = 0; i < SMESH::Entity_Last; i++) + aRes[i] = 0; -SMESH::smIdType_array* ::Filter_i::GetNbElementsByType() -{ - SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); - aRes->length(SMESH::NB_ELEMENT_TYPES); - for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++) - aRes[i] = 0; - - if ( !CORBA::is_nil(myMesh) && myPredicate ) { - const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); - SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); - SMESH::smIdType& nbElems = aRes[ GetElementType() ]; - while ( it->more() ) + if ( !CORBA::is_nil(myMesh) && myPredicate ) { - const SMDS_MeshElement* anElem = it->next(); - if ( myPredicate->IsSatisfy( anElem->GetID() ) ) - nbElems++; + const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); + SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); + while ( it->more() ) + { + const SMDS_MeshElement* anElem = it->next(); + if ( myPredicate->IsSatisfy( anElem->GetID() ) ) + aRes[ anElem->GetEntityType() ]++; + } } - } - - return aRes._retn(); -} - - -//================================================================================ -/*! - * \brief Return GetElementType() within an array - * Implement SMESH_IDSource interface - */ -//================================================================================ -SMESH::array_of_ElementType* Filter_i::GetTypes() -{ - SMESH::array_of_ElementType_var types = new SMESH::array_of_ElementType; - - // check if any element passes through the filter - if ( !CORBA::is_nil(myMesh) && myPredicate ) - { - const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); - SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); - bool satisfies = false; - while ( !satisfies && it->more() ) - satisfies = myPredicate->IsSatisfy( it->next()->GetID() ); - if ( satisfies ) { - types->length( 1 ); - types[0] = GetElementType(); - } + return aRes._retn(); } - return types._retn(); -} - -//======================================================================= -//function : GetMesh -//purpose : Returns mesh -//======================================================================= - -SMESH::SMESH_Mesh_ptr Filter_i::GetMesh() -{ - return SMESH_Mesh::_duplicate( myMesh ); -} -//======================================================================= -//function : GetVtkUgStream -//purpose : Return data vtk unstructured grid (not implemented) -//======================================================================= + //============================================================================= + /*! + * \brief Returns number of mesh elements of each \a ElementType + */ + //============================================================================= -SALOMEDS::TMPFile* Filter_i::GetVtkUgStream() -{ - SALOMEDS::TMPFile_var SeqFile; - return SeqFile._retn(); -} -//======================================================================= -// name : getCriteria -// Purpose : Retrieve criterions from predicate -//======================================================================= -static inline void getPrediacates( Predicate_i* thePred, - std::vector & thePredVec ) -{ - const int aFType = thePred->GetFunctorType(); - - switch ( aFType ) - { - case FT_LogicalNOT: - { - Predicate_i* aPred = ( dynamic_cast( thePred ) )->GetPredicate_i(); - getPrediacates( aPred, thePredVec ); - break; - } - case FT_LogicalAND: - case FT_LogicalOR: + SMESH::smIdType_array* Filter_i::GetNbElementsByType() { - Predicate_i* aPred1 = ( dynamic_cast( thePred ) )->GetPredicate1_i(); - Predicate_i* aPred2 = ( dynamic_cast( thePred ) )->GetPredicate2_i(); - getPrediacates( aPred1, thePredVec ); - getPrediacates( aPred2, thePredVec ); - break; - } - default:; + SMESH::smIdType_array_var aRes = new SMESH::smIdType_array(); + aRes->length(SMESH::NB_ELEMENT_TYPES); + for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++) + aRes[i] = 0; + + if ( !CORBA::is_nil(myMesh) && myPredicate ) { + const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); + SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); + SMESH::smIdType& nbElems = aRes[ GetElementType() ]; + while ( it->more() ) + { + const SMDS_MeshElement* anElem = it->next(); + if ( myPredicate->IsSatisfy( anElem->GetID() ) ) + nbElems++; + } + } + + return aRes._retn(); } - thePredVec.push_back( thePred ); -} -//======================================================================= -// name : getCriteria -// Purpose : Retrieve criterions from predicate -//======================================================================= -static inline bool getCriteria( Predicate_i* thePred, - SMESH::Filter::Criteria_out theCriteria ) -{ - const int aFType = thePred->GetFunctorType(); - switch ( aFType ) - { - case FT_LogicalNOT: - { - Predicate_i* aPred = ( dynamic_cast( thePred ) )->GetPredicate_i(); - getCriteria( aPred, theCriteria ); - theCriteria[ theCriteria->length() - 1 ].UnaryOp = FT_LogicalNOT; - } - return true; + //================================================================================ + /*! + * \brief Return GetElementType() within an array + * Implement SMESH_IDSource interface + */ + //================================================================================ - case FT_LogicalAND: - case FT_LogicalOR: - { - Predicate_i* aPred1 = ( dynamic_cast( thePred ) )->GetPredicate1_i(); - Predicate_i* aPred2 = ( dynamic_cast( thePred ) )->GetPredicate2_i(); - if ( !getCriteria( aPred1, theCriteria ) ) - return false; - theCriteria[ theCriteria->length() - 1 ].BinaryOp = aFType; - return getCriteria( aPred2, theCriteria ); - } - case FT_Undefined: - return false; - } - - // resize theCriteria - CORBA::ULong i = theCriteria->length(); - theCriteria->length( i + 1 ); - theCriteria[ i ] = createCriterion(); - - // set members of the added Criterion - - theCriteria[ i ].Type = aFType; - theCriteria[ i ].TypeOfElement = thePred->GetElementType(); - - switch ( aFType ) - { - case FT_FreeBorders: - case FT_FreeEdges: - case FT_FreeFaces: - case FT_LinearOrQuadratic: - case FT_FreeNodes: - case FT_EqualEdges: - case FT_EqualFaces: - case FT_EqualVolumes: - case FT_BadOrientedVolume: - case FT_BareBorderVolume: - case FT_BareBorderFace: - case FT_OverConstrainedVolume: - case FT_OverConstrainedFace: - { - return true; - } - case FT_BelongToMeshGroup: - { - BelongToMeshGroup_i* aPred = dynamic_cast( thePred ); - SMESH::SMESH_GroupBase_var grp = aPred->GetGroup(); - if ( !grp->_is_nil() ) - { - theCriteria[ i ].ThresholdStr = grp->GetName(); - theCriteria[ i ].ThresholdID = aPred->GetGroupID().c_str(); - } - return true; - } - case FT_BelongToGeom: - { - BelongToGeom_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); - theCriteria[ i ].ThresholdID = aPred->GetShapeID(); - theCriteria[ i ].Tolerance = aPred->GetTolerance(); - return true; - } - case FT_BelongToPlane: - case FT_BelongToCylinder: - case FT_BelongToGenSurface: - { - BelongToSurface_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); - theCriteria[ i ].ThresholdID = aPred->GetShapeID(); - theCriteria[ i ].Tolerance = aPred->GetTolerance(); - return true; - } - case FT_LyingOnGeom: - { - LyingOnGeom_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); - theCriteria[ i ].ThresholdID = aPred->GetShapeID(); - theCriteria[ i ].Tolerance = aPred->GetTolerance(); - return true; - } - case FT_CoplanarFaces: - { - CoplanarFaces_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdID = aPred->GetFaceAsString(); - theCriteria[ i ].Tolerance = aPred->GetTolerance(); - return true; - } - case FT_ConnectedElements: + SMESH::array_of_ElementType* Filter_i::GetTypes() + { + SMESH::array_of_ElementType_var types = new SMESH::array_of_ElementType; + + // check if any element passes through the filter + if ( !CORBA::is_nil(myMesh) && myPredicate ) { - ConnectedElements_i* aPred = dynamic_cast( thePred ); - SMESH::ConnectedElements::ThresholdType type; - CORBA::String_var threshold = aPred->GetThreshold( type ); - switch ( type ) { - case SMESH::ConnectedElements::POINT: - theCriteria[ i ].ThresholdStr = threshold; break; - case SMESH::ConnectedElements::VERTEX: - theCriteria[ i ].ThresholdID = threshold; break; - case SMESH::ConnectedElements::NODE: - theCriteria[ i ].Threshold = atof( threshold.in() ); break; - default:; + const SMDS_Mesh* aMesh = MeshPtr2SMDSMesh(myMesh); + SMDS_ElemIteratorPtr it = aMesh->elementsIterator( SMDSAbs_ElementType( GetElementType() )); + bool satisfies = false; + while ( !satisfies && it->more() ) + satisfies = myPredicate->IsSatisfy( it->next()->GetID() ); + if ( satisfies ) { + types->length( 1 ); + types[0] = GetElementType(); } - return true; } - case FT_EqualNodes: + return types._retn(); + } + + //======================================================================= + //function : GetMesh + //purpose : Returns mesh + //======================================================================= + + SMESH::SMESH_Mesh_ptr Filter_i::GetMesh() + { + return SMESH_Mesh::_duplicate( myMesh ); + } + + //======================================================================= + //function : GetVtkUgStream + //purpose : Return data vtk unstructured grid (not implemented) + //======================================================================= + + SALOMEDS::TMPFile* Filter_i::GetVtkUgStream() + { + SALOMEDS::TMPFile_var SeqFile; + return SeqFile._retn(); + } + //======================================================================= + // name : getCriteria + // Purpose : Retrieve criterions from predicate + //======================================================================= + static inline void getPrediacates( Predicate_i* thePred, + std::vector & thePredVec ) + { + const int aFType = thePred->GetFunctorType(); + + switch ( aFType ) { - EqualNodes_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].Tolerance = aPred->GetTolerance(); - return true; + case FT_LogicalNOT: + { + Predicate_i* aPred = ( dynamic_cast( thePred ) )->GetPredicate_i(); + getPrediacates( aPred, thePredVec ); + break; } - case FT_RangeOfIds: + case FT_LogicalAND: + case FT_LogicalOR: { - RangeOfIds_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdStr = aPred->GetRangeStr(); - return true; + Predicate_i* aPred1 = ( dynamic_cast( thePred ) )->GetPredicate1_i(); + Predicate_i* aPred2 = ( dynamic_cast( thePred ) )->GetPredicate2_i(); + getPrediacates( aPred1, thePredVec ); + getPrediacates( aPred2, thePredVec ); + break; + } + default:; } - case FT_LessThan: - case FT_MoreThan: - case FT_EqualTo: + thePredVec.push_back( thePred ); + } + + //======================================================================= + // name : getCriteria + // Purpose : Retrieve criterions from predicate + //======================================================================= + static inline bool getCriteria( Predicate_i* thePred, + SMESH::Filter::Criteria_out theCriteria ) + { + const int aFType = thePred->GetFunctorType(); + + switch ( aFType ) { - Comparator_i* aCompar = dynamic_cast( thePred ); - theCriteria[ i ].Type = aCompar->GetNumFunctor_i()->GetFunctorType(); - theCriteria[ i ].Compare = aFType; - theCriteria[ i ].Threshold = aCompar->GetMargin(); - if ( aFType == FT_EqualTo ) + case FT_LogicalNOT: { - EqualTo_i* aCompar = dynamic_cast( thePred ); - theCriteria[ i ].Tolerance = aCompar->GetTolerance(); + Predicate_i* aPred = ( dynamic_cast( thePred ) )->GetPredicate_i(); + getCriteria( aPred, theCriteria ); + theCriteria[ theCriteria->length() - 1 ].UnaryOp = FT_LogicalNOT; } return true; + + case FT_LogicalAND: + case FT_LogicalOR: + { + Predicate_i* aPred1 = ( dynamic_cast( thePred ) )->GetPredicate1_i(); + Predicate_i* aPred2 = ( dynamic_cast( thePred ) )->GetPredicate2_i(); + if ( !getCriteria( aPred1, theCriteria ) ) + return false; + theCriteria[ theCriteria->length() - 1 ].BinaryOp = aFType; + return getCriteria( aPred2, theCriteria ); + } + case FT_Undefined: + return false; } - case FT_GroupColor: - { - GroupColor_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].ThresholdStr = aPred->GetColorStr(); - return true; - } - case FT_ElemGeomType: - { - ElemGeomType_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].Threshold = (double)aPred->GetGeometryType(); - return true; - } - case FT_EntityType: + + // resize theCriteria + CORBA::ULong i = theCriteria->length(); + theCriteria->length( i + 1 ); + theCriteria[ i ] = createCriterion(); + + // set members of the added Criterion + + theCriteria[ i ].Type = aFType; + theCriteria[ i ].TypeOfElement = thePred->GetElementType(); + + switch ( aFType ) { - ElemEntityType_i* aPred = dynamic_cast( thePred ); - theCriteria[ i ].Threshold = (double)aPred->GetEntityType(); - return true; + case FT_FreeBorders: + case FT_FreeEdges: + case FT_FreeFaces: + case FT_LinearOrQuadratic: + case FT_FreeNodes: + case FT_EqualEdges: + case FT_EqualFaces: + case FT_EqualVolumes: + case FT_BadOrientedVolume: + case FT_BareBorderVolume: + case FT_BareBorderFace: + case FT_OverConstrainedVolume: + case FT_OverConstrainedFace: + { + return true; + } + case FT_BelongToMeshGroup: + { + BelongToMeshGroup_i* aPred = dynamic_cast( thePred ); + SMESH::SMESH_GroupBase_var grp = aPred->GetGroup(); + if ( !grp->_is_nil() ) + { + theCriteria[ i ].ThresholdStr = grp->GetName(); + theCriteria[ i ].ThresholdID = aPred->GetGroupID().c_str(); + } + return true; + } + case FT_BelongToGeom: + { + BelongToGeom_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); + theCriteria[ i ].ThresholdID = aPred->GetShapeID(); + theCriteria[ i ].Tolerance = aPred->GetTolerance(); + return true; + } + case FT_BelongToPlane: + case FT_BelongToCylinder: + case FT_BelongToGenSurface: + { + BelongToSurface_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); + theCriteria[ i ].ThresholdID = aPred->GetShapeID(); + theCriteria[ i ].Tolerance = aPred->GetTolerance(); + return true; + } + case FT_LyingOnGeom: + { + LyingOnGeom_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdStr = aPred->GetShapeName(); + theCriteria[ i ].ThresholdID = aPred->GetShapeID(); + theCriteria[ i ].Tolerance = aPred->GetTolerance(); + return true; + } + case FT_CoplanarFaces: + { + CoplanarFaces_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdID = aPred->GetFaceAsString(); + theCriteria[ i ].Tolerance = aPred->GetTolerance(); + return true; + } + case FT_ConnectedElements: + { + ConnectedElements_i* aPred = dynamic_cast( thePred ); + SMESH::ConnectedElements::ThresholdType type; + CORBA::String_var threshold = aPred->GetThreshold( type ); + switch ( type ) { + case SMESH::ConnectedElements::POINT: + theCriteria[ i ].ThresholdStr = threshold; break; + case SMESH::ConnectedElements::VERTEX: + theCriteria[ i ].ThresholdID = threshold; break; + case SMESH::ConnectedElements::NODE: + theCriteria[ i ].Threshold = atof( threshold.in() ); break; + default:; + } + return true; + } + case FT_EqualNodes: + { + EqualNodes_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].Tolerance = aPred->GetTolerance(); + return true; + } + case FT_RangeOfIds: + { + RangeOfIds_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdStr = aPred->GetRangeStr(); + return true; + } + case FT_LessThan: + case FT_MoreThan: + case FT_EqualTo: + { + Comparator_i* aCompar = dynamic_cast( thePred ); + theCriteria[ i ].Type = aCompar->GetNumFunctor_i()->GetFunctorType(); + theCriteria[ i ].Compare = aFType; + theCriteria[ i ].Threshold = aCompar->GetMargin(); + if ( aFType == FT_EqualTo ) + { + EqualTo_i* aCompar = dynamic_cast( thePred ); + theCriteria[ i ].Tolerance = aCompar->GetTolerance(); + } + return true; + } + case FT_GroupColor: + { + GroupColor_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].ThresholdStr = aPred->GetColorStr(); + return true; + } + case FT_ElemGeomType: + { + ElemGeomType_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].Threshold = (double)aPred->GetGeometryType(); + return true; + } + case FT_EntityType: + { + ElemEntityType_i* aPred = dynamic_cast( thePred ); + theCriteria[ i ].Threshold = (double)aPred->GetEntityType(); + return true; + } + default: + return false; } - default: - return false; } -} -//======================================================================= -// name : Filter_i::GetCriteria -// Purpose : Retrieve criterions from predicate -//======================================================================= -CORBA::Boolean Filter_i::GetCriteria( SMESH::Filter::Criteria_out theCriteria ) -{ - theCriteria = new SMESH::Filter::Criteria; - return myPredicate != 0 ? getCriteria( myPredicate, theCriteria ) : true; -} + //======================================================================= + // name : Filter_i::GetCriteria + // Purpose : Retrieve criterions from predicate + //======================================================================= + CORBA::Boolean Filter_i::GetCriteria( SMESH::Filter::Criteria_out theCriteria ) + { + theCriteria = new SMESH::Filter::Criteria; + return myPredicate != 0 ? getCriteria( myPredicate, theCriteria ) : true; + } -//======================================================================= -// name : Filter_i::SetCriteria -// Purpose : Create new predicate and set criterions in it -//======================================================================= -CORBA::Boolean Filter_i::SetCriteria( const SMESH::Filter::Criteria& theCriteria ) -{ - SetPredicate( SMESH::Predicate::_nil() ); + //======================================================================= + // name : Filter_i::SetCriteria + // Purpose : Create new predicate and set criterions in it + //======================================================================= + CORBA::Boolean Filter_i::SetCriteria( const SMESH::Filter::Criteria& theCriteria ) + { + SetPredicate( SMESH::Predicate::_nil() ); - SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); - FilterManager_ptr aFilterMgr = aFilter->_this(); - - // CREATE two lists ( PREDICATES and LOG OP ) - - // Criterion - TPythonDump()<<"aCriteria = []"; - std::list aPredicates; - std::list aBinaries; - for ( int i = 0, n = theCriteria.length(); i < n; i++ ) - { - int aCriterion = theCriteria[ i ].Type; - int aCompare = theCriteria[ i ].Compare; - double aThreshold = theCriteria[ i ].Threshold; - const char* aThresholdStr = theCriteria[ i ].ThresholdStr; - const char* aThresholdID = theCriteria[ i ].ThresholdID; - int aUnary = theCriteria[ i ].UnaryOp; - int aBinary = theCriteria[ i ].BinaryOp; - double aTolerance = theCriteria[ i ].Tolerance; - ElementType aTypeOfElem = theCriteria[ i ].TypeOfElement; - long aPrecision = theCriteria[ i ].Precision; + SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); + FilterManager_ptr aFilterMgr = aFilter->_this(); + // CREATE two lists ( PREDICATES and LOG OP ) + + // Criterion + TPythonDump()<<"aCriteria = []"; + std::list aPredicates; + std::list aBinaries; + for ( int i = 0, n = theCriteria.length(); i < n; i++ ) { + int aCriterion = theCriteria[ i ].Type; + int aCompare = theCriteria[ i ].Compare; + double aThreshold = theCriteria[ i ].Threshold; + const char* aThresholdStr = theCriteria[ i ].ThresholdStr; + const char* aThresholdID = theCriteria[ i ].ThresholdID; + int aUnary = theCriteria[ i ].UnaryOp; + int aBinary = theCriteria[ i ].BinaryOp; + double aTolerance = theCriteria[ i ].Tolerance; + ElementType aTypeOfElem = theCriteria[ i ].TypeOfElement; + long aPrecision = theCriteria[ i ].Precision; + + { + TPythonDump pd; + pd << "aCriterion = SMESH.Filter.Criterion(" + << aCriterion << ", " + << aCompare << ", " + << aThreshold << ", '" + << aThresholdStr << "', '" + << aThresholdID << "', " + << aUnary << ", " + << aBinary << ", " + << aTolerance << ", " + << aTypeOfElem << ", " + << aPrecision << ")"; + } TPythonDump pd; - pd << "aCriterion = SMESH.Filter.Criterion(" - << aCriterion << ", " - << aCompare << ", " - << aThreshold << ", '" - << aThresholdStr << "', '" - << aThresholdID << "', " - << aUnary << ", " - << aBinary << ", " - << aTolerance << ", " - << aTypeOfElem << ", " - << aPrecision << ")"; - } - TPythonDump pd; - SMESH::Predicate_ptr aPredicate = SMESH::Predicate::_nil(); - SMESH::NumericalFunctor_ptr aFunctor = SMESH::NumericalFunctor::_nil(); + SMESH::Predicate_ptr aPredicate = SMESH::Predicate::_nil(); + SMESH::NumericalFunctor_ptr aFunctor = SMESH::NumericalFunctor::_nil(); - switch ( aCriterion ) - { - // Functors + switch ( aCriterion ) + { + // Functors - case SMESH::FT_MultiConnection: - aFunctor = aFilterMgr->CreateMultiConnection(); - break; - case SMESH::FT_MultiConnection2D: - aFunctor = aFilterMgr->CreateMultiConnection2D(); - break; - case SMESH::FT_Length: - aFunctor = aFilterMgr->CreateLength(); - break; - case SMESH::FT_Length2D: - aFunctor = aFilterMgr->CreateLength2D(); - break; - case SMESH::FT_Length3D: - aFunctor = aFilterMgr->CreateLength3D(); - break; - case SMESH::FT_Deflection2D: - aFunctor = aFilterMgr->CreateDeflection2D(); - break; - case SMESH::FT_AspectRatio: - aFunctor = aFilterMgr->CreateAspectRatio(); - break; - case SMESH::FT_AspectRatio3D: - aFunctor = aFilterMgr->CreateAspectRatio3D(); - break; - case SMESH::FT_Warping: - aFunctor = aFilterMgr->CreateWarping(); - break; - case SMESH::FT_MinimumAngle: - aFunctor = aFilterMgr->CreateMinimumAngle(); - break; - case SMESH::FT_Taper: - aFunctor = aFilterMgr->CreateTaper(); - break; - case SMESH::FT_Skew: - aFunctor = aFilterMgr->CreateSkew(); - break; - case SMESH::FT_Area: - aFunctor = aFilterMgr->CreateArea(); - break; - case SMESH::FT_Volume3D: - aFunctor = aFilterMgr->CreateVolume3D(); - break; - case SMESH::FT_MaxElementLength2D: - aFunctor = aFilterMgr->CreateMaxElementLength2D(); - break; - case SMESH::FT_MaxElementLength3D: - aFunctor = aFilterMgr->CreateMaxElementLength3D(); - break; - case SMESH::FT_BallDiameter: - aFunctor = aFilterMgr->CreateBallDiameter(); - break; - case SMESH::FT_NodeConnectivityNumber: - aFunctor = aFilterMgr->CreateNodeConnectivityNumber(); - break; + case SMESH::FT_MultiConnection: + aFunctor = aFilterMgr->CreateMultiConnection(); + break; + case SMESH::FT_MultiConnection2D: + aFunctor = aFilterMgr->CreateMultiConnection2D(); + break; + case SMESH::FT_Length: + aFunctor = aFilterMgr->CreateLength(); + break; + case SMESH::FT_Length2D: + aFunctor = aFilterMgr->CreateLength2D(); + break; + case SMESH::FT_Length3D: + aFunctor = aFilterMgr->CreateLength3D(); + break; + case SMESH::FT_Deflection2D: + aFunctor = aFilterMgr->CreateDeflection2D(); + break; + case SMESH::FT_AspectRatio: + aFunctor = aFilterMgr->CreateAspectRatio(); + break; + case SMESH::FT_AspectRatio3D: + aFunctor = aFilterMgr->CreateAspectRatio3D(); + break; + case SMESH::FT_Warping: + aFunctor = aFilterMgr->CreateWarping(); + break; + case SMESH::FT_MinimumAngle: + aFunctor = aFilterMgr->CreateMinimumAngle(); + break; + case SMESH::FT_Taper: + aFunctor = aFilterMgr->CreateTaper(); + break; + case SMESH::FT_Skew: + aFunctor = aFilterMgr->CreateSkew(); + break; + case SMESH::FT_Area: + aFunctor = aFilterMgr->CreateArea(); + break; + case SMESH::FT_Volume3D: + aFunctor = aFilterMgr->CreateVolume3D(); + break; + case SMESH::FT_MaxElementLength2D: + aFunctor = aFilterMgr->CreateMaxElementLength2D(); + break; + case SMESH::FT_MaxElementLength3D: + aFunctor = aFilterMgr->CreateMaxElementLength3D(); + break; + case SMESH::FT_BallDiameter: + aFunctor = aFilterMgr->CreateBallDiameter(); + break; + case SMESH::FT_NodeConnectivityNumber: + aFunctor = aFilterMgr->CreateNodeConnectivityNumber(); + break; - // Predicates + // Predicates - case SMESH::FT_FreeBorders: - aPredicate = aFilterMgr->CreateFreeBorders(); - break; - case SMESH::FT_FreeEdges: - aPredicate = aFilterMgr->CreateFreeEdges(); - break; - case SMESH::FT_FreeFaces: - aPredicate = aFilterMgr->CreateFreeFaces(); - break; - case SMESH::FT_FreeNodes: - aPredicate = aFilterMgr->CreateFreeNodes(); - break; - case SMESH::FT_EqualNodes: - { - SMESH::EqualNodes_ptr pred = aFilterMgr->CreateEqualNodes(); - pred->SetTolerance( aTolerance ); - aPredicate = pred; + case SMESH::FT_FreeBorders: + aPredicate = aFilterMgr->CreateFreeBorders(); break; - } - case SMESH::FT_EqualEdges: - aPredicate = aFilterMgr->CreateEqualEdges(); - break; - case SMESH::FT_EqualFaces: - aPredicate = aFilterMgr->CreateEqualFaces(); - break; - case SMESH::FT_EqualVolumes: - aPredicate = aFilterMgr->CreateEqualVolumes(); - break; - case SMESH::FT_BelongToMeshGroup: - { - SMESH::BelongToMeshGroup_ptr tmpPred = aFilterMgr->CreateBelongToMeshGroup(); - tmpPred->SetGroupID( aThresholdID ); - aPredicate = tmpPred; - } - break; - case SMESH::FT_BelongToGeom: - { - SMESH::BelongToGeom_ptr tmpPred = aFilterMgr->CreateBelongToGeom(); - tmpPred->SetElementType( aTypeOfElem ); - tmpPred->SetShape( aThresholdID, aThresholdStr ); - tmpPred->SetTolerance( aTolerance ); - aPredicate = tmpPred; - } - break; - case SMESH::FT_BelongToPlane: - case SMESH::FT_BelongToCylinder: - case SMESH::FT_BelongToGenSurface: - { - SMESH::BelongToSurface_ptr tmpPred; - switch ( aCriterion ) { - case SMESH::FT_BelongToPlane: - tmpPred = aFilterMgr->CreateBelongToPlane(); break; - case SMESH::FT_BelongToCylinder: - tmpPred = aFilterMgr->CreateBelongToCylinder(); break; - default: - tmpPred = aFilterMgr->CreateBelongToGenSurface(); + case SMESH::FT_FreeEdges: + aPredicate = aFilterMgr->CreateFreeEdges(); + break; + case SMESH::FT_FreeFaces: + aPredicate = aFilterMgr->CreateFreeFaces(); + break; + case SMESH::FT_FreeNodes: + aPredicate = aFilterMgr->CreateFreeNodes(); + break; + case SMESH::FT_EqualNodes: + { + SMESH::EqualNodes_ptr pred = aFilterMgr->CreateEqualNodes(); + pred->SetTolerance( aTolerance ); + aPredicate = pred; + break; } - tmpPred->SetShape( aThresholdID, aThresholdStr, aTypeOfElem ); - tmpPred->SetTolerance( aTolerance ); - aPredicate = tmpPred; - } - break; - case SMESH::FT_LyingOnGeom: - { - SMESH::LyingOnGeom_ptr tmpPred = aFilterMgr->CreateLyingOnGeom(); - tmpPred->SetElementType( aTypeOfElem ); - tmpPred->SetShape( aThresholdID, aThresholdStr ); - tmpPred->SetTolerance( aTolerance ); - aPredicate = tmpPred; - } - break; - case SMESH::FT_RangeOfIds: - { - SMESH::RangeOfIds_ptr tmpPred = aFilterMgr->CreateRangeOfIds(); - tmpPred->SetRangeStr( aThresholdStr ); - tmpPred->SetElementType( aTypeOfElem ); - aPredicate = tmpPred; - } - break; - case SMESH::FT_BadOrientedVolume: - { - aPredicate = aFilterMgr->CreateBadOrientedVolume(); - } - break; - case SMESH::FT_BareBorderVolume: - { - aPredicate = aFilterMgr->CreateBareBorderVolume(); - } - break; - case SMESH::FT_BareBorderFace: - { - aPredicate = aFilterMgr->CreateBareBorderFace(); - } - break; - case SMESH::FT_OverConstrainedVolume: - { - aPredicate = aFilterMgr->CreateOverConstrainedVolume(); - } - break; - case SMESH::FT_OverConstrainedFace: - { - aPredicate = aFilterMgr->CreateOverConstrainedFace(); - } - break; - case SMESH::FT_LinearOrQuadratic: - { - SMESH::LinearOrQuadratic_ptr tmpPred = aFilterMgr->CreateLinearOrQuadratic(); - tmpPred->SetElementType( aTypeOfElem ); - aPredicate = tmpPred; + case SMESH::FT_EqualEdges: + aPredicate = aFilterMgr->CreateEqualEdges(); break; - } - case SMESH::FT_GroupColor: - { - SMESH::GroupColor_ptr tmpPred = aFilterMgr->CreateGroupColor(); - tmpPred->SetElementType( aTypeOfElem ); - tmpPred->SetColorStr( aThresholdStr ); - aPredicate = tmpPred; + case SMESH::FT_EqualFaces: + aPredicate = aFilterMgr->CreateEqualFaces(); break; - } - case SMESH::FT_ElemGeomType: - { - SMESH::ElemGeomType_ptr tmpPred = aFilterMgr->CreateElemGeomType(); - tmpPred->SetElementType( aTypeOfElem ); - tmpPred->SetGeometryType( (GeometryType)(int)(aThreshold + 0.5) ); - aPredicate = tmpPred; + case SMESH::FT_EqualVolumes: + aPredicate = aFilterMgr->CreateEqualVolumes(); break; - } - case SMESH::FT_EntityType: - { - SMESH::ElemEntityType_ptr tmpPred = aFilterMgr->CreateElemEntityType(); - tmpPred->SetElementType( aTypeOfElem ); - tmpPred->SetEntityType( EntityType( (int (aThreshold + 0.5)))); - aPredicate = tmpPred; + case SMESH::FT_BelongToMeshGroup: + { + SMESH::BelongToMeshGroup_ptr tmpPred = aFilterMgr->CreateBelongToMeshGroup(); + tmpPred->SetGroupID( aThresholdID ); + aPredicate = tmpPred; + } break; - } - case SMESH::FT_CoplanarFaces: - { - SMESH::CoplanarFaces_ptr tmpPred = aFilterMgr->CreateCoplanarFaces(); - tmpPred->SetFace( atol (aThresholdID )); - tmpPred->SetTolerance( aTolerance ); - aPredicate = tmpPred; + case SMESH::FT_BelongToGeom: + { + SMESH::BelongToGeom_ptr tmpPred = aFilterMgr->CreateBelongToGeom(); + tmpPred->SetElementType( aTypeOfElem ); + tmpPred->SetShape( aThresholdID, aThresholdStr ); + tmpPred->SetTolerance( aTolerance ); + aPredicate = tmpPred; + } break; - } - case SMESH::FT_ConnectedElements: - { - SMESH::ConnectedElements_ptr tmpPred = aFilterMgr->CreateConnectedElements(); - if ( strlen( aThresholdID ) > 0 ) // shape ID - tmpPred->SetThreshold( aThresholdID, SMESH::ConnectedElements::VERTEX ); - else if ( strlen( aThresholdStr ) > 0 ) // point coords - tmpPred->SetThreshold( aThresholdStr, SMESH::ConnectedElements::POINT ); - else if ( aThreshold >= 1 ) - tmpPred->SetNode( (CORBA::Long) aThreshold ); // node ID - tmpPred->SetElementType( aTypeOfElem ); - aPredicate = tmpPred; + case SMESH::FT_BelongToPlane: + case SMESH::FT_BelongToCylinder: + case SMESH::FT_BelongToGenSurface: + { + SMESH::BelongToSurface_ptr tmpPred; + switch ( aCriterion ) { + case SMESH::FT_BelongToPlane: + tmpPred = aFilterMgr->CreateBelongToPlane(); break; + case SMESH::FT_BelongToCylinder: + tmpPred = aFilterMgr->CreateBelongToCylinder(); break; + default: + tmpPred = aFilterMgr->CreateBelongToGenSurface(); + } + tmpPred->SetShape( aThresholdID, aThresholdStr, aTypeOfElem ); + tmpPred->SetTolerance( aTolerance ); + aPredicate = tmpPred; + } break; - } - - default: - continue; - } - - // Comparator - if ( !aFunctor->_is_nil() && aPredicate->_is_nil() ) - { - SMESH::Comparator_ptr aComparator = SMESH::Comparator::_nil(); - - if ( aCompare == SMESH::FT_LessThan ) - aComparator = aFilterMgr->CreateLessThan(); - else if ( aCompare == SMESH::FT_MoreThan ) - aComparator = aFilterMgr->CreateMoreThan(); - else if ( aCompare == SMESH::FT_EqualTo ) - aComparator = aFilterMgr->CreateEqualTo(); - else - continue; + case SMESH::FT_LyingOnGeom: + { + SMESH::LyingOnGeom_ptr tmpPred = aFilterMgr->CreateLyingOnGeom(); + tmpPred->SetElementType( aTypeOfElem ); + tmpPred->SetShape( aThresholdID, aThresholdStr ); + tmpPred->SetTolerance( aTolerance ); + aPredicate = tmpPred; + } + break; + case SMESH::FT_RangeOfIds: + { + SMESH::RangeOfIds_ptr tmpPred = aFilterMgr->CreateRangeOfIds(); + tmpPred->SetRangeStr( aThresholdStr ); + tmpPred->SetElementType( aTypeOfElem ); + aPredicate = tmpPred; + } + break; + case SMESH::FT_BadOrientedVolume: + { + aPredicate = aFilterMgr->CreateBadOrientedVolume(); + } + break; + case SMESH::FT_BareBorderVolume: + { + aPredicate = aFilterMgr->CreateBareBorderVolume(); + } + break; + case SMESH::FT_BareBorderFace: + { + aPredicate = aFilterMgr->CreateBareBorderFace(); + } + break; + case SMESH::FT_OverConstrainedVolume: + { + aPredicate = aFilterMgr->CreateOverConstrainedVolume(); + } + break; + case SMESH::FT_OverConstrainedFace: + { + aPredicate = aFilterMgr->CreateOverConstrainedFace(); + } + break; + case SMESH::FT_LinearOrQuadratic: + { + SMESH::LinearOrQuadratic_ptr tmpPred = aFilterMgr->CreateLinearOrQuadratic(); + tmpPred->SetElementType( aTypeOfElem ); + aPredicate = tmpPred; + break; + } + case SMESH::FT_GroupColor: + { + SMESH::GroupColor_ptr tmpPred = aFilterMgr->CreateGroupColor(); + tmpPred->SetElementType( aTypeOfElem ); + tmpPred->SetColorStr( aThresholdStr ); + aPredicate = tmpPred; + break; + } + case SMESH::FT_ElemGeomType: + { + SMESH::ElemGeomType_ptr tmpPred = aFilterMgr->CreateElemGeomType(); + tmpPred->SetElementType( aTypeOfElem ); + tmpPred->SetGeometryType( (GeometryType)(int)(aThreshold + 0.5) ); + aPredicate = tmpPred; + break; + } + case SMESH::FT_EntityType: + { + SMESH::ElemEntityType_ptr tmpPred = aFilterMgr->CreateElemEntityType(); + tmpPred->SetElementType( aTypeOfElem ); + tmpPred->SetEntityType( EntityType( (int (aThreshold + 0.5)))); + aPredicate = tmpPred; + break; + } + case SMESH::FT_CoplanarFaces: + { + SMESH::CoplanarFaces_ptr tmpPred = aFilterMgr->CreateCoplanarFaces(); + tmpPred->SetFace( atol (aThresholdID )); + tmpPred->SetTolerance( aTolerance ); + aPredicate = tmpPred; + break; + } + case SMESH::FT_ConnectedElements: + { + SMESH::ConnectedElements_ptr tmpPred = aFilterMgr->CreateConnectedElements(); + if ( strlen( aThresholdID ) > 0 ) // shape ID + tmpPred->SetThreshold( aThresholdID, SMESH::ConnectedElements::VERTEX ); + else if ( strlen( aThresholdStr ) > 0 ) // point coords + tmpPred->SetThreshold( aThresholdStr, SMESH::ConnectedElements::POINT ); + else if ( aThreshold >= 1 ) + tmpPred->SetNode( (CORBA::Long) aThreshold ); // node ID + tmpPred->SetElementType( aTypeOfElem ); + aPredicate = tmpPred; + break; + } - aComparator->SetNumFunctor( aFunctor ); - aComparator->SetMargin( aThreshold ); + default: + continue; + } - if ( aCompare == FT_EqualTo ) + // Comparator + if ( !aFunctor->_is_nil() && aPredicate->_is_nil() ) { - SMESH::EqualTo_var anEqualTo = SMESH::EqualTo::_narrow( aComparator ); - anEqualTo->SetTolerance( aTolerance ); - } + SMESH::Comparator_ptr aComparator = SMESH::Comparator::_nil(); - aPredicate = aComparator; + if ( aCompare == SMESH::FT_LessThan ) + aComparator = aFilterMgr->CreateLessThan(); + else if ( aCompare == SMESH::FT_MoreThan ) + aComparator = aFilterMgr->CreateMoreThan(); + else if ( aCompare == SMESH::FT_EqualTo ) + aComparator = aFilterMgr->CreateEqualTo(); + else + continue; - aFunctor->SetPrecision( aPrecision ); - } + aComparator->SetNumFunctor( aFunctor ); + aComparator->SetMargin( aThreshold ); - // Logical not - if ( aUnary == FT_LogicalNOT ) - { - SMESH::LogicalNOT_ptr aNotPred = aFilterMgr->CreateLogicalNOT(); - aNotPred->SetPredicate( aPredicate ); - aPredicate = aNotPred; - } + if ( aCompare == FT_EqualTo ) + { + SMESH::EqualTo_var anEqualTo = SMESH::EqualTo::_narrow( aComparator ); + anEqualTo->SetTolerance( aTolerance ); + } - // logical op - aPredicates.push_back( aPredicate ); - aBinaries.push_back( aBinary ); - pd <<"aCriteria.append(aCriterion)"; + aPredicate = aComparator; + + aFunctor->SetPrecision( aPrecision ); + } - } // end of for - TPythonDump pd; pd<CreateLogicalNOT(); + aNotPred->SetPredicate( aPredicate ); + aPredicate = aNotPred; + } - // CREATE ONE PREDICATE FROM PREVIOUSLY CREATED MAP + // logical op + aPredicates.push_back( aPredicate ); + aBinaries.push_back( aBinary ); + pd <<"aCriteria.append(aCriterion)"; - // combine all "AND" operations + } // end of for + TPythonDump pd; pd< aResList; + // CREATE ONE PREDICATE FROM PREVIOUSLY CREATED MAP - std::list::iterator aPredIter; - std::list::iterator aBinaryIter; + // combine all "AND" operations - SMESH::Predicate_ptr aPrevPredicate = SMESH::Predicate::_nil(); - int aPrevBinary = SMESH::FT_Undefined; - if ( !aBinaries.empty() ) - aBinaries.back() = SMESH::FT_Undefined; + std::list aResList; - for ( aPredIter = aPredicates.begin(), aBinaryIter = aBinaries.begin(); - aPredIter != aPredicates.end() && aBinaryIter != aBinaries.end(); - ++aPredIter, ++aBinaryIter ) - { - int aCurrBinary = *aBinaryIter; + std::list::iterator aPredIter; + std::list::iterator aBinaryIter; - SMESH::Predicate_ptr aCurrPred = SMESH::Predicate::_nil(); + SMESH::Predicate_ptr aPrevPredicate = SMESH::Predicate::_nil(); + int aPrevBinary = SMESH::FT_Undefined; + if ( !aBinaries.empty() ) + aBinaries.back() = SMESH::FT_Undefined; - if ( aPrevBinary == SMESH::FT_LogicalAND ) + for ( aPredIter = aPredicates.begin(), aBinaryIter = aBinaries.begin(); + aPredIter != aPredicates.end() && aBinaryIter != aBinaries.end(); + ++aPredIter, ++aBinaryIter ) { + int aCurrBinary = *aBinaryIter; - SMESH::LogicalBinary_ptr aBinaryPred = aFilterMgr->CreateLogicalAND(); - aBinaryPred->SetPredicate1( aPrevPredicate ); - aBinaryPred->SetPredicate2( *aPredIter ); - aCurrPred = aBinaryPred; - } - else - aCurrPred = *aPredIter; + SMESH::Predicate_ptr aCurrPred = SMESH::Predicate::_nil(); - if ( aCurrBinary != SMESH::FT_LogicalAND ) - aResList.push_back( aCurrPred ); + if ( aPrevBinary == SMESH::FT_LogicalAND ) + { - aPrevPredicate = aCurrPred; - aPrevBinary = aCurrBinary; - } + SMESH::LogicalBinary_ptr aBinaryPred = aFilterMgr->CreateLogicalAND(); + aBinaryPred->SetPredicate1( aPrevPredicate ); + aBinaryPred->SetPredicate2( *aPredIter ); + aCurrPred = aBinaryPred; + } + else + aCurrPred = *aPredIter; + + if ( aCurrBinary != SMESH::FT_LogicalAND ) + aResList.push_back( aCurrPred ); - // combine all "OR" operations + aPrevPredicate = aCurrPred; + aPrevBinary = aCurrBinary; + } - SMESH::Predicate_ptr aResPredicate = SMESH::Predicate::_nil(); + // combine all "OR" operations - if ( aResList.size() == 1 ) - aResPredicate = *aResList.begin(); - else if ( aResList.size() > 1 ) - { - std::list::iterator anIter = aResList.begin(); - aResPredicate = *anIter; - anIter++; - for ( ; anIter != aResList.end(); ++anIter ) + SMESH::Predicate_ptr aResPredicate = SMESH::Predicate::_nil(); + + if ( aResList.size() == 1 ) + aResPredicate = *aResList.begin(); + else if ( aResList.size() > 1 ) { - SMESH::LogicalBinary_ptr aBinaryPred = aFilterMgr->CreateLogicalOR(); - aBinaryPred->SetPredicate1( aResPredicate ); - aBinaryPred->SetPredicate2( *anIter ); - aResPredicate = aBinaryPred; + std::list::iterator anIter = aResList.begin(); + aResPredicate = *anIter; + anIter++; + for ( ; anIter != aResList.end(); ++anIter ) + { + SMESH::LogicalBinary_ptr aBinaryPred = aFilterMgr->CreateLogicalOR(); + aBinaryPred->SetPredicate1( aResPredicate ); + aBinaryPred->SetPredicate2( *anIter ); + aResPredicate = aBinaryPred; + } } - } - SetPredicate( aResPredicate ); - if ( !aResPredicate->_is_nil() ) - aResPredicate->UnRegister(); + SetPredicate( aResPredicate ); + if ( !aResPredicate->_is_nil() ) + aResPredicate->UnRegister(); - return !aResPredicate->_is_nil(); -} - -//======================================================================= -// name : Filter_i::GetPredicate_i -// Purpose : Get implementation of predicate -//======================================================================= -Predicate_i* Filter_i::GetPredicate_i() -{ - return myPredicate; -} + return !aResPredicate->_is_nil(); + } -//======================================================================= -// name : Filter_i::GetPredicate -// Purpose : Get predicate -//======================================================================= -Predicate_ptr Filter_i::GetPredicate() -{ - if ( myPredicate == 0 ) - return SMESH::Predicate::_nil(); - else + //======================================================================= + // name : Filter_i::GetPredicate_i + // Purpose : Get implementation of predicate + //======================================================================= + Predicate_i* Filter_i::GetPredicate_i() { - SMESH::Predicate_var anObj = myPredicate->_this(); - // if ( SMESH::Functor_i* fun = SMESH::DownCast( anObj )) - // TPythonDump() << fun << " = " << this << ".GetPredicate()"; - return anObj._retn(); + return myPredicate; } -} -//================================================================================ -/*! - * \brief Find groups it depends on - */ -//================================================================================ - -void Filter_i::FindBaseObjects() -{ - // release current groups - for ( size_t i = 0; i < myBaseGroups.size(); ++i ) - if ( myBaseGroups[i] ) + //======================================================================= + // name : Filter_i::GetPredicate + // Purpose : Get predicate + //======================================================================= + Predicate_ptr Filter_i::GetPredicate() + { + if ( myPredicate == 0 ) + return SMESH::Predicate::_nil(); + else { - myBaseGroups[i]->RemoveModifWaiter( this ); - myBaseGroups[i]->UnRegister(); + SMESH::Predicate_var anObj = myPredicate->_this(); + // if ( SMESH::Functor_i* fun = SMESH::DownCast( anObj )) + // TPythonDump() << fun << " = " << this << ".GetPredicate()"; + return anObj._retn(); } + } + + //================================================================================ + /*! + * \brief Find groups it depends on + */ + //================================================================================ - // remember new groups - myBaseGroups.clear(); - if ( myPredicate ) + void Filter_i::FindBaseObjects() { - std::vector predicates; - getPrediacates( myPredicate, predicates ); - for ( size_t i = 0; i < predicates.size(); ++i ) - if ( BelongToMeshGroup_i* bmg = dynamic_cast< BelongToMeshGroup_i* >( predicates[i] )) + // release current groups + for ( size_t i = 0; i < myBaseGroups.size(); ++i ) + if ( myBaseGroups[i] ) { - SMESH::SMESH_GroupBase_var g = bmg->GetGroup(); - SMESH_GroupBase_i* g_i = SMESH::DownCast< SMESH_GroupBase_i*>( g ); - if ( g_i ) + myBaseGroups[i]->RemoveModifWaiter( this ); + myBaseGroups[i]->UnRegister(); + } + + // remember new groups + myBaseGroups.clear(); + if ( myPredicate ) + { + std::vector predicates; + getPrediacates( myPredicate, predicates ); + for ( size_t i = 0; i < predicates.size(); ++i ) + if ( BelongToMeshGroup_i* bmg = dynamic_cast< BelongToMeshGroup_i* >( predicates[i] )) { - g_i->AddModifWaiter( this ); - g_i->Register(); - myBaseGroups.push_back( g_i ); + SMESH::SMESH_GroupBase_var g = bmg->GetGroup(); + SMESH_GroupBase_i* g_i = SMESH::DownCast< SMESH_GroupBase_i*>( g ); + if ( g_i ) + { + g_i->AddModifWaiter( this ); + g_i->Register(); + myBaseGroups.push_back( g_i ); + } } - } + } } -} -//================================================================================ -/*! - * \brief When notified on removal of myBaseGroups[i], remove a reference to a - * group from a predicate - */ -//================================================================================ - -void Filter_i::OnBaseObjModified(NotifyerAndWaiter* group, bool removed) -{ - if ( !removed ) - return; // a GroupOnFilter holding this filter is notified automatically + //================================================================================ + /*! + * \brief When notified on removal of myBaseGroups[i], remove a reference to a + * group from a predicate + */ + //================================================================================ - if ( myPredicate ) + void Filter_i::OnBaseObjModified(NotifyerAndWaiter* group, bool removed) { - std::vector predicates; - getPrediacates( myPredicate, predicates ); - for ( size_t i = 0; i < predicates.size(); ++i ) - if ( BelongToMeshGroup_i* bmg = dynamic_cast< BelongToMeshGroup_i* >( predicates[i] )) - { - SMESH::SMESH_GroupBase_var g = bmg->GetGroup(); - SMESH_GroupBase_i* g_i = SMESH::DownCast< SMESH_GroupBase_i*>( g ); - if ( g_i == group ) + if ( !removed ) + return; // a GroupOnFilter holding this filter is notified automatically + + if ( myPredicate ) + { + std::vector predicates; + getPrediacates( myPredicate, predicates ); + for ( size_t i = 0; i < predicates.size(); ++i ) + if ( BelongToMeshGroup_i* bmg = dynamic_cast< BelongToMeshGroup_i* >( predicates[i] )) { - bmg->SetGroup( SMESH::SMESH_GroupBase::_nil() ); - bmg->SetGroupID( "" ); + SMESH::SMESH_GroupBase_var g = bmg->GetGroup(); + SMESH_GroupBase_i* g_i = SMESH::DownCast< SMESH_GroupBase_i*>( g ); + if ( g_i == group ) + { + bmg->SetGroup( SMESH::SMESH_GroupBase::_nil() ); + bmg->SetGroupID( "" ); + } } - } - } - - FindBaseObjects(); // release and update myBaseGroups; -} - -/* - FILTER LIBRARY -*/ + } -#define ATTR_TYPE "type" -#define ATTR_COMPARE "compare" -#define ATTR_THRESHOLD "threshold" -#define ATTR_UNARY "unary" -#define ATTR_BINARY "binary" -#define ATTR_THRESHOLD_STR "threshold_str" -#define ATTR_TOLERANCE "tolerance" -#define ATTR_ELEMENT_TYPE "ElementType" - -//======================================================================= -// name : toString -// Purpose : Convert bool to LDOMString -//======================================================================= -static inline LDOMString toString( CORBA::Boolean val ) -{ - return val ? "logical not" : ""; -} + FindBaseObjects(); // release and update myBaseGroups; + } -//======================================================================= -// name : toBool -// Purpose : Convert LDOMString to bool -//======================================================================= -static inline bool toBool( const LDOMString& theStr ) -{ - return theStr.equals( "logical not" ); -} + /* + FILTER LIBRARY + */ + + #define ATTR_TYPE "type" + #define ATTR_COMPARE "compare" + #define ATTR_THRESHOLD "threshold" + #define ATTR_UNARY "unary" + #define ATTR_BINARY "binary" + #define ATTR_THRESHOLD_STR "threshold_str" + #define ATTR_TOLERANCE "tolerance" + #define ATTR_ELEMENT_TYPE "ElementType" + + //======================================================================= + // name : toString + // Purpose : Convert bool to LDOMString + //======================================================================= + static inline LDOMString toString( CORBA::Boolean val ) + { + return val ? "logical not" : ""; + } -//======================================================================= -// name : toString -// Purpose : Convert double to LDOMString -//======================================================================= -static inline LDOMString toString( CORBA::Double val ) -{ - char a[ 255 ]; - sprintf( a, "%e", val ); - return LDOMString( a ); -} + //======================================================================= + // name : toBool + // Purpose : Convert LDOMString to bool + //======================================================================= + static inline bool toBool( const LDOMString& theStr ) + { + return theStr.equals( "logical not" ); + } -//======================================================================= -// name : toDouble -// Purpose : Convert LDOMString to double -//======================================================================= -static inline double toDouble( const LDOMString& theStr ) -{ - return atof( theStr.GetString() ); -} + //======================================================================= + // name : toString + // Purpose : Convert double to LDOMString + //======================================================================= + static inline LDOMString toString( CORBA::Double val ) + { + char a[ 255 ]; + sprintf( a, "%e", val ); + return LDOMString( a ); + } -//======================================================================= -// name : toString -// Purpose : Convert functor type to LDOMString -//======================================================================= -static inline LDOMString toString( CORBA::Long theType ) -{ - switch ( theType ) - { - case FT_AspectRatio : return "Aspect ratio"; - case FT_Warping : return "Warping"; - case FT_MinimumAngle : return "Minimum angle"; - case FT_Taper : return "Taper"; - case FT_Skew : return "Skew"; - case FT_Area : return "Area"; - case FT_Volume3D : return "Volume3D"; - case FT_MaxElementLength2D : return "Max element length 2D"; - case FT_MaxElementLength3D : return "Max element length 3D"; - case FT_BelongToMeshGroup : return "Belong to Mesh Group"; - case FT_BelongToGeom : return "Belong to Geom"; - case FT_BelongToPlane : return "Belong to Plane"; - case FT_BelongToCylinder : return "Belong to Cylinder"; - case FT_BelongToGenSurface : return "Belong to Generic Surface"; - case FT_LyingOnGeom : return "Lying on Geom"; - case FT_BadOrientedVolume : return "Bad Oriented Volume"; - case FT_BareBorderVolume : return "Volumes with bare border"; - case FT_BareBorderFace : return "Faces with bare border"; - case FT_OverConstrainedVolume : return "Over-constrained Volumes"; - case FT_OverConstrainedFace : return "Over-constrained Faces"; - case FT_RangeOfIds : return "Range of IDs"; - case FT_FreeBorders : return "Free borders"; - case FT_FreeEdges : return "Free edges"; - case FT_FreeFaces : return "Free faces"; - case FT_FreeNodes : return "Free nodes"; - case FT_EqualNodes : return "Equal nodes"; - case FT_EqualEdges : return "Equal edges"; - case FT_EqualFaces : return "Equal faces"; - case FT_EqualVolumes : return "Equal volumes"; - case FT_MultiConnection : return "Borders at multi-connections"; - case FT_MultiConnection2D : return "Borders at multi-connections 2D"; - case FT_Length : return "Length"; - case FT_Length2D : return "Length 2D"; - case FT_Length3D : return "Length 3D"; - case FT_Deflection2D : return "Deflection 2D"; - case FT_LessThan : return "Less than"; - case FT_MoreThan : return "More than"; - case FT_EqualTo : return "Equal to"; - case FT_LogicalNOT : return "Not"; - case FT_LogicalAND : return "And"; - case FT_LogicalOR : return "Or"; - case FT_GroupColor : return "Color of Group"; - case FT_LinearOrQuadratic : return "Linear or Quadratic"; - case FT_ElemGeomType : return "Element geometry type"; - case FT_EntityType : return "Entity type"; - case FT_Undefined : return ""; - default : return ""; + //======================================================================= + // name : toDouble + // Purpose : Convert LDOMString to double + //======================================================================= + static inline double toDouble( const LDOMString& theStr ) + { + return atof( theStr.GetString() ); } -} -//======================================================================= -// name : toFunctorType -// Purpose : Convert LDOMString to functor type -//======================================================================= -static inline SMESH::FunctorType toFunctorType( const LDOMString& theStr ) -{ - if ( theStr.equals( "Aspect ratio" ) ) return FT_AspectRatio; - else if ( theStr.equals( "Warping" ) ) return FT_Warping; - else if ( theStr.equals( "Minimum angle" ) ) return FT_MinimumAngle; - else if ( theStr.equals( "Taper" ) ) return FT_Taper; - else if ( theStr.equals( "Skew" ) ) return FT_Skew; - else if ( theStr.equals( "Area" ) ) return FT_Area; - else if ( theStr.equals( "Volume3D" ) ) return FT_Volume3D; - else if ( theStr.equals( "Max element length 2D" ) ) return FT_MaxElementLength2D; - else if ( theStr.equals( "Max element length 3D" ) ) return FT_MaxElementLength3D; - else if ( theStr.equals( "Belong to Mesh Group" ) ) return FT_BelongToMeshGroup; - else if ( theStr.equals( "Belong to Geom" ) ) return FT_BelongToGeom; - else if ( theStr.equals( "Belong to Plane" ) ) return FT_BelongToPlane; - else if ( theStr.equals( "Belong to Cylinder" ) ) return FT_BelongToCylinder; - else if ( theStr.equals( "Belong to Generic Surface" ) ) return FT_BelongToGenSurface; - else if ( theStr.equals( "Lying on Geom" ) ) return FT_LyingOnGeom; - else if ( theStr.equals( "Free borders" ) ) return FT_FreeBorders; - else if ( theStr.equals( "Free edges" ) ) return FT_FreeEdges; - else if ( theStr.equals( "Free faces" ) ) return FT_FreeFaces; - else if ( theStr.equals( "Free nodes" ) ) return FT_FreeNodes; - else if ( theStr.equals( "Equal nodes" ) ) return FT_EqualNodes; - else if ( theStr.equals( "Equal edges" ) ) return FT_EqualEdges; - else if ( theStr.equals( "Equal faces" ) ) return FT_EqualFaces; - else if ( theStr.equals( "Equal volumes" ) ) return FT_EqualVolumes; - else if ( theStr.equals( "Borders at multi-connections" ) ) return FT_MultiConnection; - // else if ( theStr.equals( "Borders at multi-connections 2D" ) ) return FT_MultiConnection2D; - else if ( theStr.equals( "Length" ) ) return FT_Length; - // else if ( theStr.equals( "Length2D" ) ) return FT_Length2D; - // else if ( theStr.equals( "Length3D" ) ) return FT_Length3D; - else if ( theStr.equals( "Deflection" ) ) return FT_Deflection2D; - else if ( theStr.equals( "Range of IDs" ) ) return FT_RangeOfIds; - else if ( theStr.equals( "Bad Oriented Volume" ) ) return FT_BadOrientedVolume; - else if ( theStr.equals( "Volumes with bare border" ) ) return FT_BareBorderVolume; - else if ( theStr.equals( "Faces with bare border" ) ) return FT_BareBorderFace; - else if ( theStr.equals( "Over-constrained Volumes" ) ) return FT_OverConstrainedVolume; - else if ( theStr.equals( "Over-constrained Faces" ) ) return FT_OverConstrainedFace; - else if ( theStr.equals( "Less than" ) ) return FT_LessThan; - else if ( theStr.equals( "More than" ) ) return FT_MoreThan; - else if ( theStr.equals( "Equal to" ) ) return FT_EqualTo; - else if ( theStr.equals( "Not" ) ) return FT_LogicalNOT; - else if ( theStr.equals( "And" ) ) return FT_LogicalAND; - else if ( theStr.equals( "Or" ) ) return FT_LogicalOR; - else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor; - else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic; - else if ( theStr.equals( "Element geometry type" ) ) return FT_ElemGeomType; - else if ( theStr.equals( "Entity type" ) ) return FT_EntityType; - else if ( theStr.equals( "" ) ) return FT_Undefined; - else return FT_Undefined; -} + //======================================================================= + // name : toString + // Purpose : Convert functor type to LDOMString + //======================================================================= + static inline LDOMString toString( CORBA::Long theType ) + { + switch ( theType ) + { + case FT_AspectRatio : return "Aspect ratio"; + case FT_Warping : return "Warping"; + case FT_MinimumAngle : return "Minimum angle"; + case FT_Taper : return "Taper"; + case FT_Skew : return "Skew"; + case FT_Area : return "Area"; + case FT_Volume3D : return "Volume3D"; + case FT_MaxElementLength2D : return "Max element length 2D"; + case FT_MaxElementLength3D : return "Max element length 3D"; + case FT_BelongToMeshGroup : return "Belong to Mesh Group"; + case FT_BelongToGeom : return "Belong to Geom"; + case FT_BelongToPlane : return "Belong to Plane"; + case FT_BelongToCylinder : return "Belong to Cylinder"; + case FT_BelongToGenSurface : return "Belong to Generic Surface"; + case FT_LyingOnGeom : return "Lying on Geom"; + case FT_BadOrientedVolume : return "Bad Oriented Volume"; + case FT_BareBorderVolume : return "Volumes with bare border"; + case FT_BareBorderFace : return "Faces with bare border"; + case FT_OverConstrainedVolume : return "Over-constrained Volumes"; + case FT_OverConstrainedFace : return "Over-constrained Faces"; + case FT_RangeOfIds : return "Range of IDs"; + case FT_FreeBorders : return "Free borders"; + case FT_FreeEdges : return "Free edges"; + case FT_FreeFaces : return "Free faces"; + case FT_FreeNodes : return "Free nodes"; + case FT_EqualNodes : return "Equal nodes"; + case FT_EqualEdges : return "Equal edges"; + case FT_EqualFaces : return "Equal faces"; + case FT_EqualVolumes : return "Equal volumes"; + case FT_MultiConnection : return "Borders at multi-connections"; + case FT_MultiConnection2D : return "Borders at multi-connections 2D"; + case FT_Length : return "Length"; + case FT_Length2D : return "Length 2D"; + case FT_Length3D : return "Length 3D"; + case FT_Deflection2D : return "Deflection 2D"; + case FT_LessThan : return "Less than"; + case FT_MoreThan : return "More than"; + case FT_EqualTo : return "Equal to"; + case FT_LogicalNOT : return "Not"; + case FT_LogicalAND : return "And"; + case FT_LogicalOR : return "Or"; + case FT_GroupColor : return "Color of Group"; + case FT_LinearOrQuadratic : return "Linear or Quadratic"; + case FT_ElemGeomType : return "Element geometry type"; + case FT_EntityType : return "Entity type"; + case FT_Undefined : return ""; + default : return ""; + } + } -//======================================================================= -// name : toFunctorType -// Purpose : Convert LDOMString to value of ElementType enumeration -//======================================================================= -static inline SMESH::ElementType toElementType( const LDOMString& theStr ) -{ - if ( theStr.equals( "NODE" ) ) return SMESH::NODE; - else if ( theStr.equals( "EDGE" ) ) return SMESH::EDGE; - else if ( theStr.equals( "FACE" ) ) return SMESH::FACE; - else if ( theStr.equals( "VOLUME" ) ) return SMESH::VOLUME; - else return SMESH::ALL; -} + //======================================================================= + // name : toFunctorType + // Purpose : Convert LDOMString to functor type + //======================================================================= + static inline SMESH::FunctorType toFunctorType( const LDOMString& theStr ) + { + if ( theStr.equals( "Aspect ratio" ) ) return FT_AspectRatio; + else if ( theStr.equals( "Warping" ) ) return FT_Warping; + else if ( theStr.equals( "Minimum angle" ) ) return FT_MinimumAngle; + else if ( theStr.equals( "Taper" ) ) return FT_Taper; + else if ( theStr.equals( "Skew" ) ) return FT_Skew; + else if ( theStr.equals( "Area" ) ) return FT_Area; + else if ( theStr.equals( "Volume3D" ) ) return FT_Volume3D; + else if ( theStr.equals( "Max element length 2D" ) ) return FT_MaxElementLength2D; + else if ( theStr.equals( "Max element length 3D" ) ) return FT_MaxElementLength3D; + else if ( theStr.equals( "Belong to Mesh Group" ) ) return FT_BelongToMeshGroup; + else if ( theStr.equals( "Belong to Geom" ) ) return FT_BelongToGeom; + else if ( theStr.equals( "Belong to Plane" ) ) return FT_BelongToPlane; + else if ( theStr.equals( "Belong to Cylinder" ) ) return FT_BelongToCylinder; + else if ( theStr.equals( "Belong to Generic Surface" ) ) return FT_BelongToGenSurface; + else if ( theStr.equals( "Lying on Geom" ) ) return FT_LyingOnGeom; + else if ( theStr.equals( "Free borders" ) ) return FT_FreeBorders; + else if ( theStr.equals( "Free edges" ) ) return FT_FreeEdges; + else if ( theStr.equals( "Free faces" ) ) return FT_FreeFaces; + else if ( theStr.equals( "Free nodes" ) ) return FT_FreeNodes; + else if ( theStr.equals( "Equal nodes" ) ) return FT_EqualNodes; + else if ( theStr.equals( "Equal edges" ) ) return FT_EqualEdges; + else if ( theStr.equals( "Equal faces" ) ) return FT_EqualFaces; + else if ( theStr.equals( "Equal volumes" ) ) return FT_EqualVolumes; + else if ( theStr.equals( "Borders at multi-connections" ) ) return FT_MultiConnection; + // else if ( theStr.equals( "Borders at multi-connections 2D" ) ) return FT_MultiConnection2D; + else if ( theStr.equals( "Length" ) ) return FT_Length; + // else if ( theStr.equals( "Length2D" ) ) return FT_Length2D; + // else if ( theStr.equals( "Length3D" ) ) return FT_Length3D; + else if ( theStr.equals( "Deflection" ) ) return FT_Deflection2D; + else if ( theStr.equals( "Range of IDs" ) ) return FT_RangeOfIds; + else if ( theStr.equals( "Bad Oriented Volume" ) ) return FT_BadOrientedVolume; + else if ( theStr.equals( "Volumes with bare border" ) ) return FT_BareBorderVolume; + else if ( theStr.equals( "Faces with bare border" ) ) return FT_BareBorderFace; + else if ( theStr.equals( "Over-constrained Volumes" ) ) return FT_OverConstrainedVolume; + else if ( theStr.equals( "Over-constrained Faces" ) ) return FT_OverConstrainedFace; + else if ( theStr.equals( "Less than" ) ) return FT_LessThan; + else if ( theStr.equals( "More than" ) ) return FT_MoreThan; + else if ( theStr.equals( "Equal to" ) ) return FT_EqualTo; + else if ( theStr.equals( "Not" ) ) return FT_LogicalNOT; + else if ( theStr.equals( "And" ) ) return FT_LogicalAND; + else if ( theStr.equals( "Or" ) ) return FT_LogicalOR; + else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor; + else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic; + else if ( theStr.equals( "Element geometry type" ) ) return FT_ElemGeomType; + else if ( theStr.equals( "Entity type" ) ) return FT_EntityType; + else if ( theStr.equals( "" ) ) return FT_Undefined; + else return FT_Undefined; + } -//======================================================================= -// name : toString -// Purpose : Convert ElementType to string -//======================================================================= -static inline LDOMString toString( const SMESH::ElementType theType ) -{ - switch ( theType ) + //======================================================================= + // name : toFunctorType + // Purpose : Convert LDOMString to value of ElementType enumeration + //======================================================================= + static inline SMESH::ElementType toElementType( const LDOMString& theStr ) { - case SMESH::NODE : return "NODE"; - case SMESH::EDGE : return "EDGE"; - case SMESH::FACE : return "FACE"; - case SMESH::VOLUME : return "VOLUME"; - case SMESH::ALL : return "ALL"; - default : return ""; + if ( theStr.equals( "NODE" ) ) return SMESH::NODE; + else if ( theStr.equals( "EDGE" ) ) return SMESH::EDGE; + else if ( theStr.equals( "FACE" ) ) return SMESH::FACE; + else if ( theStr.equals( "VOLUME" ) ) return SMESH::VOLUME; + else return SMESH::ALL; } -} -//======================================================================= -// name : findFilter -// Purpose : Find filter in document -//======================================================================= -static LDOM_Element findFilter( const char* theFilterName, - const LDOM_Document& theDoc, - LDOM_Node* theParent = 0 ) -{ - LDOM_Element aRootElement = theDoc.getDocumentElement(); - if ( aRootElement.isNull() || !aRootElement.hasChildNodes() ) - return LDOM_Element(); + //======================================================================= + // name : toString + // Purpose : Convert ElementType to string + //======================================================================= + static inline LDOMString toString( const SMESH::ElementType theType ) + { + switch ( theType ) + { + case SMESH::NODE : return "NODE"; + case SMESH::EDGE : return "EDGE"; + case SMESH::FACE : return "FACE"; + case SMESH::VOLUME : return "VOLUME"; + case SMESH::ALL : return "ALL"; + default : return ""; + } + } - for ( LDOM_Node aTypeNode = aRootElement.getFirstChild(); - !aTypeNode.isNull(); aTypeNode = aTypeNode.getNextSibling() ) + //======================================================================= + // name : findFilter + // Purpose : Find filter in document + //======================================================================= + static LDOM_Element findFilter( const char* theFilterName, + const LDOM_Document& theDoc, + LDOM_Node* theParent = 0 ) { - for ( LDOM_Node aFilter = aTypeNode.getFirstChild(); - !aFilter.isNull(); aFilter = aFilter.getNextSibling() ) + LDOM_Element aRootElement = theDoc.getDocumentElement(); + if ( aRootElement.isNull() || !aRootElement.hasChildNodes() ) + return LDOM_Element(); + + for ( LDOM_Node aTypeNode = aRootElement.getFirstChild(); + !aTypeNode.isNull(); aTypeNode = aTypeNode.getNextSibling() ) { - LDOM_Element* anElem = ( LDOM_Element* )&aFilter; - if ( anElem->getTagName().equals( LDOMString( "filter" ) ) && - anElem->getAttribute( "name" ).equals( LDOMString( theFilterName ) ) ) + for ( LDOM_Node aFilter = aTypeNode.getFirstChild(); + !aFilter.isNull(); aFilter = aFilter.getNextSibling() ) { - if ( theParent != 0 ) - *theParent = aTypeNode; - return (LDOM_Element&)aFilter; + LDOM_Element* anElem = ( LDOM_Element* )&aFilter; + if ( anElem->getTagName().equals( LDOMString( "filter" ) ) && + anElem->getAttribute( "name" ).equals( LDOMString( theFilterName ) ) ) + { + if ( theParent != 0 ) + *theParent = aTypeNode; + return (LDOM_Element&)aFilter; + } } } + return LDOM_Element(); } - return LDOM_Element(); -} -//======================================================================= -// name : getSectionName -// Purpose : Get name of section of filters -//======================================================================= -static const char* getSectionName( const ElementType theType ) -{ - switch ( theType ) + //======================================================================= + // name : getSectionName + // Purpose : Get name of section of filters + //======================================================================= + static const char* getSectionName( const ElementType theType ) { - case SMESH::NODE : return "Filters for nodes"; - case SMESH::EDGE : return "Filters for edges"; - case SMESH::FACE : return "Filters for faces"; - case SMESH::VOLUME : return "Filters for volumes"; - case SMESH::ALL : return "Filters for elements"; - default : return ""; - } -} - -//======================================================================= -// name : getSection -// Purpose : Create section for filters corresponding to the entity type -//======================================================================= -static LDOM_Node getSection( const ElementType theType, - LDOM_Document& theDoc, - const bool toCreate = false ) -{ - LDOM_Element aRootElement = theDoc.getDocumentElement(); - if ( aRootElement.isNull() ) - return LDOM_Node(); - - // Find section - bool anExist = false; - const char* aSectionName = getSectionName( theType ); - if ( strcmp( aSectionName, "" ) == 0 ) - return LDOM_Node(); - - LDOM_NodeList aSections = theDoc.getElementsByTagName( "section" ); - LDOM_Node aNode; - for ( int i = 0, n = aSections.getLength(); i < n; i++ ) - { - aNode = aSections.item( i ); - LDOM_Element& anItem = ( LDOM_Element& )aNode; - if ( anItem.getAttribute( "name" ).equals( LDOMString( aSectionName ) ) ) + switch ( theType ) { - anExist = true; - break; + case SMESH::NODE : return "Filters for nodes"; + case SMESH::EDGE : return "Filters for edges"; + case SMESH::FACE : return "Filters for faces"; + case SMESH::VOLUME : return "Filters for volumes"; + case SMESH::ALL : return "Filters for elements"; + default : return ""; } } - // Create new section if necessary - if ( !anExist ) + //======================================================================= + // name : getSection + // Purpose : Create section for filters corresponding to the entity type + //======================================================================= + static LDOM_Node getSection( const ElementType theType, + LDOM_Document& theDoc, + const bool toCreate = false ) { - if ( toCreate ) + LDOM_Element aRootElement = theDoc.getDocumentElement(); + if ( aRootElement.isNull() ) + return LDOM_Node(); + + // Find section + bool anExist = false; + const char* aSectionName = getSectionName( theType ); + if ( strcmp( aSectionName, "" ) == 0 ) + return LDOM_Node(); + + LDOM_NodeList aSections = theDoc.getElementsByTagName( "section" ); + LDOM_Node aNode; + for ( int i = 0, n = aSections.getLength(); i < n; i++ ) { - LDOM_Element aNewItem = theDoc.createElement( "section" ); - aNewItem.setAttribute( "name", aSectionName ); - aRootElement.appendChild( aNewItem ); - return aNewItem; + aNode = aSections.item( i ); + LDOM_Element& anItem = ( LDOM_Element& )aNode; + if ( anItem.getAttribute( "name" ).equals( LDOMString( aSectionName ) ) ) + { + anExist = true; + break; + } } - else - return LDOM_Node(); + + // Create new section if necessary + if ( !anExist ) + { + if ( toCreate ) + { + LDOM_Element aNewItem = theDoc.createElement( "section" ); + aNewItem.setAttribute( "name", aSectionName ); + aRootElement.appendChild( aNewItem ); + return aNewItem; + } + else + return LDOM_Node(); + } + return + aNode; } - return - aNode; -} -//======================================================================= -// name : createFilterItem -// Purpose : Create filter item or LDOM document -//======================================================================= -static LDOM_Element createFilterItem( const char* theName, - SMESH::Filter_ptr theFilter, - LDOM_Document& theDoc ) -{ - // create new filter in document - LDOM_Element aFilterItem = theDoc.createElement( "filter" ); - aFilterItem.setAttribute( "name", theName ); + //======================================================================= + // name : createFilterItem + // Purpose : Create filter item or LDOM document + //======================================================================= + static LDOM_Element createFilterItem( const char* theName, + SMESH::Filter_ptr theFilter, + LDOM_Document& theDoc ) + { + // create new filter in document + LDOM_Element aFilterItem = theDoc.createElement( "filter" ); + aFilterItem.setAttribute( "name", theName ); - // save filter criterions - SMESH::Filter::Criteria_var aCriteria = new SMESH::Filter::Criteria; + // save filter criterions + SMESH::Filter::Criteria_var aCriteria = new SMESH::Filter::Criteria; - if ( !theFilter->GetCriteria( aCriteria ) ) - return LDOM_Element(); + if ( !theFilter->GetCriteria( aCriteria ) ) + return LDOM_Element(); - for ( CORBA::ULong i = 0, n = aCriteria->length(); i < n; i++ ) - { - LDOM_Element aCriterionItem = theDoc.createElement( "criterion" ); + for ( CORBA::ULong i = 0, n = aCriteria->length(); i < n; i++ ) + { + LDOM_Element aCriterionItem = theDoc.createElement( "criterion" ); - aCriterionItem.setAttribute( ATTR_TYPE , toString( aCriteria[ i ].Type) ); - aCriterionItem.setAttribute( ATTR_COMPARE , toString( aCriteria[ i ].Compare ) ); - aCriterionItem.setAttribute( ATTR_THRESHOLD , toString( aCriteria[ i ].Threshold ) ); - aCriterionItem.setAttribute( ATTR_UNARY , toString( aCriteria[ i ].UnaryOp ) ); - aCriterionItem.setAttribute( ATTR_BINARY , toString( aCriteria[ i ].BinaryOp ) ); - - aCriterionItem.setAttribute( ATTR_THRESHOLD_STR, (const char*)aCriteria[ i ].ThresholdStr ); - aCriterionItem.setAttribute( ATTR_TOLERANCE , toString( aCriteria[ i ].Tolerance ) ); - aCriterionItem.setAttribute( ATTR_ELEMENT_TYPE , - toString( (SMESH::ElementType)aCriteria[ i ].TypeOfElement ) ); + aCriterionItem.setAttribute( ATTR_TYPE , toString( aCriteria[ i ].Type) ); + aCriterionItem.setAttribute( ATTR_COMPARE , toString( aCriteria[ i ].Compare ) ); + aCriterionItem.setAttribute( ATTR_THRESHOLD , toString( aCriteria[ i ].Threshold ) ); + aCriterionItem.setAttribute( ATTR_UNARY , toString( aCriteria[ i ].UnaryOp ) ); + aCriterionItem.setAttribute( ATTR_BINARY , toString( aCriteria[ i ].BinaryOp ) ); + + aCriterionItem.setAttribute( ATTR_THRESHOLD_STR, (const char*)aCriteria[ i ].ThresholdStr ); + aCriterionItem.setAttribute( ATTR_TOLERANCE , toString( aCriteria[ i ].Tolerance ) ); + aCriterionItem.setAttribute( ATTR_ELEMENT_TYPE , + toString( (SMESH::ElementType)aCriteria[ i ].TypeOfElement ) ); + + aFilterItem.appendChild( aCriterionItem ); + } - aFilterItem.appendChild( aCriterionItem ); + return aFilterItem; } - return aFilterItem; -} + //======================================================================= + // name : FilterLibrary_i::FilterLibrary_i + // Purpose : Constructor + //======================================================================= + FilterLibrary_i::FilterLibrary_i( const char* theFileName ) + { + myFileName = CORBA::string_dup( theFileName ); + SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i(); + myFilterMgr = aFilterMgr->_this(); -//======================================================================= -// name : FilterLibrary_i::FilterLibrary_i -// Purpose : Constructor -//======================================================================= -FilterLibrary_i::FilterLibrary_i( const char* theFileName ) -{ - myFileName = CORBA::string_dup( theFileName ); - SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i(); - myFilterMgr = aFilterMgr->_this(); + LDOMParser aParser; + + // Try to use existing library file + bool anExists = false; + if ( !aParser.parse( myFileName ) ) + { + myDoc = aParser.getDocument(); + anExists = true; + } + // Create a new XML document if it doesn't exist + else + myDoc = LDOM_Document::createDocument( LDOMString() ); - LDOMParser aParser; + LDOM_Element aRootElement = myDoc.getDocumentElement(); + if ( aRootElement.isNull() ) + { + // If the existing document is empty --> try to create a new one + if ( anExists ) + myDoc = LDOM_Document::createDocument( LDOMString() ); + } + } - // Try to use existing library file - bool anExists = false; - if ( !aParser.parse( myFileName ) ) + //======================================================================= + // name : FilterLibrary_i::FilterLibrary_i + // Purpose : Constructor + //======================================================================= + FilterLibrary_i::FilterLibrary_i() { - myDoc = aParser.getDocument(); - anExists = true; - } - // Create a new XML document if it doesn't exist - else + myFileName = 0; + SMESH::FilterManager_i* aFilter = new SMESH::FilterManager_i(); + myFilterMgr = aFilter->_this(); + myDoc = LDOM_Document::createDocument( LDOMString() ); + } - LDOM_Element aRootElement = myDoc.getDocumentElement(); - if ( aRootElement.isNull() ) + FilterLibrary_i::~FilterLibrary_i() { - // If the existing document is empty --> try to create a new one - if ( anExists ) - myDoc = LDOM_Document::createDocument( LDOMString() ); + CORBA::string_free( myFileName ); + //TPythonDump()<_this(); - - myDoc = LDOM_Document::createDocument( LDOMString() ); -} -FilterLibrary_i::~FilterLibrary_i() -{ - CORBA::string_free( myFileName ); - //TPythonDump()< aCriteria; - std::list aCriteria; + for ( LDOM_Node aCritNode = aFilter.getFirstChild(); + !aCritNode.isNull() ; aCritNode = aCritNode.getNextSibling() ) + { + LDOM_Element* aCrit = (LDOM_Element*)&aCritNode; - for ( LDOM_Node aCritNode = aFilter.getFirstChild(); - !aCritNode.isNull() ; aCritNode = aCritNode.getNextSibling() ) - { - LDOM_Element* aCrit = (LDOM_Element*)&aCritNode; + const char* aTypeStr = aCrit->getAttribute( ATTR_TYPE ).GetString(); + const char* aCompareStr = aCrit->getAttribute( ATTR_COMPARE ).GetString(); + const char* aUnaryStr = aCrit->getAttribute( ATTR_UNARY ).GetString(); + const char* aBinaryStr = aCrit->getAttribute( ATTR_BINARY ).GetString(); + const char* anElemTypeStr = aCrit->getAttribute( ATTR_ELEMENT_TYPE ).GetString(); - const char* aTypeStr = aCrit->getAttribute( ATTR_TYPE ).GetString(); - const char* aCompareStr = aCrit->getAttribute( ATTR_COMPARE ).GetString(); - const char* aUnaryStr = aCrit->getAttribute( ATTR_UNARY ).GetString(); - const char* aBinaryStr = aCrit->getAttribute( ATTR_BINARY ).GetString(); - const char* anElemTypeStr = aCrit->getAttribute( ATTR_ELEMENT_TYPE ).GetString(); + SMESH::Filter::Criterion aCriterion = createCriterion(); - SMESH::Filter::Criterion aCriterion = createCriterion(); + aCriterion.Type = toFunctorType( aTypeStr ); + aCriterion.Compare = toFunctorType( aCompareStr ); + aCriterion.UnaryOp = toFunctorType( aUnaryStr ); + aCriterion.BinaryOp = toFunctorType( aBinaryStr ); - aCriterion.Type = toFunctorType( aTypeStr ); - aCriterion.Compare = toFunctorType( aCompareStr ); - aCriterion.UnaryOp = toFunctorType( aUnaryStr ); - aCriterion.BinaryOp = toFunctorType( aBinaryStr ); + aCriterion.TypeOfElement = toElementType( anElemTypeStr ); - aCriterion.TypeOfElement = toElementType( anElemTypeStr ); + LDOMString str = aCrit->getAttribute( ATTR_THRESHOLD ); + int val = 0; + aCriterion.Threshold = str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) + ? val : atof( str.GetString() ); - LDOMString str = aCrit->getAttribute( ATTR_THRESHOLD ); - int val = 0; - aCriterion.Threshold = str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) - ? val : atof( str.GetString() ); + str = aCrit->getAttribute( ATTR_TOLERANCE ); + aCriterion.Tolerance = str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) + ? val : atof( str.GetString() ); - str = aCrit->getAttribute( ATTR_TOLERANCE ); - aCriterion.Tolerance = str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) - ? val : atof( str.GetString() ); + str = aCrit->getAttribute( ATTR_THRESHOLD_STR ); + if ( str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) ) + { + char a[ 255 ]; + sprintf( a, "%d", val ); + aCriterion.ThresholdStr = CORBA::string_dup( a ); + } + else + aCriterion.ThresholdStr = str.GetString(); - str = aCrit->getAttribute( ATTR_THRESHOLD_STR ); - if ( str.Type() == LDOMBasicString::LDOM_Integer && str.GetInteger( val ) ) - { - char a[ 255 ]; - sprintf( a, "%d", val ); - aCriterion.ThresholdStr = CORBA::string_dup( a ); + aCriteria.push_back( aCriterion ); } - else - aCriterion.ThresholdStr = str.GetString(); - aCriteria.push_back( aCriterion ); - } - - SMESH::Filter::Criteria_var aCriteriaVar = new SMESH::Filter::Criteria; - aCriteriaVar->length( aCriteria.size() ); + SMESH::Filter::Criteria_var aCriteriaVar = new SMESH::Filter::Criteria; + aCriteriaVar->length( aCriteria.size() ); - CORBA::ULong i = 0; - std::list::iterator anIter = aCriteria.begin(); + CORBA::ULong i = 0; + std::list::iterator anIter = aCriteria.begin(); - for( ; anIter != aCriteria.end(); ++anIter ) - aCriteriaVar[ i++ ] = *anIter; + for( ; anIter != aCriteria.end(); ++anIter ) + aCriteriaVar[ i++ ] = *anIter; - aRes = myFilterMgr->CreateFilter(); - aRes->SetCriteria( aCriteriaVar.inout() ); + aRes = myFilterMgr->CreateFilter(); + aRes->SetCriteria( aCriteriaVar.inout() ); - TPythonDump()<_is_nil() ) - return false; - - // get section corresponding to the filter type - ElementType anEntType = theFilter->GetElementType(); - - LDOM_Node aSection = getSection( anEntType, myDoc, true ); - if ( aSection.isNull() ) - return false; - - // create filter item - LDOM_Element aFilterItem = createFilterItem( theFilterName, theFilter, myDoc ); - if ( aFilterItem.isNull() ) - return false; - else - { - aSection.appendChild( aFilterItem ); - if(Filter_i* aFilter = DownCast(theFilter)) - TPythonDump()<_is_nil() ) + return false; + + // get section corresponding to the filter type + ElementType anEntType = theFilter->GetElementType(); + + LDOM_Node aSection = getSection( anEntType, myDoc, true ); + if ( aSection.isNull() ) + return false; + + // create filter item + LDOM_Element aFilterItem = createFilterItem( theFilterName, theFilter, myDoc ); + if ( aFilterItem.isNull() ) + return false; + else + { + aSection.appendChild( aFilterItem ); + if(Filter_i* aFilter = DownCast(theFilter)) + TPythonDump()<CreateFilter(); + // create filter item + Filter_var aFilter = myFilterMgr->CreateFilter(); - LDOM_Element aFilterItem = createFilterItem( theFilterName, aFilter, myDoc ); - if ( aFilterItem.isNull() ) - return false; - else - { - aSection.appendChild( aFilterItem ); - TPythonDump()<_is_nil() ) - return false; - - LDOM_Element aNewItem = createFilterItem( theNewName, theFilter, myDoc ); - if ( aNewItem.isNull() ) - return false; - else - { - aFilterItem.ReplaceElement( aNewItem ); - if(Filter_i* aFilter = DownCast(theFilter)) - TPythonDump()<_is_nil() ) + return false; - std::filebuf fb; - fb.open( myFileName, std::ios::out ); + LDOM_Element aNewItem = createFilterItem( theNewName, theFilter, myDoc ); + if ( aNewItem.isNull() ) + return false; + else + { + aFilterItem.ReplaceElement( aNewItem ); + if(Filter_i* aFilter = DownCast(theFilter)) + TPythonDump()<length(); -} + //======================================================================= + // name : FilterLibrary_i::SaveAs + // Purpose : Save library on disk + //======================================================================= + CORBA::Boolean FilterLibrary_i::SaveAs( const char* aFileName ) + { + myFileName = strdup ( aFileName ); + TPythonDump()<length(); + } - if ( !aSection.isNull() ) + //======================================================================= + // name : FilterLibrary_i::GetNames + // Purpose : Get names of filters from library + //======================================================================= + string_array* FilterLibrary_i::GetNames( ElementType theType ) { - for ( LDOM_Node aFilter = aSection.getFirstChild(); - !aFilter.isNull(); aFilter = aFilter.getNextSibling() ) + string_array_var anArray = new string_array; + TColStd_SequenceOfHAsciiString aSeq; + + LDOM_Node aSection = getSection( theType, myDoc, false ); + + if ( !aSection.isNull() ) { - LDOM_Element& anElem = ( LDOM_Element& )aFilter; - aSeq.Append( new TCollection_HAsciiString( - (Standard_CString)anElem.getAttribute( "name" ).GetString() ) ); + for ( LDOM_Node aFilter = aSection.getFirstChild(); + !aFilter.isNull(); aFilter = aFilter.getNextSibling() ) + { + LDOM_Element& anElem = ( LDOM_Element& )aFilter; + aSeq.Append( new TCollection_HAsciiString( + (Standard_CString)anElem.getAttribute( "name" ).GetString() ) ); + } } - } - anArray->length( aSeq.Length() ); - for ( int i = 1, n = aSeq.Length(); i <= n; i++ ) - anArray[ i - 1 ] = CORBA::string_dup( aSeq( i )->ToCString() ); + anArray->length( aSeq.Length() ); + for ( int i = 1, n = aSeq.Length(); i <= n; i++ ) + anArray[ i - 1 ] = CORBA::string_dup( aSeq( i )->ToCString() ); - return anArray._retn(); -} + return anArray._retn(); + } -//======================================================================= -// name : FilterLibrary_i::GetAllNames -// Purpose : Get names of filters from library -//======================================================================= -string_array* FilterLibrary_i::GetAllNames() -{ - string_array_var aResArray = new string_array; - for ( int type = SMESH::ALL; type <= SMESH::VOLUME; type++ ) + //======================================================================= + // name : FilterLibrary_i::GetAllNames + // Purpose : Get names of filters from library + //======================================================================= + string_array* FilterLibrary_i::GetAllNames() { - SMESH::string_array_var aNames = GetNames( (SMESH::ElementType)type ); + string_array_var aResArray = new string_array; + for ( int type = SMESH::ALL; type <= SMESH::VOLUME; type++ ) + { + SMESH::string_array_var aNames = GetNames( (SMESH::ElementType)type ); + + int aPrevLength = aResArray->length(); + aResArray->length( aPrevLength + aNames->length() ); + for ( int i = 0, n = aNames->length(); i < n; i++ ) + aResArray[ aPrevLength + i ] = aNames[ i ]; + } - int aPrevLength = aResArray->length(); - aResArray->length( aPrevLength + aNames->length() ); - for ( int i = 0, n = aNames->length(); i < n; i++ ) - aResArray[ aPrevLength + i ] = aNames[ i ]; + return aResArray._retn(); } - return aResArray._retn(); -} + //================================================================================ + /*! + * \brief Return an array of strings corresponding to items of enum FunctorType + */ + //================================================================================ -//================================================================================ -/*! - * \brief Return an array of strings corresponding to items of enum FunctorType - */ -//================================================================================ + static const char** getFunctNames() + { + static const char* functName[] = { + // IT's necessary to update this array according to enum FunctorType (SMESH_Filter.idl) + // The order is IMPORTANT !!! + "FT_AspectRatio", + "FT_AspectRatio3D", + "FT_Warping", + "FT_MinimumAngle", + "FT_Taper", + "FT_Skew", + "FT_Area", + "FT_Volume3D", + "FT_MaxElementLength2D", + "FT_MaxElementLength3D", + "FT_FreeBorders", + "FT_FreeEdges", + "FT_FreeNodes", + "FT_FreeFaces", + "FT_EqualNodes", + "FT_EqualEdges", + "FT_EqualFaces", + "FT_EqualVolumes", + "FT_MultiConnection", + "FT_MultiConnection2D", + "FT_Length", + "FT_Length2D", + "FT_Length3D", + "FT_Deflection2D", + "FT_NodeConnectivityNumber", + "FT_BelongToMeshGroup", + "FT_BelongToGeom", + "FT_BelongToPlane", + "FT_BelongToCylinder", + "FT_BelongToGenSurface", + "FT_LyingOnGeom", + "FT_RangeOfIds", + "FT_BadOrientedVolume", + "FT_BareBorderVolume", + "FT_BareBorderFace", + "FT_OverConstrainedVolume", + "FT_OverConstrainedFace", + "FT_LinearOrQuadratic", + "FT_GroupColor", + "FT_ElemGeomType", + "FT_EntityType", + "FT_CoplanarFaces", + "FT_BallDiameter", + "FT_ConnectedElements", + "FT_LessThan", + "FT_MoreThan", + "FT_EqualTo", + "FT_LogicalNOT", + "FT_LogicalAND", + "FT_LogicalOR", + "FT_Undefined"}; + + #ifdef _DEBUG_ + // check if functName is complete, compilation failure means that enum FunctorType changed + const int nbFunctors = sizeof(functName) / sizeof(const char*); + int _assert[( nbFunctors == SMESH::FT_Undefined + 1 ) ? 2 : -1 ]; _assert[0]=_assert[1]=0; + #endif + + return functName; + } -static const char** getFunctNames() -{ - static const char* functName[] = { - // IT's necessary to update this array according to enum FunctorType (SMESH_Filter.idl) - // The order is IMPORTANT !!! - "FT_AspectRatio", - "FT_AspectRatio3D", - "FT_Warping", - "FT_MinimumAngle", - "FT_Taper", - "FT_Skew", - "FT_Area", - "FT_Volume3D", - "FT_MaxElementLength2D", - "FT_MaxElementLength3D", - "FT_FreeBorders", - "FT_FreeEdges", - "FT_FreeNodes", - "FT_FreeFaces", - "FT_EqualNodes", - "FT_EqualEdges", - "FT_EqualFaces", - "FT_EqualVolumes", - "FT_MultiConnection", - "FT_MultiConnection2D", - "FT_Length", - "FT_Length2D", - "FT_Length3D", - "FT_Deflection2D", - "FT_NodeConnectivityNumber", - "FT_BelongToMeshGroup", - "FT_BelongToGeom", - "FT_BelongToPlane", - "FT_BelongToCylinder", - "FT_BelongToGenSurface", - "FT_LyingOnGeom", - "FT_RangeOfIds", - "FT_BadOrientedVolume", - "FT_BareBorderVolume", - "FT_BareBorderFace", - "FT_OverConstrainedVolume", - "FT_OverConstrainedFace", - "FT_LinearOrQuadratic", - "FT_GroupColor", - "FT_ElemGeomType", - "FT_EntityType", - "FT_CoplanarFaces", - "FT_BallDiameter", - "FT_ConnectedElements", - "FT_LessThan", - "FT_MoreThan", - "FT_EqualTo", - "FT_LogicalNOT", - "FT_LogicalAND", - "FT_LogicalOR", - "FT_Undefined"}; - -#ifdef _DEBUG_ - // check if functName is complete, compilation failure means that enum FunctorType changed - const int nbFunctors = sizeof(functName) / sizeof(const char*); - int _assert[( nbFunctors == SMESH::FT_Undefined + 1 ) ? 2 : -1 ]; _assert[0]=_assert[1]=0; -#endif - - return functName; -} + //================================================================================ + /*! + * \brief Return a string corresponding to an item of enum FunctorType + */ + //================================================================================ -//================================================================================ -/*! - * \brief Return a string corresponding to an item of enum FunctorType - */ -//================================================================================ + const char* FunctorTypeToString(FunctorType ft) + { + if ( ft < 0 || ft > SMESH::FT_Undefined ) + return "FT_Undefined"; + return getFunctNames()[ ft ]; + } -const char* SMESH::FunctorTypeToString(SMESH::FunctorType ft) -{ - if ( ft < 0 || ft > SMESH::FT_Undefined ) - return "FT_Undefined"; - return getFunctNames()[ ft ]; -} + //================================================================================ + /*! + * \brief Converts a string to FunctorType. This is reverse of FunctorTypeToString() + */ + //================================================================================ -//================================================================================ -/*! - * \brief Converts a string to FunctorType. This is reverse of FunctorTypeToString() - */ -//================================================================================ + FunctorType StringToFunctorType(const char* str) + { + std::string name( str + 3 ); // skip "FT_" + const char** functNames = getFunctNames(); + int ft = 0; + for ( ; ft < SMESH::FT_Undefined; ++ft ) + if ( name == ( functNames[ft] + 3 )) + break; -SMESH::FunctorType SMESH::StringToFunctorType(const char* str) -{ - std::string name( str + 3 ); // skip "FT_" - const char** functNames = getFunctNames(); - int ft = 0; - for ( ; ft < SMESH::FT_Undefined; ++ft ) - if ( name == ( functNames[ft] + 3 )) - break; + //ASSERT( strcmp( str, FunctorTypeToString( SMESH::FunctorType( ft ))) == 0 ); - //ASSERT( strcmp( str, FunctorTypeToString( SMESH::FunctorType( ft ))) == 0 ); + return SMESH::FunctorType( ft ); + } - return SMESH::FunctorType( ft ); -} + //================================================================================ + /*! + * \brief calls OnBaseObjModified(), if who != this, and myWaiters[i]->Modified(who) + */ + //================================================================================ -//================================================================================ -/*! - * \brief calls OnBaseObjModified(), if who != this, and myWaiters[i]->Modified(who) - */ -//================================================================================ + void NotifyerAndWaiter::Modified( bool removed, NotifyerAndWaiter* who ) + { + if ( who != 0 && who != this ) + OnBaseObjModified( who, removed ); + else + who = this; -void NotifyerAndWaiter::Modified( bool removed, NotifyerAndWaiter* who ) -{ - if ( who != 0 && who != this ) - OnBaseObjModified( who, removed ); - else - who = this; - - std::list waiters = myWaiters; // myWaiters can be changed by Modified() - std::list::iterator i = waiters.begin(); - for ( ; i != waiters.end(); ++i ) - (*i)->Modified( removed, who ); -} + std::list waiters = myWaiters; // myWaiters can be changed by Modified() + std::list::iterator i = waiters.begin(); + for ( ; i != waiters.end(); ++i ) + (*i)->Modified( removed, who ); + } -//================================================================================ -/*! - * \brief Stores an object to be notified on change of predicate - */ -//================================================================================ + //================================================================================ + /*! + * \brief Stores an object to be notified on change of predicate + */ + //================================================================================ -void NotifyerAndWaiter::AddModifWaiter( NotifyerAndWaiter* waiter ) -{ - if ( waiter ) - myWaiters.push_back( waiter ); -} + void NotifyerAndWaiter::AddModifWaiter( NotifyerAndWaiter* waiter ) + { + if ( waiter ) + myWaiters.push_back( waiter ); + } -//================================================================================ -/*! - * \brief Removes an object to be notified on change of predicate - */ -//================================================================================ + //================================================================================ + /*! + * \brief Removes an object to be notified on change of predicate + */ + //================================================================================ -void NotifyerAndWaiter::RemoveModifWaiter( NotifyerAndWaiter* waiter ) -{ - myWaiters.remove( waiter ); -} + void NotifyerAndWaiter::RemoveModifWaiter( NotifyerAndWaiter* waiter ) + { + myWaiters.remove( waiter ); + } -//================================================================================ -/*! - * \brief Checks if a waiter is among myWaiters, maybe nested - */ -//================================================================================ + //================================================================================ + /*! + * \brief Checks if a waiter is among myWaiters, maybe nested + */ + //================================================================================ -bool NotifyerAndWaiter::ContainModifWaiter( NotifyerAndWaiter* waiter ) -{ - bool is = ( waiter == this ); + bool NotifyerAndWaiter::ContainModifWaiter( NotifyerAndWaiter* waiter ) + { + bool is = ( waiter == this ); - std::list::iterator w = myWaiters.begin(); - for ( ; !is && w != myWaiters.end(); ++w ) - is = (*w)->ContainModifWaiter( waiter ); + std::list::iterator w = myWaiters.begin(); + for ( ; !is && w != myWaiters.end(); ++w ) + is = (*w)->ContainModifWaiter( waiter ); - return is; + return is; + } } diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 9828ac984..357ae2aa3 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -43,8 +43,6 @@ #include "utilities.h" -using namespace SMESH; - //============================================================================= /*! * @@ -158,7 +156,7 @@ void SMESH_GroupBase_i::SetName( const char* theName ) aGen->SetName( anSO, theName ); // Update Python script - TPythonDump() << anSO << ".SetName( '" << theName << "' )"; + SMESH::TPythonDump() << anSO << ".SetName( '" << theName << "' )"; } } @@ -264,7 +262,7 @@ void SMESH_Group_i::Clear() myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) << ".Clear()"; // Clear the group SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); @@ -304,7 +302,7 @@ SMESH::smIdType SMESH_Group_i::Add( const SMESH::smIdType_array& theIDs ) myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )"; + SMESH::TPythonDump() << "nbAdd = " << SMESH::SMESH_Group_var(_this()) << ".Add( " << theIDs << " )"; // Add elements to the group SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); @@ -335,7 +333,7 @@ SMESH::smIdType SMESH_Group_i::Remove( const SMESH::smIdType_array& theIDs ) myPreMeshInfo->FullLoadFromFile(); // Update Python script - TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this()) + SMESH::TPythonDump() << "nbDel = " << SMESH::SMESH_Group_var(_this()) << ".Remove( " << theIDs << " )"; // Remove elements from the group @@ -364,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, - 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(theGroupBase)){ @@ -394,8 +392,8 @@ AddByPredicate( SMESH::Predicate_ptr thePredicate ) myPreMeshInfo->FullLoadFromFile(); if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ - TPythonDump() << SMESH::SMESH_Group_var(_this()) - << ".AddByPredicate( " << aPredicate << " )"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) + << ".AddByPredicate( " << aPredicate << " )"; return ChangeByPredicate( aPredicate, GetGroupDS(), this, &SMESHDS_Group::Add ); } return 0; @@ -409,8 +407,8 @@ RemoveByPredicate( SMESH::Predicate_ptr thePredicate ) myPreMeshInfo->FullLoadFromFile(); if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ - TPythonDump() << SMESH::SMESH_Group_var(_this()) - << ".RemoveByPredicate( " << aPredicate << " )"; + SMESH::TPythonDump() << SMESH::SMESH_Group_var(_this()) + << ".RemoveByPredicate( " << aPredicate << " )"; return ChangeByPredicate(aPredicate,GetGroupDS(),this, &SMESHDS_Group::Remove); } return 0; @@ -421,7 +419,7 @@ SMESH::smIdType SMESH_Group_i::AddFrom( SMESH::SMESH_IDSource_ptr theSource ) if ( myPreMeshInfo ) myPreMeshInfo->FullLoadFromFile(); - TPythonDump pd; + SMESH::TPythonDump pd; long prevNb = Size(); SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); if (aGroupDS) { @@ -475,7 +473,7 @@ SMESH::smIdType_array* SMESH_GroupBase_i::GetListOfID() smIdType aSize = aGroupDS->Extent(); aRes->length(aSize); SMDS_ElemIteratorPtr it = aGroupDS->GetElements(); - for (smIdType i = 0; it->more(); i++) + for (::smIdType i = 0; it->more(); i++) aRes[i] = it->next()->GetID(); if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;) @@ -639,9 +637,9 @@ void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color) if ( oldColor != aQColor ) { aGroupDS->SetColor(aQColor); - TPythonDump()<< SMESH::SMESH_GroupBase_var(_this()) - << ".SetColor( SALOMEDS.Color( " - <SetColorGroup(color); - TPythonDump()<GetGen()->HighLightInvalid( me, false ); - TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )"; + SMESH::TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )"; } //================================================================================ @@ -856,7 +854,7 @@ void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter) SMESH::Filter_ptr SMESH_GroupOnFilter_i::GetFilter() { SMESH::Filter_var f = myFilter; - TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()"; + SMESH::TPythonDump() << f << " = " << SMESH::SMESH_GroupOnFilter_var(_this()) << ".GetFilter()"; return f._retn(); } @@ -938,7 +936,7 @@ SMESH::smIdType_array* SMESH_GroupOnFilter_i::GetMeshInfo() if ( g->GetType() != SMDSAbs_Node ) { - std::vector< SMESH::smIdType > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo(); + std::vector< smIdType > nbElems = static_cast< SMESHDS_GroupOnFilter* >( g )->GetMeshInfo(); for ( size_t i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++) if ( i < nbElems.size() ) aRes[i] = nbElems[ i ]; @@ -1039,7 +1037,7 @@ SMESH::Filter_ptr SMESH_GroupOnFilter_i::StringToFilter(const std::string& thePe } // create a filter - TPythonDump pd; + SMESH::TPythonDump pd; SMESH::FilterManager_i* aFilterMgr = new SMESH::FilterManager_i(); filter = aFilterMgr->CreateFilter(); filter->SetCriteria( criteria.inout() ); diff --git a/src/SMESH_I/SMESH_Measurements_i.cxx b/src/SMESH_I/SMESH_Measurements_i.cxx index f81c0573b..ce71af650 100644 --- a/src/SMESH_I/SMESH_Measurements_i.cxx +++ b/src/SMESH_I/SMESH_Measurements_i.cxx @@ -22,10 +22,6 @@ // File : SMESH_Measurements_i.cxx // Author : Pavel TELKOV, Open CASCADE S.A.S. (pavel.telkov@opencascade.com) -#ifdef WIN32 -#define NOMINMAX -#endif - #include "SMESH_Measurements_i.hxx" #include "SMDS_ElemIterator.hxx" @@ -40,7 +36,7 @@ #include -using namespace SMESH; +//using namespace SMESH; /** * this local function to avoid uninitialized fields @@ -80,7 +76,7 @@ SMESH::Measurements_ptr SMESH_Gen_i::CreateMeasurements() // name : Measurements_i // Purpose : Constructor //======================================================================= -Measurements_i::Measurements_i() +SMESH::Measurements_i::Measurements_i() : SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() ) { //Base class Salome_GenericObject do it inmplicitly by overriding PortableServer::POA_ptr _default_POA() method @@ -92,7 +88,7 @@ Measurements_i::Measurements_i() // name : ~Measurements_i // Purpose : Destructor //======================================================================= -Measurements_i::~Measurements_i() +SMESH::Measurements_i::~Measurements_i() { //TPythonDump()<GetMesh(); - SMESH_Mesh_i* anImplPtr = DownCast( mesh ); + SMESH_Mesh_i* anImplPtr = SMESH::DownCast( mesh ); if (anImplPtr) return anImplPtr->GetImpl().GetMeshDS(); } @@ -187,7 +183,7 @@ static double getNumericalValue(SMESH::SMESH_IDSource_ptr theSource, // name : MinDistance // Purpose : minimal distance between two given entities //======================================================================= -SMESH::Measure Measurements_i::MinDistance +SMESH::Measure SMESH::Measurements_i::MinDistance (SMESH::SMESH_IDSource_ptr theSource1, SMESH::SMESH_IDSource_ptr theSource2) { @@ -289,7 +285,7 @@ static void enlargeBoundingBox(const SMESH::SMESH_IDSource_ptr theObject, if ( !aMesh ) return; - if ( DownCast( theObject )) // theObject is mesh + if (SMESH::DownCast( theObject )) // theObject is mesh { for (SMDS_NodeIteratorPtr aNodeIter = aMesh->nodesIterator(); aNodeIter->more(); ) enlargeBoundingBox( aNodeIter->next(), theMeasure); @@ -318,7 +314,7 @@ static void enlargeBoundingBox(const SMESH::SMESH_IDSource_ptr theObject, // name : BoundingBox // Purpose : compute common bounding box of entities //======================================================================= -SMESH::Measure Measurements_i::BoundingBox (const SMESH::ListOfIDSources& theSources) +SMESH::Measure SMESH::Measurements_i::BoundingBox (const SMESH::ListOfIDSources& theSources) { SMESH::Measure aMeasure; initMeasure(aMeasure); @@ -334,7 +330,7 @@ SMESH::Measure Measurements_i::BoundingBox (const SMESH::ListOfIDSources& theSou // name : Length // Purpose : sum of length of 1D elements of the source //======================================================================= -double Measurements_i::Length(SMESH::SMESH_IDSource_ptr theSource) +double SMESH::Measurements_i::Length(SMESH::SMESH_IDSource_ptr theSource) { return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Length()) ); } @@ -343,7 +339,7 @@ double Measurements_i::Length(SMESH::SMESH_IDSource_ptr theSource) // name : Area // Purpose : sum of area of 2D elements of the source //======================================================================= -double Measurements_i::Area(SMESH::SMESH_IDSource_ptr theSource) +double SMESH::Measurements_i::Area(SMESH::SMESH_IDSource_ptr theSource) { return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Area()) ); } @@ -352,7 +348,7 @@ double Measurements_i::Area(SMESH::SMESH_IDSource_ptr theSource) // name : Volume // Purpose : sum of volume of 3D elements of the source //======================================================================= -double Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource) +double SMESH::Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource) { return getNumericalValue( theSource, SMESH::Controls::NumericalFunctorPtr(new SMESH::Controls::Volume()) ); } @@ -362,7 +358,7 @@ double Measurements_i::Volume(SMESH::SMESH_IDSource_ptr theSource) //purpose : return gravity center of the source: average coordinates of all nodes //======================================================================= -SMESH::PointStruct Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSource) +SMESH::PointStruct SMESH::Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSource) { SMESH::PointStruct grCenter = { 0.,0.,0. }; const SMESHDS_Mesh* mesh = getMesh( theSource ); @@ -404,9 +400,9 @@ SMESH::PointStruct Measurements_i::GravityCenter(SMESH::SMESH_IDSource_ptr theSo //purpose : Return angle in radians defined by 3 points <(p1,p2,p3) //======================================================================= -CORBA::Double Measurements_i::Angle(const SMESH::PointStruct& p1, - const SMESH::PointStruct& p2, - const SMESH::PointStruct& p3 ) +CORBA::Double SMESH::Measurements_i::Angle(const SMESH::PointStruct& p1, + const SMESH::PointStruct& p2, + const SMESH::PointStruct& p3 ) { gp_Vec v1( p1.x - p2.x, p1.y - p2.y, p1.z - p2.z ); gp_Vec v2( p3.x - p2.x, p3.y - p2.y, p3.z - p2.z ); diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index d96c5c99e..bc5073500 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -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; iFindElement( 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 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 ); diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx index 2f152c334..69f62d539 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.hxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx @@ -93,7 +93,7 @@ public: SMESH::SMESH_IDSource_ptr MakeIDSource(const SMESH::smIdType_array& IDsOfElements, SMESH::ElementType type); static bool IsTemporaryIDSource( SMESH::SMESH_IDSource_ptr& idSource ); - static SMESH::smIdType* GetTemporaryIDs( SMESH::SMESH_IDSource_ptr& idSource, smIdType& nbIds ); + static SMESH::smIdType* GetTemporaryIDs( SMESH::SMESH_IDSource_ptr& idSource, SMESH::smIdType& nbIds ); /*! * \brief Generates the unique group name diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index b3523818b..b2a4be767 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -320,13 +320,8 @@ void StdMeshersGUI_DistrPreview::update() setAxisScale( myDensity->xAxis(), min_x, max_x ); setAxisScale( myDensity->yAxis(), -#ifdef WIN32 - min( 0.0, min_y ), - max( 0.0, max_y ) -#else std::min( 0.0, min_y ), std::max( 0.0, max_y ) -#endif ); myDensity->setSamples( x, y, size ); if( x )