From: dmv <dmv@opencascade.com>
Date: Wed, 21 May 2008 09:34:01 +0000 (+0000)
Subject: IPAL 19788 4.x: REGRESSION - groups are lost after import UNV file.
X-Git-Tag: V4_1_3rc1~21
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=b9d1ac1de23d053be3d35b9c664c7afdc6ec150b

IPAL 19788 4.x: 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 77a439a7d..b8c5d5c5c 100644
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -281,6 +281,9 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	  if (aNodesNb > 0) {
 	    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)
+	      aGrName.erase (i, 2);
 	    myGroupNames.insert(TGroupNamesMap::value_type(aNodesGroup, aGrName));
 	    myGroupId.insert(TGroupIdMap::value_type(aNodesGroup, aLabel));
 
@@ -305,6 +308,9 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 		    aEdgesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Edge);
 		    if (!useSuffix && createdGroup) useSuffix = true;
 		    std::string aEdgesGrName = (useSuffix) ? aRec.GroupName + "_Edges" : aRec.GroupName;
+		    int i = aEdgesGrName.find( "\r" );
+		    if (i)
+		      aEdgesGrName.erase (i, 2);
 		    myGroupNames.insert(TGroupNamesMap::value_type(aEdgesGroup, aEdgesGrName));
 		    myGroupId.insert(TGroupIdMap::value_type(aEdgesGroup, aLabel));
 		    createdGroup = true;
@@ -316,6 +322,9 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 		    aFacesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Face);
 		    if (!useSuffix && createdGroup) useSuffix = true;
 		    std::string aFacesGrName = (useSuffix) ? aRec.GroupName + "_Faces" : aRec.GroupName;
+		    int i = aFacesGrName.find( "\r" );
+		    if (i)
+		      aFacesGrName.erase (i, 2);
 		    myGroupNames.insert(TGroupNamesMap::value_type(aFacesGroup, aFacesGrName));
 		    myGroupId.insert(TGroupIdMap::value_type(aFacesGroup, aLabel));
 		    createdGroup = true;
@@ -327,6 +336,9 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 		    aVolumeGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Volume);
 		    if (!useSuffix && createdGroup) useSuffix = true;
 		    std::string aVolumeGrName = (useSuffix) ? aRec.GroupName + "_Volumes" : aRec.GroupName;
+		    int i = aVolumeGrName.find( "\r" );
+		    if (i)
+		      aVolumeGrName.erase (i, 2);
 		    myGroupNames.insert(TGroupNamesMap::value_type(aVolumeGroup, aVolumeGrName));
 		    myGroupId.insert(TGroupIdMap::value_type(aVolumeGroup, aLabel));
 		    createdGroup = true;
diff --git a/src/DriverUNV/UNV2417_Structure.cxx b/src/DriverUNV/UNV2417_Structure.cxx
index 90c4e4514..abc2a140e 100644
--- a/src/DriverUNV/UNV2417_Structure.cxx
+++ b/src/DriverUNV/UNV2417_Structure.cxx
@@ -93,14 +93,6 @@ void UNV2417::ReadGroup(const std::string& myGroupLabel, std::ifstream& in_strea
     std::getline(in_stream, aRec.GroupName, '\n'); // Finalise previous reading
     std::getline(in_stream, aRec.GroupName, '\n');
 
-    //Erase special char '\r' if needs
-    std::string aName = aRec.GroupName;
-    int i = aName.find( "\r" );
-    if (i) {
-      aName.erase (i, 2);
-      aRec.GroupName = aName;
-    }
-
     int aElType;
     int aElId;
     int aNum;