X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Import_1D.cxx;h=179dd52e4d616167a0a02553902c51f5ead293ff;hb=951dd4234ec84d147b1756bc04b6464c5332091c;hp=94770855a188ceb31258d51a3662adafb2f75c40;hpb=a17b36970bc61da1d664453c615754997c925b18;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Import_1D.cxx b/src/StdMeshers/StdMeshers_Import_1D.cxx index 94770855a..179dd52e4 100644 --- a/src/StdMeshers/StdMeshers_Import_1D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 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 @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : StdMeshers_Import_1D.cxx // Module : SMESH // @@ -36,6 +36,7 @@ #include "SMESH_Group.hxx" #include "SMESH_HypoFilter.hxx" #include "SMESH_Mesh.hxx" +#include "SMESH_MeshEditor.hxx" #include "SMESH_MesherHelper.hxx" #include "SMESH_subMesh.hxx" #include "SMESH_subMeshEventListener.hxx" @@ -60,10 +61,9 @@ using namespace std; */ //============================================================================= -StdMeshers_Import_1D::StdMeshers_Import_1D(int hypId, int studyId, SMESH_Gen * gen) - :SMESH_1D_Algo(hypId, studyId, gen), _sourceHyp(0) +StdMeshers_Import_1D::StdMeshers_Import_1D(int hypId, SMESH_Gen * gen) + :SMESH_1D_Algo(hypId, gen), _sourceHyp(0) { - MESSAGE("StdMeshers_Import_1D::StdMeshers_Import_1D"); _name = "Import_1D"; _shapeType = (1 << TopAbs_EDGE); @@ -212,7 +212,7 @@ namespace // INTERNAL STUFF "StdMeshers_Import_1D::_Listener") {} public: - // return poiter to a static listener + // return pointer to a static listener static _Listener* get() { static _Listener theListener; return &theListener; } static _ImportData* getImportData(const SMESH_Mesh* srcMesh, SMESH_Mesh* tgtMesh); @@ -290,7 +290,7 @@ namespace // INTERNAL STUFF //-------------------------------------------------------------------------------- /*! * \brief Remove imported mesh and/or groups if needed - * \param sm - submesh loosing Import algo + * \param sm - submesh losing Import algo * \param data - data holding imported groups */ void _Listener::removeSubmesh( SMESH_subMesh* sm, _ListenerData* data ) @@ -312,7 +312,7 @@ namespace // INTERNAL STUFF //-------------------------------------------------------------------------------- /*! * \brief Clear _ImportData::_n2n. - * _n2n is usefull within one mesh.Compute() only + * _n2n is useful within one mesh.Compute() only */ void _Listener::clearN2N( SMESH_Mesh* tgtMesh ) { @@ -912,7 +912,7 @@ void StdMeshers_Import_1D::importMesh(const SMESH_Mesh* srcMesh, int nb = 1; while ( !namesByType[ srcGroupDS->GetType() ].insert( name ).second ) name = SMESH_Comment(srcGroup->GetName()) << "_imported_" << nb++; - SMESH_Group* newGroup = tgtMesh.AddGroup( srcGroupDS->GetType(), name.c_str(), nb ); + SMESH_Group* newGroup = tgtMesh.AddGroup( srcGroupDS->GetType(), name.c_str() ); SMESHDS_Group* newGroupDS = (SMESHDS_Group*)newGroup->GetGroupDS(); resultGroups.push_back( newGroup );