X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvReader.hxx;h=e2135a4220edf7f8013f9921e4de2645f342248b;hb=5ea9370443568d9dd6c42c970cbc24c1b6ae6c28;hp=abf232a05d3e741a518956216151ee1a024d8ed7;hpb=5a8157e5b775f7ba2d3ce25162dd0b3320b8546f;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/SauvReader.hxx b/src/MEDLoader/SauvReader.hxx
index abf232a05..e2135a422 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-2016  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
@@ -39,23 +39,24 @@ namespace SauvUtilities
   struct Group;
   struct DoubleField;
 }
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDFileData;
 
-class SauvReader : public ParaMEDMEM::RefCountObject
+class SauvReader : public MEDCoupling::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 MEDCoupling::MEDFileData * loadInMEDFileDS();
   MEDLOADER_EXPORT ~SauvReader();
 
  private:
   std::size_t getHeapMemorySizeWithoutChildren() const;
-  std::vector<const BigMemoryObject *> getDirectChildren() const;
+  std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
   void readRecord2();
   void readRecord4();
   void readRecord7();
+  void readRecord8();
 
   int readPileNumber(int& nbNamedObjects, int& nbObjects);
   void read_PILE_SOUS_MAILLAGE(const int nbObjects, std::vector<std::string>& objectNames, std::vector<int>& nameIndices);
@@ -72,7 +73,8 @@ class SauvReader : public ParaMEDMEM::RefCountObject
   void read_PILE_MODL         (const int nbObjects, std::vector<std::string>& objectNames, std::vector<int>& nameIndices);
   void read_PILE_FIELD        (const int nbObjects, std::vector<std::string>& objectNames, std::vector<int>& nameIndices);
 
-  SauvUtilities::Group* getFieldSupport(const std::vector<SauvUtilities::Group*>& fieldSupports);
+  void setFieldSupport(const std::vector<SauvUtilities::Group*>& supports,
+                       SauvUtilities::DoubleField*               field);
   void setFieldNames(const std::vector<SauvUtilities::DoubleField*>& fields,
                      const std::vector<std::string>& objectNames,
                      const std::vector<int>& nameIndices);