From: dmv Date: Tue, 27 May 2008 08:28:45 +0000 (+0000) Subject: IPAL 19788 REGRESSION - groups are lost after import UNV file. X-Git-Tag: V4_1_3rc1~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2c5c38b3687f00c0d15da01af6e75d44bb9b47dd;p=modules%2Fsmesh.git IPAL 19788 REGRESSION - groups are lost after import UNV file. --- diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx index b8c5d5c5c..c88a9128a 100644 --- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx @@ -282,7 +282,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform() SMDS_MeshGroup* aNodesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Node); std::string aGrName = (useSuffix) ? aRec.GroupName + "_Nodes" : aRec.GroupName; int i = aGrName.find( "\r" ); - if (i) + if (i > 0) aGrName.erase (i, 2); myGroupNames.insert(TGroupNamesMap::value_type(aNodesGroup, aGrName)); myGroupId.insert(TGroupIdMap::value_type(aNodesGroup, aLabel)); @@ -309,7 +309,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform() if (!useSuffix && createdGroup) useSuffix = true; std::string aEdgesGrName = (useSuffix) ? aRec.GroupName + "_Edges" : aRec.GroupName; int i = aEdgesGrName.find( "\r" ); - if (i) + if (i > 0) aEdgesGrName.erase (i, 2); myGroupNames.insert(TGroupNamesMap::value_type(aEdgesGroup, aEdgesGrName)); myGroupId.insert(TGroupIdMap::value_type(aEdgesGroup, aLabel)); @@ -323,7 +323,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform() if (!useSuffix && createdGroup) useSuffix = true; std::string aFacesGrName = (useSuffix) ? aRec.GroupName + "_Faces" : aRec.GroupName; int i = aFacesGrName.find( "\r" ); - if (i) + if (i > 0) aFacesGrName.erase (i, 2); myGroupNames.insert(TGroupNamesMap::value_type(aFacesGroup, aFacesGrName)); myGroupId.insert(TGroupIdMap::value_type(aFacesGroup, aLabel)); @@ -337,7 +337,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform() if (!useSuffix && createdGroup) useSuffix = true; std::string aVolumeGrName = (useSuffix) ? aRec.GroupName + "_Volumes" : aRec.GroupName; int i = aVolumeGrName.find( "\r" ); - if (i) + if (i > 0) aVolumeGrName.erase (i, 2); myGroupNames.insert(TGroupNamesMap::value_type(aVolumeGroup, aVolumeGrName)); myGroupId.insert(TGroupIdMap::value_type(aVolumeGroup, aLabel));