From: azakir <abdoulbari.zakir@csgroup.eu>
Date: Thu, 17 Dec 2020 09:04:50 +0000 (+0100)
Subject: restoring fam with old id
X-Git-Tag: V9_7_0a1~18^2~48
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1224f8cfd6255dec39cf45bceb42b479e9c47805;p=modules%2Fsmesh.git

restoring fam with old id
---

diff --git a/src/SMESHGUI/MG_ADAPT.cxx b/src/SMESHGUI/MG_ADAPT.cxx
index ce0bbeeab..a75e9448c 100644
--- 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 e11898f00..379671f91 100644
--- 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();