X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvReader.hxx;h=1a07854e6d89a6dfdbda229e8f51f489582982ec;hb=ba63422f07d64dc36cbdeed4060a00db1069d9db;hp=c33b3f4f7cd5354562810f69d901800a6fd579d3;hpb=ba46d95e15064cd3768d78ec9ffff33bb72fcec5;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvReader.hxx b/src/MEDLoader/SauvReader.hxx index c33b3f4f7..1a07854e6 100644 --- a/src/MEDLoader/SauvReader.hxx +++ b/src/MEDLoader/SauvReader.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D // // 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 @@ -35,9 +35,9 @@ namespace SauvUtilities { class FileReader; - class IntermediateMED; - class Group; - class DoubleField; + struct IntermediateMED; + struct Group; + struct DoubleField; } namespace ParaMEDMEM { @@ -46,8 +46,8 @@ namespace ParaMEDMEM class SauvReader : public ParaMEDMEM::RefCountObject { public: - MEDLOADER_EXPORT static SauvReader* New(const char *fileName); - MEDLOADER_EXPORT ParaMEDMEM::MEDFileData * loadInMEDFileDS(); + MEDLOADER_EXPORT static SauvReader* New(const std::string& fileName); + MEDLOADER_EXPORT ParaMEDMEM::MEDFileData * loadInMEDFileDS(bool fix2DOri=false); MEDLOADER_EXPORT ~SauvReader(); private: @@ -72,7 +72,8 @@ class SauvReader : public ParaMEDMEM::RefCountObject void read_PILE_MODL (const int nbObjects, std::vector& objectNames, std::vector& nameIndices); void read_PILE_FIELD (const int nbObjects, std::vector& objectNames, std::vector& nameIndices); - SauvUtilities::Group* getFieldSupport(const std::vector& fieldSupports); + void setFieldSupport(const std::vector& supports, + SauvUtilities::DoubleField* field); void setFieldNames(const std::vector& fields, const std::vector& objectNames, const std::vector& nameIndices);