X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Mesh.hxx;h=ad5f0aaeb11b6785f22394c21338e45ce3a7b469;hp=92f631890ed558fb02a0d17d91a74548c109ae84;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=10191484fe88a27e962b8e4b57e09d390d8705c7 diff --git a/src/SMESHDS/SMESHDS_Mesh.hxx b/src/SMESHDS/SMESHDS_Mesh.hxx index 92f631890..ad5f0aaeb 100644 --- a/src/SMESHDS/SMESHDS_Mesh.hxx +++ b/src/SMESHDS/SMESHDS_Mesh.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -66,7 +66,7 @@ class DownIdType; class SMESHDS_EXPORT SMESHDS_Mesh : public SMDS_Mesh { -public: + public: SMESHDS_Mesh(int theMeshID, bool theIsEmbeddedMode); bool IsEmbeddedMode(); void SetPersistentId(int id); @@ -566,18 +566,18 @@ public: virtual SMDS_MeshFace* AddQuadPolygonalFace(const std::vector & nodes); virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID - (const std::vector& nodes_ids, - const std::vector& quantities, - const int ID); + (const std::vector& nodes_ids, + const std::vector& quantities, + const int ID); virtual SMDS_MeshVolume* AddPolyhedralVolumeWithID - (const std::vector& nodes, - const std::vector& quantities, - const int ID); + (const std::vector& nodes, + const std::vector& quantities, + const int ID); virtual SMDS_MeshVolume* AddPolyhedralVolume - (const std::vector& nodes, - const std::vector& quantities); + (const std::vector& nodes, + const std::vector& quantities); virtual void MoveNode(const SMDS_MeshNode *, double x, double y, double z); virtual void RemoveNode(const SMDS_MeshNode *); @@ -587,7 +587,7 @@ public: * Methods do not work for meshes with descendants. * Implemented for fast cleaning of meshes. */ - void RemoveFreeNode (const SMDS_MeshNode *, SMESHDS_SubMesh *, bool fromGroups=true); + bool RemoveFreeNode (const SMDS_MeshNode *, SMESHDS_SubMesh *, bool fromGroups=true); void RemoveFreeElement(const SMDS_MeshElement *, SMESHDS_SubMesh *, bool fromGroups=true); void ClearMesh(); @@ -597,9 +597,9 @@ public: const int nbnodes); bool ChangePolygonNodes(const SMDS_MeshElement * elem, std::vector nodes); - bool ChangePolyhedronNodes(const SMDS_MeshElement * elem, - std::vector nodes, - std::vector quantities); + bool ChangePolyhedronNodes(const SMDS_MeshElement * elem, + const std::vector& nodes, + const std::vector& quantities); bool ModifyCellNodes(int smdsVolId, std::map localClonedNodeIds); void Renumber (const bool isNodes, const int startID=1, const int deltaID=1); @@ -646,13 +646,13 @@ public: bool IsGroupOfSubShapes (const TopoDS_Shape& aSubShape) const; - virtual void compactMesh(); + virtual void CompactMesh(); void CleanDownWardConnectivity(); void BuildDownWardConnectivity(bool withEdges); ~SMESHDS_Mesh(); -private: + private: ShapeToHypothesis myShapeToHypothesis; @@ -665,12 +665,12 @@ private: TopTools_IndexedMapOfShape myIndexToShape; typedef std::set TGroups; - TGroups myGroups; + TGroups myGroups; SMESHDS_Script* myScript; bool myIsEmbeddedMode; - bool add( const SMDS_MeshElement* elem, SMESHDS_SubMesh* subMesh ); + int add( const SMDS_MeshElement* elem, SMESHDS_SubMesh* subMesh ); SMESHDS_SubMesh* getSubmesh( const TopoDS_Shape & shape); };