X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_FaceOfEdges.cxx;h=2b239c85a1987ebb5b3489b0f8d6074a673d2fb5;hb=8a1ff9ba77b7b72b64b08134f941b56aac80ff55;hp=2e5651fff3079a4fe7065b4fbc37aa36443bf5a6;hpb=c63ee099ad2b149bd70136839c973e8910137bc5;p=modules%2Fsmesh.git diff --git a/src/SMDS/SMDS_FaceOfEdges.cxx b/src/SMDS/SMDS_FaceOfEdges.cxx index 2e5651fff..2b239c85a 100644 --- a/src/SMDS/SMDS_FaceOfEdges.cxx +++ b/src/SMDS/SMDS_FaceOfEdges.cxx @@ -1,24 +1,27 @@ -// SMESH SMDS : implementaion of Salome mesh data structure +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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, or (at your option) any later version. +// +// 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 // -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// SMESH SMDS : implementaion of Salome mesh data structure +// #ifdef _MSC_VER #pragma warning(disable:4786) #endif @@ -26,6 +29,7 @@ #include "SMDS_FaceOfEdges.hxx" #include "SMDS_IteratorOfElements.hxx" #include "SMDS_MeshNode.hxx" +#include "utilities.h" using namespace std; @@ -36,12 +40,12 @@ using namespace std; int SMDS_FaceOfEdges::NbEdges() const { - return myNbEdges; + return myNbEdges; } int SMDS_FaceOfEdges::NbFaces() const { - return 1; + return 1; } //======================================================================= //function : Print @@ -50,15 +54,15 @@ int SMDS_FaceOfEdges::NbFaces() const void SMDS_FaceOfEdges::Print(ostream & OS) const { - OS << "face <" << GetID() << " > : "; - int i; - for (i = 0; i < NbEdges() - 1; i++) OS << myEdges[i] << ","; - OS << myEdges[i] << ") " << endl; + OS << "face <" << GetID() << " > : "; + int i; + for (i = 0; i < NbEdges() - 1; i++) OS << myEdges[i] << ","; + OS << myEdges[i] << ") " << endl; } SMDSAbs_ElementType SMDS_FaceOfEdges::GetType() const { - return SMDSAbs_Face; + return SMDSAbs_Face; } //======================================================================= @@ -84,7 +88,7 @@ class SMDS_FaceOfEdges_MyIterator:public SMDS_ElemIterator { index++; return mySet[index-1]; - } + } }; SMDS_ElemIteratorPtr SMDS_FaceOfEdges::elementsIterator @@ -108,11 +112,12 @@ SMDS_FaceOfEdges::SMDS_FaceOfEdges(const SMDS_MeshEdge* edge1, const SMDS_MeshEdge* edge2, const SMDS_MeshEdge* edge3) { - myNbEdges = 3; - myEdges[0]=edge1; - myEdges[1]=edge2; - myEdges[2]=edge3; - myEdges[3]=0; + //MESSAGE("****************************************************** SMDS_FaceOfEdges"); + myNbEdges = 3; + myEdges[0]=edge1; + myEdges[1]=edge2; + myEdges[2]=edge3; + myEdges[3]=0; } SMDS_FaceOfEdges::SMDS_FaceOfEdges(const SMDS_MeshEdge* edge1, @@ -120,38 +125,39 @@ SMDS_FaceOfEdges::SMDS_FaceOfEdges(const SMDS_MeshEdge* edge1, const SMDS_MeshEdge* edge3, const SMDS_MeshEdge* edge4) { - myNbEdges = 4; - myEdges[0]=edge1; - myEdges[1]=edge2; - myEdges[2]=edge3; - myEdges[3]=edge4; + //MESSAGE("****************************************************** SMDS_FaceOfEdges"); + myNbEdges = 4; + myEdges[0]=edge1; + myEdges[1]=edge2; + myEdges[2]=edge3; + myEdges[3]=edge4; } /*bool operator<(const SMDS_FaceOfEdges& f1, const SMDS_FaceOfEdges& f2) { - set set1,set2; - SMDS_ElemIteratorPtr it; - const SMDS_MeshNode * n; - - it=f1.nodesIterator(); - - while(it->more()) - { - n=static_cast(it->next()); - set1.insert(*n); - } - - delete it; - it=f2.nodesIterator(); - - while(it->more()) - { - n=static_cast(it->next()); - set2.insert(*n); - } - - delete it; - return set1 set1,set2; + SMDS_ElemIteratorPtr it; + const SMDS_MeshNode * n; + + it=f1.nodesIterator(); + + while(it->more()) + { + n=static_cast(it->next()); + set1.insert(*n); + } + + delete it; + it=f2.nodesIterator(); + + while(it->more()) + { + n=static_cast(it->next()); + set2.insert(*n); + } + + delete it; + return set1= myEdges[ i ]->NbNodes() ) index -= myEdges[ i ]->NbNodes(); @@ -181,3 +185,12 @@ const SMDS_MeshNode* SMDS_FaceOfEdges::GetNode(const int ind) const return 0; } +SMDSAbs_EntityType SMDS_FaceOfEdges::GetEntityType() const +{ + return myNbEdges == 3 ? SMDSEntity_Triangle : SMDSEntity_Quadrangle; +} + +SMDSAbs_GeometryType SMDS_FaceOfEdges::GetGeomType() const +{ + return myNbEdges == 3 ? SMDSGeom_TRIANGLE : SMDSGeom_QUADRANGLE; +}