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
Merge branch 'occ/shaper2smesh'
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_R_SMESHDS_Mesh.cxx
diff --git
a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index a1a5cfcc7106b8b358d78c1f272cd51747da9d31..68f17df380dcdfcb178840f1dc1c0c6085288f47 100644
(file)
--- a/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-156,7
+156,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
}
if(MYDEBUG) MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
}
if(MYDEBUG) MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
- aFamily->AddGroupName(
aGroupName
);
+ aFamily->AddGroupName(
fixUTF8( aGroupName )
);
}
aFamily->SetId( aFamId );
myFamilies[aFamId] = aFamily;
}
aFamily->SetId( aFamId );
myFamilies[aFamId] = aFamily;
@@
-266,7
+266,7
@@
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
}
#endif
if ( !anIsNodeNum )
}
#endif
if ( !anIsNodeNum )
- aNodeIds.
swap( *(aBallInfo->myConn
));
+ aNodeIds.
assign( aBallInfo->myConn->begin(), aBallInfo->myConn->end(
));
// allocate array of diameters
vtkIdType maxID = myMesh->MaxElementID() + aNbBalls;
// allocate array of diameters
vtkIdType maxID = myMesh->MaxElementID() + aNbBalls;