From: enk <enk@opencascade.com>
Date: Fri, 1 Dec 2006 08:41:22 +0000 (+0000)
Subject: Fix for currect restoring of study.
X-Git-Tag: V3_2_4pre1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02636afbd3f83590f3f1b66398c56c085921a74c;p=modules%2Fvisu.git

Fix for currect restoring of study.
(In connection with Scalar Map On Group)
---

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index da7fbcab..65011443 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -204,7 +204,7 @@ namespace VISU
   void RegistryStorable() {
     Storable::Registry(Result_i::myComment.c_str(),&(Result_i::Restore));
     Storable::Registry(Mesh_i::myComment.c_str(),&(Restore<Mesh_i>));
-    //    Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore<ScalarMap_i>));
+    Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore<PrsMerger_i>));
     Storable::Registry(GaussPoints_i::myComment.c_str(),&(Restore<GaussPoints_i>));
     Storable::Registry(DeformedShape_i::myComment.c_str(),&(Restore<DeformedShape_i>));
     Storable::Registry(CutPlanes_i::myComment.c_str(),&(Restore<CutPlanes_i>));
diff --git a/src/VISU_I/VISU_PrsMerger_i.cc b/src/VISU_I/VISU_PrsMerger_i.cc
index 61afd4b9..c165e46b 100644
--- a/src/VISU_I/VISU_PrsMerger_i.cc
+++ b/src/VISU_I/VISU_PrsMerger_i.cc
@@ -137,6 +137,10 @@ VISU::Storable* VISU::PrsMerger_i::Restore(const Storable::TRestoringMap& theMap
     // warning situation
     return this;
   }
+  if(aC1 == 1)
+    if(aStrSubMeshName[0] == QString("NULL"))
+      return this;
+  
   for(int i=0;i < aC2;i++){
     std::string aSubMeshName = aStrSubMeshName[i];
     int              aEntity = aStrEntity[i].toInt();