X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Hypothesis_i.hxx;h=c8ff51ab3886d9afc09ed4ce0b9f0e3dd8360bae;hp=13bd7742fd3b07ecdc9faf4447c8a89bc9053762;hb=f5016d85b7b4b88623723027a1585c6414c4dc66;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070

diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx
index 13bd7742f..c8ff51ab3 100644
--- a/src/SMESH_I/SMESH_Hypothesis_i.hxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx
@@ -1,29 +1,29 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
 //  File   : SMESH_Hypothesis_i.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-//  $Header$
 //
 #ifndef _SMESH_HYPOTHESIS_I_HXX_
 #define _SMESH_HYPOTHESIS_I_HXX_
@@ -38,6 +38,11 @@
 
 #include "SMESH_Gen.hxx"
 
+#include <map>
+#include <string>
+
+class TCollection_AsciiString;
+
 // ======================================================
 // Generic hypothesis
 // ======================================================
@@ -65,21 +70,29 @@ public:
   // Get unique id of hypothesis
   CORBA::Long GetId();
   
+  // Set the variable parameter; method is a name of method setting this parameter.
+  // This method must be called by the hypothesis creator just before calling hyp->method()
+  void SetVarParameter (const char* parameter, const char* method);
+
+  // Return the variable parameter used for Hypothesis creation by name of method
+  // setting this parameter
+  char* GetVarParameter (const char* methodName);
+
   // Set list of parameters  separated by ":" symbol, used for Hypothesis creation
-  void SetParameters (const char* theParameters);
+  // void SetParameters (const char* theParameters);
   
-  // Return list of notebook variables used for Hypothesis creation separated by ":" symbol
-  char* GetParameters();
+  // // Return list of notebook variables used for Hypothesis creation separated by ":" symbol
+  // char* GetParameters();
 
-  //Return list of last notebook variables used for Hypothesis creation.
-  SMESH::ListOfParameters* GetLastParameters();
+  // //Return list of last notebook variables used for Hypothesis creation.
+  // SMESH::ListOfParameters* GetLastParameters();
 
-  //Set last parameters for not published hypothesis
+  // //Set last parameters for not published hypothesis
   
-  void SetLastParameters(const char* theParameters);
+  // void SetLastParameters(const char* theParameters);
   
-  // Clear parameters list
-  void ClearParameters();
+  // // Clear parameters list
+  // void ClearParameters();
 
   //Return true if hypothesis was published in study
   bool IsPublished();
@@ -90,9 +103,27 @@ public:
   // Persistence
   virtual char* SaveTo();
   virtual void  LoadFrom( const char* theStream );
-  
+  virtual void  UpdateAsMeshesRestored(); // for hyps needing full data restored
+
 protected:
-  ::SMESH_Hypothesis* myBaseImpl;    // base hypothesis implementation
+  ::SMESH_Hypothesis*          myBaseImpl;    // base hypothesis implementation
+
+  std::map< std::string, std::string > myMethod2VarParams; // variable parameters
+
+
+ public:
+  // Methods for backward compatibility of notebook variables
+  
+  // restore myMethod2VarParams by parameters stored in an old study
+  virtual void setOldParameters (const char* theParameters);
+
+  // method used to convert variable parameters stored in an old study
+  // into myMethod2VarParams. It should return a method name for an index of
+  // variable parameters. Index is countered from zero
+  virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const { return ""; }
+
+  // method intended to remove explicit treatment of Netgen hypotheses from SMESH_NoteBook
+  virtual int getParamIndex(const TCollection_AsciiString& method, int nbVars) const { return -1; }
 };
 
 // ======================================================