Merge remote-tracking branch 'origin/master' into V9_dev

[modules/hexablock.git] / src / HEXABLOCK / Hex.cxx

diff --git a/src/HEXABLOCK/Hex.cxx b/src/HEXABLOCK/Hex.cxx
index d7f951b791b5187af31c5959a62aadd01b042eca..70159a29d771bb22ccd3790bddc12eb5da37c533 100755 (executable)
--- a/src/HEXABLOCK/Hex.cxx
+++ b/src/HEXABLOCK/Hex.cxx
@@ -1,12 +1,12 @@
 
 // C++ : La clase principale de Hexa
 
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-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,11 +39,9 @@ Hex::Hex ()
 // ======================================================== Destructeur
 Hex::~Hex ()
 {
-#ifndef NO_CASCADE
    int nbre = liste_documents.size();
    for (int nd=0 ; nd<nbre ; nd++) 
        delete liste_documents [nd];
-#endif
 }
 // ======================================================== countDocument
 int Hex::countDocument ()
@@ -197,4 +195,37 @@ Hex* Hex::getInstance  ()
 
    return first_instance;
 }
+// ======================================================== what (?)
+void Hex::what ()
+{
+   bool actif = glob->dump.start ("hexablock", "what", false);
+
+   Globale* glob = Globale::getInstance  ();
+   glob->mess.printMessage();
+
+   glob->dump.close (actif);
+}
+// ======================================================== sizeofMessage
+int Hex::sizeofMessage ()
+{
+   return glob->mess.sizeofMessage (); 
+}
+// ======================================================== getMessageLine
+cpchar Hex::getMessageLine (int nlig)
+{ 
+   return glob->mess.getLine (nlig);
+}
+// ======================================================== hex_instance
+Hex* hex_instance ()
+{
+   Hex*   hexa = Hex::getInstance ();
+   return hexa;
+}
+// ======================================================== what (fonction)
+void what ()
+{
+   Hex* hexa = Hex::getInstance ();
+   hexa->what ();
+}
+
 END_NAMESPACE_HEXA