X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverDAT%2FDriverDAT_W_SMESHDS_Mesh.cxx;h=0c988c3d8bb85fcbc888e0e6148bf579deb99248;hp=10c4accd2424685e0729fb6d0c63d0cf8be6e67e;hb=ef932e4d05a45b9a3034423e30519d15e664f2bc;hpb=2a01836df7e8236c96093b7e2f85b567966078dc;ds=sidebyside

diff --git a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx
index 10c4accd2..0c988c3d8 100644
--- a/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx
@@ -30,172 +30,200 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
-#include "SMDS_MeshFacesIterator.hxx"
-#include "SMDS_MeshNodesIterator.hxx"
-#include "SMDS_MeshVolumesIterator.hxx"
+
+
+
+
 
 #include "utilities.h"
 
-DriverDAT_W_SMESHDS_Mesh::DriverDAT_W_SMESHDS_Mesh() {
-;
+DriverDAT_W_SMESHDS_Mesh::DriverDAT_W_SMESHDS_Mesh()
+{
+	;
 }
 
-DriverDAT_W_SMESHDS_Mesh::~DriverDAT_W_SMESHDS_Mesh() {
-;
+DriverDAT_W_SMESHDS_Mesh::~DriverDAT_W_SMESHDS_Mesh()
+{
+	;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
-  myMesh = aMesh;
+void DriverDAT_W_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
+void DriverDAT_W_SMESHDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
+void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
+void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::Write() {
-
-  string myClass = string("SMDS_Mesh");
-  string myExtension = string("DAT");
+void DriverDAT_W_SMESHDS_Mesh::Write()
+{
 
-  DriverDAT_W_SMDS_Mesh* myWriter = new DriverDAT_W_SMDS_Mesh;
+	string myClass = string("SMDS_Mesh");
+	string myExtension = string("DAT");
 
-  myWriter->SetMesh(myMesh);
-  myWriter->SetFile(myFile);
-  myWriter->SetMeshId(myMeshId);
-  //myWriter->SetFileId(myFileId);
+	DriverDAT_W_SMDS_Mesh *myWriter = new DriverDAT_W_SMDS_Mesh;
 
-  myWriter->Write();
+	myWriter->SetMesh(myMesh);
+	myWriter->SetFile(myFile);
+	myWriter->SetMeshId(myMeshId);
+	//myWriter->SetFileId(myFileId);
 
+	myWriter->Write();
 
 }
-void DriverDAT_W_SMESHDS_Mesh::Add() {
-  int nbNodes,nbCells;
-  int i;
-
-  char* file2Read = (char*)myFile.c_str();
-  myFileId = fopen(file2Read,"w+");
-  if (myFileId < 0)
-    {
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
-      exit(EXIT_FAILURE);
-    }
-  
+
+void DriverDAT_W_SMESHDS_Mesh::Add()
+{
+	int nbNodes, nbCells;
+	int i;
+
+	char *file2Read = (char *)myFile.c_str();
+	myFileId = fopen(file2Read, "w+");
+	if (myFileId < 0)
+	{
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
+		exit(EXIT_FAILURE);
+	}
+
   /****************************************************************************
   *                       NOMBRES D'OBJETS                                    *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(****************************)\n");
 
-  /* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	/* Combien de noeuds ? */
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
-  nb_of_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	/* Combien de mailles, faces ou aretes ? */
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
+	nb_of_edges = myMesh->NbEdges();
+	nb_of_faces = myMesh->NbFaces();
+	nb_of_volumes = myMesh->NbVolumes();
+	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
-  fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
+	fprintf(myFileId, "%d %d\n", nbNodes, nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
-
-  SMDS_MeshNodesIterator itNodes(myMesh);
-  for (;itNodes.More();itNodes.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
-    const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
- 
-    fprintf(myFileId,"%d %e %e %e\n",node->GetID(),node->X(),node->Y(),node->Z());
-  }
+	fprintf(stdout, "\n(************************)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(************************)\n");
+
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
+	while(itNodes->more())
+	{		
+		const SMDS_MeshNode * node = itNodes->next();
+		fprintf(myFileId, "%d %e %e %e\n", node->GetID(), node->X(),
+			node->Y(), node->Z());
+	}
+	delete itNodes;
 
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
-  /* Ecriture des connectivites, noms, numeros des mailles */
-
-  SMDS_MeshEdgesIterator itEdges(myMesh);
-  for (;itEdges.More();itEdges.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
-
-    switch (elem->NbNodes()) {
-    case 2 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),102);
-      break;
-    } 
-    case 3 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),103);
-      break;
-    }
-    }
-
-    for (i=0;i<elem->NbNodes();i++)
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
-    
-    fprintf(myFileId,"\n");
-  }
-
-  SMDS_MeshFacesIterator itFaces(myMesh);
-  for (;itFaces.More();itFaces.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
-
-    switch (elem->NbNodes()) {
-    case 3 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),203);
-      break;
-    }
-    case 4 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),204);
-      break;
-    }
-    case 6 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),206);
-      break;
-    }
-    }
-
-    for (i=0;i<elem->NbNodes();i++)
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
-    
-    fprintf(myFileId,"\n");
-  }
-
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
-  for (;itVolumes.More();itVolumes.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
-
-    switch (elem->NbNodes()) {
-    case 8 : {
-      fprintf(myFileId,"%d %d ",elem->GetID(),308);
-      break;
-    }
-    }
-
-    for (i=0;i<elem->NbNodes();i++)
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
-    
-    fprintf(myFileId,"\n");
-  }
-
-  fclose (myFileId);
+	fprintf(stdout, "\n(**************************)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(**************************)");
+	/* Ecriture des connectivites, noms, numeros des mailles */
+
+	SMDS_Iterator<const SMDS_MeshEdge*> * itEdges=myMesh->edgesIterator();
+	while(itEdges->more())
+	{
+		const SMDS_MeshEdge * elem = itEdges->next();
+
+		switch (elem->NbNodes())
+		{
+		case 2:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 102);
+			break;
+		}
+		case 3:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 103);
+			break;
+		}
+		}
+
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
+		
+		fprintf(myFileId, "\n");
+	}
+	delete itEdges;
+
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
+	while(itFaces->more())
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
+
+		switch (elem->NbNodes())
+		{
+		case 3:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 203);
+			break;
+		}
+		case 4:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 204);
+			break;
+		}
+		case 6:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 206);
+			break;
+		}
+		}
+
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
+		delete itNodes;
+	
+		fprintf(myFileId, "\n");
+	}
+	delete itFaces;
+
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
+	while(itVolumes->more())
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
+		
+		switch (elem->NbNodes())
+		{
+		case 8:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 308);
+			break;
+		}
+		}
+
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
+		delete itNodes;	
+
+		fprintf(myFileId, "\n");
+	}
+	delete itVolumes;
+
+	fclose(myFileId);
 }
-