X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverSTL%2FDriverSTL_W_SMDS_Mesh.cxx;h=2ac7ca5daee2945c5b70ba03bcc1544f87f37c4e;hp=ef66f22927371705f8bfb49c870466f5fed5544a;hb=9acd4347a6c7488c3ead4c68861b0944e83e545f;hpb=7868270178ffe3023bfe60b6499e906b9d812cc2 diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx index ef66f2292..2ac7ca5da 100644 --- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx +++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,11 +20,14 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include - #include "DriverSTL_W_SMDS_Mesh.h" +#ifdef WIN32 +#define NOMINMAX +#endif + +#include + #include "SMDS_FaceOfNodes.hxx" #include "SMDS_IteratorOnIterators.hxx" #include "SMDS_Mesh.hxx" @@ -32,16 +35,13 @@ #include "SMDS_MeshNode.hxx" #include "SMDS_SetIterator.hxx" #include "SMDS_VolumeTool.hxx" +#include "SMESH_File.hxx" #include "SMESH_TypeDefs.hxx" -#include -#include -#include -#include -#include -#include +//#include "utilities.h" + +#include -#include "utilities.h" // definition des constantes static const int LABEL_SIZE = 80; @@ -147,7 +147,7 @@ SMDS_ElemIteratorPtr DriverSTL_W_SMDS_Mesh::getFaces() const // static methods -static void writeInteger( const Standard_Integer& theVal, OSD_File& ofile ) +static void writeInteger( const Standard_Integer& theVal, SMESH_File& ofile ) { union { Standard_Integer i; @@ -162,16 +162,15 @@ static void writeInteger( const Standard_Integer& theVal, OSD_File& ofile ) entier |= (u.c[2] & 0xFF) << 0x10; entier |= (u.c[3] & 0xFF) << 0x18; - ofile.Write((char *)&entier,sizeof(u.c)); + ofile.write( entier ); } -static void writeFloat ( const Standard_ShortReal& theVal, - OSD_File& ofile) +static void writeFloat( const Standard_ShortReal& theVal, SMESH_File& ofile) { union { Standard_ShortReal f; char c[4]; - }u; + } u; u.f = theVal; @@ -182,7 +181,7 @@ static void writeFloat ( const Standard_ShortReal& theVal, entier |= (u.c[2] & 0xFF) << 0x10; entier |= (u.c[3] & 0xFF) << 0x18; - ofile.Write((char *)&entier,sizeof(u.c)); + ofile.write( entier ); } static gp_XYZ getNormale( const SMDS_MeshNode* n1, @@ -287,19 +286,18 @@ static int getTriangles( const SMDS_MeshElement* face, Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const { Status aResult = DRS_OK; - TCollection_AsciiString aFileName( (char *)myFile.c_str() ); - if ( aFileName.IsEmpty() ) { + if ( myFile.empty() ) { fprintf(stderr, ">> ERREOR : invalid file name \n"); return DRS_FAIL; } - OSD_File aFile = OSD_File(OSD_Path(aFileName)); - aFile.Build(OSD_WriteOnly,OSD_Protection()); + SMESH_File aFile( myFile, /*openForReading=*/false ); + aFile.openForWriting(); - char sval[16]; - TCollection_AsciiString buf = TCollection_AsciiString ("solid\n"); - aFile.Write (buf,buf.Length());buf.Clear(); + std::string buf("solid\n"); + aFile.writeRaw( buf.c_str(), buf.size() ); + char sval[128]; const SMDS_MeshNode* triaNodes[2048]; SMDS_ElemIteratorPtr itFaces = getFaces(); @@ -313,45 +311,25 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const gp_XYZ normale = getNormale( triaNodes[iN], triaNodes[iN+1], triaNodes[iN+2] ); + sprintf (sval, + " facet normal % 12e % 12e % 12e\n" + " outer loop\n" , + normale.X(), normale.Y(), normale.Z()); + aFile.writeRaw ( sval, 70 ); - buf += " facet normal "; - sprintf (sval,"% 12e",normale.X()); - buf += sval; - buf += " "; - sprintf (sval,"% 12e",normale.Y()); - buf += sval; - buf += " "; - sprintf (sval,"% 12e",normale.Z()); - buf += sval; - buf += '\n'; - aFile.Write (buf,buf.Length());buf.Clear(); - buf += " outer loop\n"; - aFile.Write (buf,buf.Length());buf.Clear(); - - for ( int jN = 0; jN < 3; ++jN, ++iN ) { - const SMDS_MeshNode* node = triaNodes[iN]; - buf += " vertex "; - sprintf (sval,"% 12e",node->X()); - buf += sval; - buf += " "; - sprintf (sval,"% 12e",node->Y()); - buf += sval; - buf += " "; - sprintf (sval,"% 12e",node->Z()); - buf += sval; - buf += '\n'; - aFile.Write (buf,buf.Length());buf.Clear(); + for ( int jN = 0; jN < 3; ++jN, ++iN ) + { + SMESH_TNodeXYZ node = triaNodes[iN]; + sprintf (sval, + " vertex % 12e % 12e % 12e\n", + node.X(), node.Y(), node.Z() ); + aFile.writeRaw ( sval, 54 ); } - buf += " endloop\n"; - aFile.Write (buf,buf.Length());buf.Clear(); - buf += " endfacet\n"; - aFile.Write (buf,buf.Length());buf.Clear(); + aFile.writeRaw (" endloop\n" + " endfacet\n", 21 ); } } - buf += "endsolid\n"; - aFile.Write (buf,buf.Length());buf.Clear(); - - aFile.Close (); + aFile.writeRaw ("endsolid\n" , 9 ); return aResult; } @@ -366,14 +344,14 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeAscii() const Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeBinary() const { Status aResult = DRS_OK; - TCollection_AsciiString aFileName( (char *)myFile.c_str() ); - if ( aFileName.IsEmpty() ) { + + if ( myFile.empty() ) { fprintf(stderr, ">> ERREOR : invalid filename \n"); return DRS_FAIL; } - OSD_File aFile = OSD_File(OSD_Path(aFileName)); - aFile.Build(OSD_WriteOnly,OSD_Protection()); + SMESH_File aFile( myFile ); + aFile.openForWriting(); // we first count the number of triangles int nbTri = myVolumeTrias.size(); @@ -384,12 +362,11 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeBinary() const nbTri += getNbTriangles( aFace ); } } - // char sval[80]; -- avoid writing not initialized memory - TCollection_AsciiString sval(LABEL_SIZE-1,' '); - aFile.Write((Standard_Address)sval.ToCString(),LABEL_SIZE); + std::string sval( LABEL_SIZE, ' ' ); + aFile.write( sval.c_str(), LABEL_SIZE ); // write number of triangles - writeInteger(nbTri,aFile); + writeInteger( nbTri, aFile ); // Loop writing nodes @@ -419,10 +396,9 @@ Driver_Mesh::Status DriverSTL_W_SMDS_Mesh::writeBinary() const writeFloat(node->Y(),aFile); writeFloat(node->Z(),aFile); } - aFile.Write (&dum,2); - } + aFile.writeRaw ( &dum, 2 ); + } } - aFile.Close (); return aResult; }