From: eap <eap@opencascade.com>
Date: Mon, 19 Nov 2012 11:42:07 +0000 (+0000)
Subject: 21983: [CEA 714] Imposed mesh not taken into account after hdf reload
X-Git-Tag: V6_6_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV6_6_BR;p=plugins%2Fghs3dplugin.git

21983: [CEA 714] Imposed mesh not taken into account after hdf reload

   struct TGHS3DEnforcedMesh {
+    int         persistID;

+  void RestoreEnfElemsByMeshes(); // persistence
---

diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
index cb402ee..49f0a73 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
@@ -450,16 +450,20 @@ bool GHS3DPlugin_Hypothesis::SetEnforcedMesh(SMESH_Mesh& theMesh, SMESH::Element
   bool added = SetEnforcedElements( theElemSet, elementType, groupName);
   if (added) {
     TGHS3DEnforcedMesh* newEnfMesh = new TGHS3DEnforcedMesh();
-    newEnfMesh->name = name;
-    newEnfMesh->entry = entry;
+    newEnfMesh->persistID   = theMesh.GetMeshDS()->GetPersistentId();
+    newEnfMesh->name        = name;
+    newEnfMesh->entry       = entry;
     newEnfMesh->elementType = elementType;
-    newEnfMesh->groupName = groupName;
+    newEnfMesh->groupName   = groupName;
     
     TGHS3DEnforcedMeshList::iterator it = _enfMeshList.find(newEnfMesh);
     if (it == _enfMeshList.end()) {
       _entryEnfMeshMap[entry].insert(newEnfMesh);
       _enfMeshList.insert(newEnfMesh);
     }
+    else {
+      delete newEnfMesh;
+    }
   }
   return added;
 }
@@ -712,6 +716,26 @@ void GHS3DPlugin_Hypothesis::ClearEnforcedMeshes()
   NotifySubMeshesHypothesisModification();
 }
 
+//================================================================================
+/*!
+ * \brief At mesh loading, restore enforced elements by just loaded enforced meshes
+ */
+//================================================================================
+
+void GHS3DPlugin_Hypothesis::RestoreEnfElemsByMeshes()
+{
+  TGHS3DEnforcedMeshList::const_iterator it = _enfMeshList.begin();
+  for(;it != _enfMeshList.end();++it) {
+    TGHS3DEnforcedMesh* enfMesh = *it;
+    if ( SMESH_Mesh* mesh = GetMeshByPersistentID( enfMesh->persistID ))
+      SetEnforcedMesh( *mesh,
+                       enfMesh->elementType,
+                       enfMesh->name,
+                       enfMesh->entry,
+                       enfMesh->groupName );
+    enfMesh->persistID = -1; // not to restore again
+  }
+}
 
 //=======================================================================
 //function : SetGroupsToRemove
@@ -965,6 +989,8 @@ std::ostream & GHS3DPlugin_Hypothesis::SaveTo(std::ostream & save)
         save << " " << enfMesh->groupName;
         save << " " << "__END_GROUP__";
       }
+      save << " " << "__PERSIST_ID__";
+      save << " " << enfMesh->persistID;
       save << " " << "__END_ENF_MESH__";
       std::cout << "Saving of enforced mesh " << enfMesh->name.c_str() << " done" << std::endl;
     }
