restoring fam with old id

diff --git a/src/SMESHGUI/MG_ADAPT.cxx b/src/SMESHGUI/MG_ADAPT.cxx
index ce0bbeeab570496794415d7b943b2ac1dc73e15c..a75e9448cd22c0efeafdbddf94f148de5e021a79 100644 (file)
--- a/src/SMESHGUI/MG_ADAPT.cxx
+++ b/src/SMESHGUI/MG_ADAPT.cxx
@@ -17,7 +17,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/
 // file : MG_ADAPT.cxx
 
 #include "MG_ADAPT.hxx"
@@ -35,9 +35,9 @@
 #include <unistd.h>
 #include <TCollection_AsciiString.hxx>
 #include <cstring>
+#include <cstdlib>
 #include <boost/filesystem.hpp>
 
-
 static std::string removeFile(std::string fileName, int& notOk)
 {
        std::string errStr;
@@ -1226,7 +1226,8 @@ void MgAdapt::restorefams(MEDCoupling::MEDFileMesh* fileMesh) const
     {  
                try  // safety : FAMILY could be lost P2-->P1
         {
-                       std::string givenFamNameFromMeshGemConverter = fileMesh->getFamilyNameGivenId( fIt->_famId );
+                       std::string givenFamNameFromMeshGemConverter = fileMesh->getFamilyNameGivenId( std::abs(fIt->_famId) );
+            fileMesh->changeFamilyId(std::abs(fIt->_famId), fIt->_famId);
             fileMesh->changeFamilyName(givenFamNameFromMeshGemConverter, fIt->_famName);
         }
         catch (const std::exception& e)

diff --git a/src/SMESHGUI/MG_ADAPT.hxx b/src/SMESHGUI/MG_ADAPT.hxx
index e11898f00b68c37627ad7d25230f079107caefc1..379671f91ce4c602295adf5253b1e090d518087c 100644 (file)
--- a/src/SMESHGUI/MG_ADAPT.hxx
+++ b/src/SMESHGUI/MG_ADAPT.hxx
@@ -14,9 +14,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
+// See http://www.salome-platform.org/
 //
 // File   : MG_ADAPT.hxx
 //
@@ -112,7 +110,7 @@ public :
 
 class MgAdapt
 {
-    enum YesNo {YES, NO};
+
 public:
 
     MgAdapt();