X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Algo.cxx;h=60a55f3be27dd636fc2c45051f8203a560931082;hp=5fc603231d5a8cdb0192d883d6ee71978ea38d63;hb=482a58db1be716040955d1f187d32e01e6001ba2;hpb=8b4ba0cdff7660465a9ea7b26ef0df0757afed97 diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx index 5fc603231..60a55f3be 100644 --- a/src/SMESH/SMESH_Algo.cxx +++ b/src/SMESH/SMESH_Algo.cxx @@ -1,20 +1,36 @@ -using namespace std; -//============================================================================= -// File : SMESH_Algo.cxx -// Created : sam mai 18 09:20:53 CEST 2002 -// Author : Paul RASCLE, EDF -// Project : SALOME -// Copyright : EDF 2002 -// $Header$ -//============================================================================= -using namespace std; +// SMESH SMESH : implementaion of SMESH idl descriptions +// +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SMESH_Algo.cxx +// Author : Paul RASCLE, EDF +// Module : SMESH +// $Header$ +using namespace std; #include "SMESH_Algo.hxx" #include "SMESH_Gen.hxx" #include "SMESH_Mesh.hxx" - -#include "SMESHDS_ListOfPtrHypothesis.hxx" -#include "SMESHDS_ListIteratorOfListOfPtrHypothesis.hxx" +#include "SMESH_HypoFilter.hxx" #include #include @@ -23,6 +39,8 @@ using namespace std; #include "utilities.h" #include +#include +#include //============================================================================= /*! @@ -30,44 +48,14 @@ using namespace std; */ //============================================================================= -SMESH_Algo::SMESH_Algo(int hypId, int studyId, SMESH_Gen* gen) - : SMESH_Hypothesis(hypId, studyId, gen) +SMESH_Algo::SMESH_Algo(int hypId, int studyId, + SMESH_Gen * gen):SMESH_Hypothesis(hypId, studyId, gen) { // _compatibleHypothesis.push_back("hypothese_bidon"); - _type = ALGO; - gen->_mapAlgo[hypId] = this; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -SMESH_Algo::~SMESH_Algo() -{ -} + _type = ALGO; + gen->_mapAlgo[hypId] = this; -//============================================================================= -/*! - * - */ -//============================================================================= - -const vector & SMESH_Algo::GetCompatibleHypothesis() -{ - return _compatibleHypothesis; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & SMESH_Algo::SaveTo(ostream & save) -{ - return save << this; + _onlyUnaryInput = _requireDescretBoundary = true; } //============================================================================= @@ -76,45 +64,8 @@ ostream & SMESH_Algo::SaveTo(ostream & save) */ //============================================================================= -istream & SMESH_Algo::LoadFrom(istream & load) -{ - return load >> (*this); -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream& operator << (ostream & save, SMESH_Algo & hyp) -{ - return save; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream& operator >> (istream & load, SMESH_Algo & hyp) -{ - return load; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -bool SMESH_Algo::CheckHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) +SMESH_Algo::~SMESH_Algo() { - MESSAGE("SMESH_Algo::CheckHypothesis"); - ASSERT(0); // use method from derived classes - return false; } //============================================================================= @@ -123,12 +74,9 @@ bool SMESH_Algo::CheckHypothesis(SMESH_Mesh& aMesh, */ //============================================================================= -bool SMESH_Algo::Compute(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) +const vector < string > &SMESH_Algo::GetCompatibleHypothesis() { - MESSAGE("SMESH_Algo::Compute"); - ASSERT(0); // use method from derived classes - return false; + return _compatibleHypothesis; } //============================================================================= @@ -141,23 +89,20 @@ bool SMESH_Algo::Compute(SMESH_Mesh& aMesh, */ //============================================================================= -const list& -SMESH_Algo::GetUsedHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) +const list & SMESH_Algo::GetUsedHypothesis( + SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) { _usedHypList.clear(); - _usedHypList = GetAppliedHypothesis(aMesh, aShape); // copy - int nbHyp = _usedHypList.size(); - if (nbHyp == 0) - { - TopoDS_Shape mainShape = aMesh.GetMeshDS()->ShapeToMesh(); - if (!mainShape.IsSame(aShape)) - { - _usedHypList = GetAppliedHypothesis(aMesh, mainShape); // copy - nbHyp = _usedHypList.size(); - } - } - if (nbHyp > 1) _usedHypList.clear(); //only one compatible hypothesis allowed + if ( !_compatibleHypothesis.empty() ) + { + SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] )); + for ( int i = 1; i < _compatibleHypothesis.size(); ++i ) + filter.Or( filter.HasName( _compatibleHypothesis[ i ] )); + + aMesh.GetHypotheses( aShape, filter, _usedHypList, true ); + if ( _usedHypList.size() > 1 ) + _usedHypList.clear(); //only one compatible hypothesis allowed + } return _usedHypList; } @@ -169,56 +114,36 @@ SMESH_Algo::GetUsedHypothesis(SMESH_Mesh& aMesh, */ //============================================================================= -const list& -SMESH_Algo::GetAppliedHypothesis(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape) +const list & SMESH_Algo::GetAppliedHypothesis( + SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) { - const Handle(SMESHDS_Mesh)& meshDS = aMesh.GetMeshDS(); - const SMESHDS_ListOfPtrHypothesis& listHyp = meshDS->GetHypothesis(aShape); - SMESHDS_ListIteratorOfListOfPtrHypothesis it(listHyp); - - int hypType; - string hypName; - _appliedHypList.clear(); - while (it.More()) - { - SMESHDS_Hypothesis* anHyp = it.Value(); - hypType = anHyp->GetType(); - //SCRUTE(hypType); - if (hypType == SMESHDS_Hypothesis::PARAM_ALGO) - { - hypName = anHyp->GetName(); - vector::iterator ith = find(_compatibleHypothesis.begin(), - _compatibleHypothesis.end(), - hypName); - if (ith != _compatibleHypothesis.end()) // count only relevant - { - _appliedHypList.push_back(anHyp); - //SCRUTE(hypName); - } - } - it.Next(); - } + if ( !_compatibleHypothesis.empty() ) + { + SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( _compatibleHypothesis[0] )); + for ( int i = 1; i < _compatibleHypothesis.size(); ++i ) + filter.Or( filter.HasName( _compatibleHypothesis[ i ] )); + + aMesh.GetHypotheses( aShape, filter, _appliedHypList, false ); + } return _appliedHypList; } - //============================================================================= /*! * Compute length of an edge */ //============================================================================= -double SMESH_Algo::EdgeLength(const TopoDS_Edge& E) +double SMESH_Algo::EdgeLength(const TopoDS_Edge & E) { - double UMin = 0, UMax = 0; - TopLoc_Location L; - if (BRep_Tool::Degenerated(E)) return 0; - Handle (Geom_Curve) C = BRep_Tool::Curve(E, L, UMin, UMax); - GeomAdaptor_Curve AdaptCurve(C); - GCPnts_AbscissaPoint gabs; - double length = gabs.Length(AdaptCurve, UMin, UMax); - return length; + double UMin = 0, UMax = 0; + TopLoc_Location L; + if (BRep_Tool::Degenerated(E)) + return 0; + Handle(Geom_Curve) C = BRep_Tool::Curve(E, L, UMin, UMax); + GeomAdaptor_Curve AdaptCurve(C); + GCPnts_AbscissaPoint gabs; + double length = gabs.Length(AdaptCurve, UMin, UMax); + return length; } -