-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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.
+// 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
#include <list>
-#ifdef WNT
+#ifdef WIN32
#pragma warning(disable:4251) // Warning DLL Interface ...
#pragma warning(disable:4290) // Warning Exception ...
#endif
int GetHypotheses(const TopoDS_Shape & aSubShape,
const SMESH_HypoFilter& aFilter,
- std::list <const SMESHDS_Hypothesis * >& aHypList,
- const bool andAncestors) const;
+ std::list< const SMESHDS_Hypothesis * >& aHypList,
+ const bool andAncestors,
+ std::list< TopoDS_Shape > * assignedTo=0) const;
+
+ SMESH_Hypothesis * GetHypothesis(const int aHypID) const;
const std::list<SMESHDS_Command*> & GetLog() throw(SALOME_Exception);
*/
void NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* theChangedHyp);
- const std::list < SMESH_subMesh * >&
- GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) throw(SALOME_Exception);
+ // const std::list < SMESH_subMesh * >&
+ // GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) throw(SALOME_Exception);
/*!
* \brief Return True if anHyp is used to mesh aSubShape
*/
*/
bool HasDuplicatedGroupNamesMED();
- void ExportMED(const char *file,
- const char* theMeshName = NULL,
- bool theAutoGroups = true,
- int theVersion = 0,
- const SMESHDS_Mesh* meshPart = 0)
+ void ExportMED(const char * theFile,
+ const char* theMeshName = NULL,
+ bool theAutoGroups = true,
+ int theVersion = 0,
+ const SMESHDS_Mesh* theMeshPart = 0,
+ bool theAutoDimension = false,
+ bool theAddODOnVertices = false)
throw(SALOME_Exception);
void ExportDAT(const char * file,
void ExportSAUV(const char *file,
const char* theMeshName = NULL,
bool theAutoGroups = true) throw(SALOME_Exception);
+
+ double GetComputeProgress() const;
int NbNodes() const throw(SALOME_Exception);
-
int Nb0DElements() const throw(SALOME_Exception);
+ int NbBalls() const throw(SALOME_Exception);
int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbBiQuadQuadrangles() const throw(SALOME_Exception);
-
+ int NbBiQuadTriangles() const throw(SALOME_Exception);
int NbPolygons() const throw(SALOME_Exception);
int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTriQuadraticHexas() const throw(SALOME_Exception);
-
int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbHexagonalPrisms() const throw(SALOME_Exception);
-
int NbPolyhedrons() const throw(SALOME_Exception);
- int NbBalls() const throw(SALOME_Exception);
-
int NbSubMesh() const throw(SALOME_Exception);
int NbGroup() const { return _mapGroup.size(); }
const TListOfListOfInt& GetMeshOrder() const;
// sort submeshes according to stored mesh order
- bool SortByMeshOrder(std::list<SMESH_subMesh*>& theListToSort) const;
+ bool SortByMeshOrder(std::vector<SMESH_subMesh*>& theListToSort) const;
// return true if given order of sub-meshes is OK
bool IsOrderOK( const SMESH_subMesh* smBefore,
private:
void fillAncestorsMap(const TopoDS_Shape& theShape);
- std::list<SMESH_subMesh*> getAncestorsSubMeshes
- (const TopoDS_Shape& theSubShape) const;
+ void getAncestorsSubMeshes(const TopoDS_Shape& theSubShape,
+ std::vector< SMESH_subMesh* >& theSubMeshes) const;
protected:
int _id; // id given by creator (unique within the creator instance)
int _studyId;
- int _idDoc; // id given by SMESHDS_Document
int _groupId; // id generator for group objects
int _nbSubShapes; // initial nb of subshapes in the shape to mesh
bool _isShapeToMesh;// set to true when a shape is given (only once)
- std::list <SMESH_subMesh*> _subMeshesUsingHypothesisList;
+ //std::list <SMESH_subMesh*> _subMeshesUsingHypothesisList;
SMESHDS_Document * _myDocument;
SMESHDS_Mesh * _myMeshDS;
SMESH_Gen * _gen;
- std::map <int, SMESH_subMesh*> _mapSubMesh;
- std::map <int, SMESH_Group*> _mapGroup;
+ std::map <int, SMESH_Group*> _mapGroup;
+
+ class SubMeshHolder;
+ SubMeshHolder* _subMeshHolder;
bool _isAutoColor;
bool _isModified; //!< modified since last total re-compute, issue 0020693
TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors;
+ mutable std::vector<SMESH_subMesh*> _ancestorSubMeshes; // to speed up GetHypothes[ei]s()
+
TListOfListOfInt _mySubMeshOrder;
// Struct calling methods at CORBA API implementation level, used to
- // 1) make an upper level be consistent with a lower one when group removal
- // is invoked by hyp modification (issue 0020918)
+ // 1) make an upper level (SMESH_I) be consistent with a lower one (SMESH)
+ // when group removal is invoked by hyp modification (issue 0020918)
// 2) to forget not loaded mesh data at hyp modification
TCallUp* _callUp;