Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix regression SALOME_TESTS/Grids/smesh/3D_mesh_Projection_00/A1
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_Family.cxx
diff --git
a/src/DriverMED/DriverMED_Family.cxx
b/src/DriverMED/DriverMED_Family.cxx
index c284b0b3ca8f3e7315eaa5eb97360d222c57931c..577879462120528b10274b8e62efa3e0c9e57275 100644
(file)
--- a/
src/DriverMED/DriverMED_Family.cxx
+++ b/
src/DriverMED/DriverMED_Family.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,7
+24,6
@@
// File : DriverMED_Family.cxx
// Author : Julia DOROVSKIKH
// Module : SMESH
// File : DriverMED_Family.cxx
// Author : Julia DOROVSKIKH
// Module : SMESH
-// $Header$
//
#include "DriverMED_Family.h"
#include "MED_Factory.hxx"
//
#include "DriverMED_Family.h"
#include "MED_Factory.hxx"
@@
-70,7
+69,7
@@
void
DriverMED_Family
::AddElement(const SMDS_MeshElement* theElement)
{
DriverMED_Family
::AddElement(const SMDS_MeshElement* theElement)
{
- myElements.insert(
theElement);
+ myElements.insert(
myElements.end(), theElement );
}
void
}
void
@@
-146,7
+145,7
@@
DriverMED_Family
//=============================================================================
DriverMED_FamilyPtrList
DriverMED_Family
//=============================================================================
DriverMED_FamilyPtrList
DriverMED_Family
-::MakeFamilies(
const SMESHDS_SubMeshPtrMap&
theSubMeshes,
+::MakeFamilies(
SMESHDS_SubMeshIteratorPtr
theSubMeshes,
const SMESHDS_GroupBasePtrList& theGroups,
const bool doGroupOfNodes,
const bool doGroupOfEdges,
const SMESHDS_GroupBasePtrList& theGroups,
const bool doGroupOfNodes,
const bool doGroupOfEdges,
@@
-171,11
+170,10
@@
DriverMED_Family
int aElemFamId = FIRST_ELEM_FAMILY;
// Process sub-meshes
int aElemFamId = FIRST_ELEM_FAMILY;
// Process sub-meshes
- SMESHDS_SubMeshPtrMap::const_iterator aSMIter = theSubMeshes.begin();
- for (; aSMIter != theSubMeshes.end(); aSMIter++)
+ while ( theSubMeshes->more() )
{
{
-
const int anId = aSMIter->first
;
-
SMESHDS_SubMesh* aSubMesh = aSMIter->second
;
+
SMESHDS_SubMesh* aSubMesh = const_cast< SMESHDS_SubMesh* >( theSubMeshes->next() )
;
+
const int anId = aSubMesh->GetID()
;
if ( aSubMesh->IsComplexSubmesh() )
continue; // submesh containing other submeshs
DriverMED_FamilyPtrList aSMFams = SplitByType(aSubMesh,anId);
if ( aSubMesh->IsComplexSubmesh() )
continue; // submesh containing other submeshs
DriverMED_FamilyPtrList aSMFams = SplitByType(aSubMesh,anId);
@@
-357,9
+355,9
@@
DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
string aValue = aStr.str();
// PAL19785,0019867 - med forbids whitespace to be the last char in the name
int maxSize;
string aValue = aStr.str();
// PAL19785,0019867 - med forbids whitespace to be the last char in the name
int maxSize;
- if ( theWrapper->GetVersion() == MED::eV2_1 )
- maxSize = MED::GetNOMLength<MED::eV2_1>();
- else
+
//
if ( theWrapper->GetVersion() == MED::eV2_1 )
+
//
maxSize = MED::GetNOMLength<MED::eV2_1>();
+
//
else
maxSize = MED::GetNOMLength<MED::eV2_2>();
int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
while ( isspace( aValue[ lastCharPos ] ))
maxSize = MED::GetNOMLength<MED::eV2_2>();
int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
while ( isspace( aValue[ lastCharPos ] ))
@@
-416,7
+414,7
@@
void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup)
SMDS_ElemIteratorPtr elemIt = theGroup->GetElements();
while (elemIt->more())
{
SMDS_ElemIteratorPtr elemIt = theGroup->GetElements();
while (elemIt->more())
{
- myElements.insert(
elemIt->next()
);
+ myElements.insert(
myElements.end(), elemIt->next()
);
}
// Type
}
// Type