@@ -979,303 +1005,310 @@ std::ostream & GHS3DPlugin_Hypothesis::SaveTo(std::ostream & save)
 
 std::istream & GHS3DPlugin_Hypothesis::LoadFrom(std::istream & load)
 {
-	bool isOK = true;
-	int i;
-    double d;
-
-	isOK = (load >> i);
-	if (isOK)
-		myToMeshHoles = i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myMaximumMemory = i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myInitialMemory = i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myOptimizationLevel = i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> myWorkingDirectory);
-	if (isOK) {
-		if ( myWorkingDirectory == "0") { // myWorkingDirectory was empty
-			myKeepFiles = false;
-			myWorkingDirectory.clear();
-		}
-		else if ( myWorkingDirectory == "1" ) {
-			myKeepFiles = true;
-			myWorkingDirectory.clear();
-		}
-	}
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	if ( !myWorkingDirectory.empty() ) {
-		isOK = (load >> i);
-		if (isOK)
-			myKeepFiles = i;
-		else
-			load.clear(ios::badbit | load.rdstate());
-	}
-
-	isOK = (load >> i);
-	if (isOK)
-		myVerboseLevel = (short) i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myToCreateNewNodes = (bool) i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myToUseBoundaryRecoveryVersion = (bool) i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myToUseFemCorrection = (bool) i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-	isOK = (load >> i);
-	if (isOK)
-		myToRemoveCentralPoint = (bool) i;
-	else
-		load.clear(ios::badbit | load.rdstate());
-
-    isOK = (load >> d);
+  bool isOK = true;
+  int i;
+  double d;
+
+  isOK = (load >> i);
+  if (isOK)
+    myToMeshHoles = i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myMaximumMemory = i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myInitialMemory = i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myOptimizationLevel = i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> myWorkingDirectory);
+  if (isOK) {
+    if ( myWorkingDirectory == "0") { // myWorkingDirectory was empty
+      myKeepFiles = false;
+      myWorkingDirectory.clear();
+    }
+    else if ( myWorkingDirectory == "1" ) {
+      myKeepFiles = true;
+      myWorkingDirectory.clear();
+    }
+  }
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  if ( !myWorkingDirectory.empty() ) {
+    isOK = (load >> i);
     if (isOK)
-        myGradation = d;
+      myKeepFiles = i;
     else
-        load.clear(ios::badbit | load.rdstate());
-
-	std::string separator;
-	bool hasOptions = false;
-	bool hasEnforcedVertices = false;
-	bool hasEnforcedMeshes = false;
-	isOK = (load >> separator);
-
-	if (isOK) {
-		if (separator == "__OPTIONS_BEGIN__")
-			hasOptions = true;
-		else if (separator == "__ENFORCED_VERTICES_BEGIN__")
-			hasEnforcedVertices = true;
-		else if (separator == "__ENFORCED_MESHES_BEGIN__")
-			hasEnforcedMeshes = true;
-	}
-
-	if (hasOptions) {
-		std::string txt;
-		while (isOK) {
-			isOK = (load >> txt);
-			if (isOK) {
-				if (txt == "__OPTIONS_END__") {
-					if (!myTextOption.empty()) {
-						// Remove last space
-						myTextOption.erase(myTextOption.end()-1);
-					}
-					isOK = false;
-					break;
-				}
-				myTextOption += txt;
-				myTextOption += " ";
-			}
-		}
-	}
-
-	if (hasOptions) {
-		isOK = (load >> separator);
-		if (isOK && separator == "__ENFORCED_VERTICES_BEGIN__")
-			hasEnforcedVertices = true;
-		if (isOK && separator == "__ENFORCED_MESHES_BEGIN__")
-			hasEnforcedMeshes = true;
-	}
+      load.clear(ios::badbit | load.rdstate());
+  }
+
+  isOK = (load >> i);
+  if (isOK)
+    myVerboseLevel = (short) i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myToCreateNewNodes = (bool) i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myToUseBoundaryRecoveryVersion = (bool) i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myToUseFemCorrection = (bool) i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> i);
+  if (isOK)
+    myToRemoveCentralPoint = (bool) i;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  isOK = (load >> d);
+  if (isOK)
+    myGradation = d;
+  else
+    load.clear(ios::badbit | load.rdstate());
+
+  std::string separator;
+  bool hasOptions = false;
+  bool hasEnforcedVertices = false;
+  bool hasEnforcedMeshes = false;
+  isOK = (load >> separator);
+
+  if (isOK) {
+    if (separator == "__OPTIONS_BEGIN__")
+      hasOptions = true;
+    else if (separator == "__ENFORCED_VERTICES_BEGIN__")
+      hasEnforcedVertices = true;
+    else if (separator == "__ENFORCED_MESHES_BEGIN__")
+      hasEnforcedMeshes = true;
+  }
+
+  if (hasOptions) {
+    std::string txt;
+    while (isOK) {
+      isOK = (load >> txt);
+      if (isOK) {
+        if (txt == "__OPTIONS_END__") {
+          if (!myTextOption.empty()) {
+            // Remove last space
+            myTextOption.erase(myTextOption.end()-1);
+          }
+          isOK = false;
+          break;
+        }
+        myTextOption += txt;
+        myTextOption += " ";
+      }
+    }
+  }
+
+  if (hasOptions) {
+    isOK = (load >> separator);
+    if (isOK && separator == "__ENFORCED_VERTICES_BEGIN__")
+      hasEnforcedVertices = true;
+    if (isOK && separator == "__ENFORCED_MESHES_BEGIN__")
+      hasEnforcedMeshes = true;
+  }
 
   if (hasEnforcedVertices) {
-	  std::string txt, name, entry, groupName;
-	  double size, coords[3];
-	  bool isCompound;
-	  bool hasCoords = false;
-	  isOK = (load >> txt);  // __BEGIN_VERTEX__
-	  while (isOK) {
-	    if (txt == "__ENFORCED_VERTICES_END__")
-	      isOK = false;
-
-	    TGHS3DEnforcedVertex *enfVertex = new TGHS3DEnforcedVertex();
-	    while (isOK) {
-	      isOK = (load >> txt);
-	      if (txt == "__END_VERTEX__") {
-	        enfVertex->name = name;
-	        enfVertex->geomEntry = entry;
-	        enfVertex->isCompound = isCompound;
-	        enfVertex->groupName = groupName;
-	        enfVertex->coords.clear();
-	        if (hasCoords)
-	          enfVertex->coords.assign(coords,coords+3);
-
-	        _enfVertexList.insert(enfVertex);
-
-	        if (enfVertex->coords.size())
-	          _coordsEnfVertexMap[enfVertex->coords] = enfVertex;
-	        if (!enfVertex->geomEntry.empty())
-	          _geomEntryEnfVertexMap[enfVertex->geomEntry] = enfVertex;
-
-	        name.clear();
-	        entry.clear();
-	        groupName.clear();
-	        hasCoords = false;
-	        isOK = false;
-	      }
-
-	      if (txt == "__BEGIN_NAME__") {  // __BEGIN_NAME__
-	        while (isOK && (txt != "__END_NAME__")) {
-	          isOK = (load >> txt);
-	          if (txt != "__END_NAME__") {
-	            if (!name.empty())
-	              name += " ";
-	            name += txt;
-	          }
-	        }
-	        MESSAGE("name: " <<name);
-	      }
-
-	      if (txt == "__BEGIN_ENTRY__") {  // __BEGIN_ENTRY__
-	        isOK = (load >> entry);
-	        isOK = (load >> isCompound);
-	        isOK = (load >> txt); // __END_ENTRY__
-	        if (txt != "__END_ENTRY__")
-	          throw std::exception();
-	        MESSAGE("entry: " << entry);
-	      }
-
-	      if (txt == "__BEGIN_GROUP__") {  // __BEGIN_GROUP__
-	        while (isOK && (txt != "__END_GROUP__")) {
-	          isOK = (load >> txt);
-	          if (txt != "__END_GROUP__") {
-	            if (!groupName.empty())
-	              groupName += " ";
-	            groupName += txt;
-	          }
-	        }
-	        MESSAGE("groupName: " << groupName);
-	      }
-
-	      if (txt == "__BEGIN_COORDS__") {  // __BEGIN_COORDS__
-	        hasCoords = true;
-	        isOK = (load >> coords[0] >> coords[1] >> coords[2]);
-	        isOK = (load >> txt); // __END_COORDS__
-	        if (txt != "__END_COORDS__")
-	          throw std::exception();
-	        MESSAGE("coords: " << coords[0] <<","<< coords[1] <<","<< coords[2]);
-	      }
-
-	      if (txt == "__BEGIN_SIZE__") {  // __BEGIN_ENTRY__
-	        isOK = (load >> size);
-	        isOK = (load >> txt); // __END_ENTRY__
-	        if (txt != "__END_SIZE__") {
-	          throw std::exception();
-	        }
-	        MESSAGE("size: " << size);
-	      }
-	    }
-	    isOK = (load >> txt);  // __BEGIN_VERTEX__
-	  }
+    std::string txt, name, entry, groupName;
+    double size, coords[3];
+    bool isCompound;
+    bool hasCoords = false;
+    isOK = (load >> txt);  // __BEGIN_VERTEX__
+    while (isOK) {
+      if (txt == "__ENFORCED_VERTICES_END__")
+        isOK = false;
+
+      TGHS3DEnforcedVertex *enfVertex = new TGHS3DEnforcedVertex();
+      while (isOK) {
+        isOK = (load >> txt);
+        if (txt == "__END_VERTEX__") {
+          enfVertex->name = name;
+          enfVertex->geomEntry = entry;
+          enfVertex->isCompound = isCompound;
+          enfVertex->groupName = groupName;
+          enfVertex->coords.clear();
+          if (hasCoords)
+            enfVertex->coords.assign(coords,coords+3);
+
+          _enfVertexList.insert(enfVertex);
+
+          if (enfVertex->coords.size())
+            _coordsEnfVertexMap[enfVertex->coords] = enfVertex;
+          if (!enfVertex->geomEntry.empty())
+            _geomEntryEnfVertexMap[enfVertex->geomEntry] = enfVertex;
+
+          name.clear();
+          entry.clear();
+          groupName.clear();
+          hasCoords = false;
+          isOK = false;
+        }
+
+        if (txt == "__BEGIN_NAME__") {  // __BEGIN_NAME__
+          while (isOK && (txt != "__END_NAME__")) {
+            isOK = (load >> txt);
+            if (txt != "__END_NAME__") {
+              if (!name.empty())
+                name += " ";
+              name += txt;
+            }
+          }
+          MESSAGE("name: " <<name);
+        }
+
+        if (txt == "__BEGIN_ENTRY__") {  // __BEGIN_ENTRY__
+          isOK = (load >> entry);
+          isOK = (load >> isCompound);
+          isOK = (load >> txt); // __END_ENTRY__
+          if (txt != "__END_ENTRY__")
+            throw std::exception();
+          MESSAGE("entry: " << entry);
+        }
+
+        if (txt == "__BEGIN_GROUP__") {  // __BEGIN_GROUP__
+          while (isOK && (txt != "__END_GROUP__")) {
+            isOK = (load >> txt);
+            if (txt != "__END_GROUP__") {
+              if (!groupName.empty())
+                groupName += " ";
+              groupName += txt;
+            }
+          }
+          MESSAGE("groupName: " << groupName);
+        }
+
+        if (txt == "__BEGIN_COORDS__") {  // __BEGIN_COORDS__
+          hasCoords = true;
+          isOK = (load >> coords[0] >> coords[1] >> coords[2]);
+          isOK = (load >> txt); // __END_COORDS__
+          if (txt != "__END_COORDS__")
+            throw std::exception();
+          MESSAGE("coords: " << coords[0] <<","<< coords[1] <<","<< coords[2]);
+        }
+
+        if (txt == "__BEGIN_SIZE__") {  // __BEGIN_ENTRY__
+          isOK = (load >> size);
+          isOK = (load >> txt); // __END_ENTRY__
+          if (txt != "__END_SIZE__") {
+            throw std::exception();
+          }
+          MESSAGE("size: " << size);
+        }
+      }
+      isOK = (load >> txt);  // __BEGIN_VERTEX__
+    }
   }
 
   if (hasEnforcedVertices) {
-	  isOK = (load >> separator);
-	  if (isOK && separator == "__ENFORCED_MESHES_BEGIN__")
-		  hasEnforcedMeshes = true;
+    isOK = (load >> separator);
+    if (isOK && separator == "__ENFORCED_MESHES_BEGIN__")
+      hasEnforcedMeshes = true;
   }
 
   if (hasEnforcedMeshes) {
-	  std::string txt, name, entry, groupName;
-	  int elementType = -1;
-	  isOK = (load >> txt);  // __BEGIN_ENF_MESH__
-	  while (isOK) {
-//		  if (isOK) {
-			  if (txt == "__ENFORCED_MESHES_END__")
-				  isOK = false;
-
-			  TGHS3DEnforcedMesh *enfMesh = new TGHS3DEnforcedMesh();
-			  while (isOK) {
-				  isOK = (load >> txt);
-				  if (txt == "__END_ENF_MESH__") {
-					  enfMesh->name = name;
-					  enfMesh->entry = entry;
-					  enfMesh->elementType = (SMESH::ElementType)elementType;
-					  enfMesh->groupName = groupName;
-
-					  _enfMeshList.insert(enfMesh);
-					  std::cout << "Restoring of enforced mesh " <<name  << " done" << std::endl;
-
-					  name.clear();
-					  entry.clear();
-					  elementType = -1;
-					  groupName.clear();
-					  isOK = false;
-				  }
-
-				  if (txt == "__BEGIN_NAME__") {  // __BEGIN_NAME__
-					  while (isOK && (txt != "__END_NAME__")) {
-						  isOK = (load >> txt);
-						  if (txt != "__END_NAME__") {
-							  if (!name.empty())
-								  name += " ";
-							  name += txt;
-						  }
-					  }
-					  MESSAGE("name: " <<name);
-				  }
-
-				  if (txt == "__BEGIN_ENTRY__") {  // __BEGIN_ENTRY__
-					  isOK = (load >> entry);
-					  isOK = (load >> txt); // __END_ENTRY__
-					  if (txt != "__END_ENTRY__")
-						  throw std::exception();
-					  MESSAGE("entry: " << entry);
-				  }
-
-				  if (txt == "__BEGIN_ELEM_TYPE__") {  // __BEGIN_ELEM_TYPE__
-					  isOK = (load >> elementType);
-					  isOK = (load >> txt); // __END_ELEM_TYPE__
-					  if (txt != "__END_ELEM_TYPE__")
-						  throw std::exception();
-					  MESSAGE("elementType: " << elementType);
-				  }
-
-				  if (txt == "__BEGIN_GROUP__") {  // __BEGIN_GROUP__
-					  while (isOK && (txt != "__END_GROUP__")) {
-						  isOK = (load >> txt);
-						  if (txt != "__END_GROUP__") {
-							  if (!groupName.empty())
-								  groupName += " ";
-							  groupName += txt;
-						  }
-					  } // while
-					  MESSAGE("groupName: " << groupName);
-				  } // if
-				  std::cout << "isOK: " << isOK << std::endl;
-			  } // while
-//		  } // if
-		  isOK = (load >> txt);  // __BEGIN_ENF_MESH__
-	  } // while
+    std::string txt, name, entry, groupName;
+    int elementType = -1, persistID = -1;
+    isOK = (load >> txt);  // __BEGIN_ENF_MESH__
+    while (isOK) {
+      //                if (isOK) {
+      if (txt == "__ENFORCED_MESHES_END__")
+        isOK = false;
+
+      TGHS3DEnforcedMesh *enfMesh = new TGHS3DEnforcedMesh();
+      while (isOK) {
+        isOK = (load >> txt);
+        if (txt == "__END_ENF_MESH__") {
+          enfMesh->name = name;
+          enfMesh->entry = entry;
+          enfMesh->elementType = (SMESH::ElementType)elementType;
+          enfMesh->groupName = groupName;
+          enfMesh->persistID = persistID;
+
+          _enfMeshList.insert(enfMesh);
+          std::cout << "Restoring of enforced mesh " <<name  << " done" << std::endl;
+
+          name.clear();
+          entry.clear();
+          elementType = -1;
+          groupName.clear();
+          persistID = -1;
+          isOK = false;
+        }
+
+        if (txt == "__BEGIN_NAME__") {  // __BEGIN_NAME__
+          while (isOK && (txt != "__END_NAME__")) {
+            isOK = (load >> txt);
+            if (txt != "__END_NAME__") {
+              if (!name.empty())
+                name += " ";
+              name += txt;
+            }
+          }
+          MESSAGE("name: " <<name);
+        }
+
+        if (txt == "__BEGIN_ENTRY__") {  // __BEGIN_ENTRY__
+          isOK = (load >> entry);
+          isOK = (load >> txt); // __END_ENTRY__
+          if (txt != "__END_ENTRY__")
+            throw std::exception();
+          MESSAGE("entry: " << entry);
+        }
+
+        if (txt == "__BEGIN_ELEM_TYPE__") {  // __BEGIN_ELEM_TYPE__
+          isOK = (load >> elementType);
+          isOK = (load >> txt); // __END_ELEM_TYPE__
+          if (txt != "__END_ELEM_TYPE__")
+            throw std::exception();
+          MESSAGE("elementType: " << elementType);
+        }
+
+        if (txt == "__BEGIN_GROUP__") {  // __BEGIN_GROUP__
+          while (isOK && (txt != "__END_GROUP__")) {
+            isOK = (load >> txt);
+            if (txt != "__END_GROUP__") {
+              if (!groupName.empty())
+                groupName += " ";
+              groupName += txt;
+            }
+          } // while
+          MESSAGE("groupName: " << groupName);
+        } // if
+
+        if (txt == "__PERSIST_ID__") {
+          isOK = (load >> persistID);
+          MESSAGE("persistID: " << persistID);
+        }
+        std::cout << "isOK: " << isOK << std::endl;
+      } // while
+      //                } // if
+      isOK = (load >> txt);  // __BEGIN_ENF_MESH__
+    } // while
   } // if
 
   return load;
diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
index 2e1acc5..cc31ac7 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
@@ -82,6 +82,7 @@ public:
   ////////////////////
   
   struct TGHS3DEnforcedMesh {
+    int         persistID;
     std::string name;
     std::string entry;
     std::string groupName;
@@ -245,6 +246,7 @@ public:
   const TIDSortedElemGroupMap _GetEnforcedTriangles() const { return _enfTriangles; }
   const TID2SizeMap _GetNodeIDToSizeMap() const {return _nodeIDToSizeMap; }
   const TSetStrings _GetGroupsToRemove() const {return _groupsToRemove; }
+  void RestoreEnfElemsByMeshes(); // persistence
   /*!
    * \brief Return the enforced vertices
    */