From: vsv <vsv@opencascade.com>
Date: Wed, 5 Apr 2006 14:51:03 +0000 (+0000)
Subject: Read group 2467
X-Git-Tag: T3_2_0b1_pre1~50
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a636c1e101b6645a4f9211feb328c244f37acae4;p=modules%2Fsmesh.git

Read group 2467
---

diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index 9037ddf06..8cfbb55f0 100644
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -272,12 +272,10 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	for(; anIter != aDataSet2417.end(); anIter++){
 	  const TGroupId& aLabel = anIter->first;
 	  const TRecord& aRec = anIter->second;
-	  //SMDS_MeshGroup* aNewGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Edge);
-	  //myGroupNames.insert(TGroupNamesMap::value_type(aNewGroup, aRec.GroupName));
-	  //myGroupId.insert(TGroupIdMap::value_type(aNewGroup, aLabel));
 
 	  int aNodesNb = aRec.NodeList.size();
 	  int aElementsNb = aRec.ElementList.size();
+
 	  bool useSuffix = ((aNodesNb > 0) && (aElementsNb > 0));
 	  int i;
 	  if (aNodesNb > 0) {
@@ -319,12 +317,12 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 		  aFacesGroup->Add(aElement);
 		  break;
 		}
-	      }
+	      } 
 	    }
 	  }
 	}
       }
-    }
+    } 
   }
   catch(const std::exception& exc){
     INFOS("Follow exception was cought:\n\t"<<exc.what());
diff --git a/src/DriverUNV/UNV2412_Structure.cxx b/src/DriverUNV/UNV2412_Structure.cxx
index 4bbc85936..cac7a91d7 100644
--- a/src/DriverUNV/UNV2412_Structure.cxx
+++ b/src/DriverUNV/UNV2412_Structure.cxx
@@ -63,7 +63,7 @@ void UNV2412::Read(std::ifstream& in_stream, TDataSet& theDataSet)
       // end of dataset is reached
       break;
     }
-
+    
     int n_nodes;
     TRecord aRec;
     in_stream>>aRec.fe_descriptor_id;
@@ -145,6 +145,7 @@ bool UNV2412::IsBeam(int theFeDescriptorId){
   case 11: // edge with 2 nodes
   case 21: 
   case 22: // edge with 3 nodes
+  case 23: // curved beam
   case 24:
   case 25:
     return true;
diff --git a/src/DriverUNV/UNV2417_Structure.cxx b/src/DriverUNV/UNV2417_Structure.cxx
index 4d3eac88e..d52dd1e80 100644
--- a/src/DriverUNV/UNV2417_Structure.cxx
+++ b/src/DriverUNV/UNV2417_Structure.cxx
@@ -9,14 +9,14 @@ using namespace UNV;
 using namespace UNV2417;
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = 0;
 #else
 static int MYDEBUG = 0;
 #endif
 
 
-static string _group_labels[] = {"2417", "2429", "2430", "2432", "2435", "2452"};
-#define NBGROUP 6
+static string _group_labels[] = {"2417", "2429", "2430", "2432", "2435", "2452", "2467"};
+#define NBGROUP 7
 
 static string _label_dataset = "2429";
 
@@ -70,7 +70,8 @@ void UNV2417::ReadGroup(const std::string& myGroupLabel, std::ifstream& in_strea
     in_stream>>aTmp;
     in_stream>>n_nodes;
 
-    in_stream>>aRec.GroupName;
+    std::getline(in_stream, aRec.GroupName, '\n'); // Finalise previous reading
+    std::getline(in_stream, aRec.GroupName, '\n');
     
     int aElType;
     int aElId;
@@ -78,7 +79,7 @@ void UNV2417::ReadGroup(const std::string& myGroupLabel, std::ifstream& in_strea
     for(int j=0; j < n_nodes; j++){
       in_stream>>aElType;
       in_stream>>aElId;
-      if ((myGroupLabel.compare("2435") == 0) || (myGroupLabel.compare("2452") == 0)) {
+      if ((myGroupLabel.compare("2435") == 0) || (myGroupLabel.compare("2452") == 0) || (myGroupLabel.compare("2467") == 0)) {
 	in_stream>>aTmp;
 	in_stream>>aTmp;
       }