X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverDAT%2FDriverDAT_W_SMDS_Mesh.cxx;h=8157374954176867f4a0093b794a0b3420cc9b2a;hb=eb32ac37f34e97d1da90cd63579efa6590ecf300;hp=403dad4f5634748cf6a0d38af896efa95deb158b;hpb=560f8b2d0c2a7fdb4047f981cfac56ed3629bc1a;p=modules%2Fsmesh.git

diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
index 403dad4f5..815737495 100644
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -38,9 +38,14 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
   Status aResult = DRS_OK;
 
   int nbNodes, nbCells;
+#if defined(WIN32) && defined(UNICODE)
+  std::wstring file2Read = Kernel_Utils::utf8_decode_s(myFile);
+  FILE* aFileId = _wfopen(file2Read.c_str(), L"w+");
 
+#else
   char *file2Read = (char *)myFile.c_str();
   FILE* aFileId = fopen(file2Read, "w+");
+#endif
   if ( !aFileId )
   {
     fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
@@ -71,11 +76,19 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
    *                       ECRITURE DES NOEUDS                                 *
    ****************************************************************************/
 
+  std::vector< size_t > nodeNumByID;
+  if ( myMesh->HasNumerationHoles() )
+    nodeNumByID.resize( myMesh->MaxNodeID() + 1 );
+
+  int num;
   SMDS_NodeIteratorPtr itNodes=myMesh->nodesIterator();
-  while(itNodes->more())
+  for ( num = 1; itNodes->more(); ++num )
   {
     const SMDS_MeshNode * node = itNodes->next();
-    fprintf(aFileId, "%d %.14e %.14e %.14e\n", node->GetID(), node->X(), node->Y(), node->Z());
+    fprintf(aFileId, "%d %.14e %.14e %.14e\n", num, node->X(), node->Y(), node->Z());
+
+    if ( !nodeNumByID.empty() )
+      nodeNumByID[ node->GetID() ] = num;
   }
 
   /****************************************************************************
@@ -83,47 +96,46 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
    ****************************************************************************/
   /* Ecriture des connectivites, noms, numeros des mailles */
 
-  SMDS_EdgeIteratorPtr itEdges=myMesh->edgesIterator();
-  while(itEdges->more())
+  num = 1;
+  for ( SMDS_EdgeIteratorPtr itEdges = myMesh->edgesIterator(); itEdges->more(); ++num )
   {
     const SMDS_MeshElement * elem = itEdges->next();
-    switch (elem->NbNodes())
+    fprintf(aFileId, "%d %d ", num, 100 + elem->NbNodes());
+
+    for ( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
     {
-    case 2:
-      fprintf(aFileId, "%d %d ", elem->GetID(), 102);
-      break;
-    case 3:
-      fprintf(aFileId, "%d %d ", elem->GetID(), 103);
-      break;
+      int nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%d ", nodeID );
     }
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
     fprintf(aFileId, "\n");
   }
 
-  SMDS_FaceIteratorPtr itFaces=myMesh->facesIterator();
-  while(itFaces->more())
+  for ( SMDS_FaceIteratorPtr itFaces = myMesh->facesIterator(); itFaces->more(); ++num )
   {
     const SMDS_MeshElement * elem = itFaces->next();
-    if ( elem->IsPoly() )
-      fprintf(aFileId, "%d %d ", elem->GetID(), 400+elem->NbNodes());
-    else
-      fprintf(aFileId, "%d %d ", elem->GetID(), 200+elem->NbNodes());
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
+
+    fprintf(aFileId, "%d %d ", num, (elem->IsPoly() ? 400 : 200 ) + elem->NbNodes() );
+
+    for( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
+    {
+      int nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%d ", nodeID );
+    }
     fprintf(aFileId, "\n");
   }
 
-  SMDS_VolumeIteratorPtr itVolumes=myMesh->volumesIterator();
+
   const SMDS_MeshVolume* v;
-  while(itVolumes->more())
+  for ( SMDS_VolumeIteratorPtr itVolumes=myMesh->volumesIterator(); itVolumes->more(); ++num )
   {
     const SMDS_MeshElement * elem = itVolumes->next();
     if ( elem->IsPoly() )
     {
-      fprintf(aFileId, "%d %d ", elem->GetID(), 500+elem->NbNodes());
+      fprintf(aFileId, "%d %d ", num, 500 + elem->NbNodes());
 
       if (( v = myMesh->DownCast< SMDS_MeshVolume >( elem )))
       {
@@ -138,11 +150,16 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
     }
     else
     {
-      fprintf(aFileId, "%d %d ", elem->GetID(), 300+elem->NbNodes());
+      fprintf(aFileId, "%d %d ", num, 300 + elem->NbNodes());
+    }
+
+    for( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
+    {
+      int nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%d ", nodeID );
     }
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
 
     fprintf(aFileId, "\n");
   }