0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids

extract SMESH_MeshPartDS.hxx from SMESH_MeshEditor_i.cxx
This commit is contained in:
eap 2012-09-17 10:22:02 +00:00
parent a1a7402321
commit c651365140
4 changed files with 93 additions and 32 deletions

View File

@ -48,6 +48,7 @@ salomeinclude_HEADERS = \
SMESH_NoteBook.hxx \
SMESH_Measurements_i.hxx \
SMESH_PreMeshInfo.hxx \
SMESH_MeshPartDS.hxx \
SMESH.hxx
# Scripts to be installed.

View File

@ -0,0 +1,70 @@
// Copyright (C) 2007-2012 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.
//
// 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
//
// File : SMESH_MeshPartDS.hxx
// Created : Thu Sep 13 20:26:47 2012
// Author : Edward AGAPOV (eap)
#ifndef __SMESH_MeshPartDS_HXX__
#define __SMESH_MeshPartDS_HXX__
#include "SMESHDS_Mesh.hxx"
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include <list>
//=============================================================================
/*!
* \brief Class providing SMESHDS_Mesh API to SMESH_IDSource.
* It is used to export a part of mesh as a whole mesh.
*/
// Implementation is in SMESH_Mesh_i.cxx where this class was extracted from
class SMESH_MeshPartDS : public SMESHDS_Mesh
{
public:
SMESH_MeshPartDS(SMESH::SMESH_IDSource_ptr meshPart);
SMESH_MeshPartDS(const std::list< const SMDS_MeshElement* > & badElems );
virtual SMDS_NodeIteratorPtr nodesIterator (bool idInceasingOrder=false) const;
virtual SMDS_EdgeIteratorPtr edgesIterator (bool idInceasingOrder=false) const;
virtual SMDS_FaceIteratorPtr facesIterator (bool idInceasingOrder=false) const;
virtual SMDS_VolumeIteratorPtr volumesIterator (bool idInceasingOrder=false) const;
virtual SMDS_ElemIteratorPtr elementsIterator(SMDSAbs_ElementType type=SMDSAbs_All) const;
virtual SMDS_ElemIteratorPtr elementGeomIterator(SMDSAbs_GeometryType type) const;
virtual SMDS_ElemIteratorPtr elementEntityIterator(SMDSAbs_EntityType type) const;
private:
TIDSortedElemSet _elements[ SMDSAbs_NbElementTypes ];
SMESHDS_Mesh* _meshDS;
/*!
* \brief Class used to access to protected data of SMDS_MeshInfo
*/
struct TMeshInfo : public SMDS_MeshInfo
{
void Add(const SMDS_MeshElement* e) { SMDS_MeshInfo::addWithPoly( e ); }
};
};
#endif

View File

@ -43,6 +43,7 @@
#include "SMESH_MEDMesh_i.hxx"
#include "SMESH_MeshEditor.hxx"
#include "SMESH_MeshEditor_i.hxx"
#include "SMESH_MeshPartDS.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_PreMeshInfo.hxx"
#include "SMESH_PythonDump.hxx"
@ -2838,37 +2839,6 @@ void SMESH_Mesh_i::ExportSTL (const char *file, const bool isascii)
_impl->ExportSTL(file, isascii);
}
//=============================================================================
/*!
* \brief Class providing SMESHDS_Mesh API to SMESH_IDSource.
* It is used to export a part of mesh as a whole mesh.
*/
class SMESH_MeshPartDS : public SMESHDS_Mesh
{
public:
SMESH_MeshPartDS(SMESH::SMESH_IDSource_ptr meshPart);
virtual SMDS_NodeIteratorPtr nodesIterator (bool idInceasingOrder=false) const;
virtual SMDS_EdgeIteratorPtr edgesIterator (bool idInceasingOrder=false) const;
virtual SMDS_FaceIteratorPtr facesIterator (bool idInceasingOrder=false) const;
virtual SMDS_VolumeIteratorPtr volumesIterator (bool idInceasingOrder=false) const;
virtual SMDS_ElemIteratorPtr elementsIterator(SMDSAbs_ElementType type=SMDSAbs_All) const;
virtual SMDS_ElemIteratorPtr elementGeomIterator(SMDSAbs_GeometryType type) const;
virtual SMDS_ElemIteratorPtr elementEntityIterator(SMDSAbs_EntityType type) const;
private:
TIDSortedElemSet _elements[ SMDSAbs_NbElementTypes ];
SMESHDS_Mesh* _meshDS;
/*!
* \brief Class used to access to protected data of SMDS_MeshInfo
*/
struct TMeshInfo : public SMDS_MeshInfo
{
void Add(const SMDS_MeshElement* e) { SMDS_MeshInfo::addWithPoly( e ); }
};
};
//================================================================================
/*!
* \brief Export a part of mesh to a med file
@ -4901,6 +4871,27 @@ SMESH_MeshPartDS::SMESH_MeshPartDS(SMESH::SMESH_IDSource_ptr meshPart):
}
}
// -------------------------------------------------------------------------------------
SMESH_MeshPartDS::SMESH_MeshPartDS(const std::list< const SMDS_MeshElement* > & meshPart):
SMESHDS_Mesh( /*meshID=*/-1, /*isEmbeddedMode=*/true), _meshDS(0)
{
TMeshInfo tmpInfo;
list< const SMDS_MeshElement* >::const_iterator partIt = meshPart.begin();
for ( ; partIt != meshPart.end(); ++partIt )
if ( const SMDS_MeshElement * e = *partIt )
if ( _elements[ e->GetType() ].insert( e ).second )
{
tmpInfo.Add( e );
SMDS_ElemIteratorPtr nIt = e->nodesIterator();
while ( nIt->more() )
{
const SMDS_MeshNode * n = (const SMDS_MeshNode*) nIt->next();
if ( _elements[ SMDSAbs_Node ].insert( n ).second )
tmpInfo.Add( n );
}
}
myInfo = tmpInfo;
}
// -------------------------------------------------------------------------------------
SMDS_ElemIteratorPtr SMESH_MeshPartDS::elementGeomIterator(SMDSAbs_GeometryType geomType) const
{
if ( _meshDS ) return _meshDS->elementGeomIterator( geomType );

View File

@ -37,7 +37,6 @@
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
//#include "SMESH_subMesh_i.hxx"
#include "SMESH_subMesh.hxx"
#include "SALOME_GenericObj_i.hh"