X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Hypothesis_i.hxx;h=e8f12c50700e7f1345d30215b31839ad9d122586;hb=b0d8fa70d6b49c7e68d172ae6c44aad8300852f6;hp=5a03bfa44785ccd1fb1b6b3eee923ccae39e584b;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx index 5a03bfa44..e8f12c507 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.hxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx @@ -1,34 +1,35 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2011 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 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 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 -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // +// 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 +// + +// 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_ +#include "SMESH.hxx" + #include #include CORBA_SERVER_HEADER(SMESH_Hypothesis) @@ -37,10 +38,15 @@ #include "SMESH_Gen.hxx" +#include +#include + +class TCollection_AsciiString; + // ====================================================== // Generic hypothesis // ====================================================== -class SMESH_Hypothesis_i: +class SMESH_I_EXPORT SMESH_Hypothesis_i: public virtual POA_SMESH::SMESH_Hypothesis, public virtual SALOME::GenericObj_i { @@ -63,6 +69,33 @@ 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); + + // 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(); + + //Set last parameters for not published hypothesis + + void SetLastParameters(const char* theParameters); + + // Clear parameters list + void ClearParameters(); + + //Return true if hypothesis was published in study + bool IsPublished(); // Get implementation ::SMESH_Hypothesis* GetImpl(); @@ -70,21 +103,41 @@ 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; } }; // ====================================================== // Generic hypothesis creator // ====================================================== -class GenericHypothesisCreator_i +class SMESH_I_EXPORT GenericHypothesisCreator_i { public: // Create a hypothesis virtual SMESH_Hypothesis_i* Create(PortableServer::POA_ptr thePOA, int theStudyId, ::SMESH_Gen* theGenImpl) = 0; + // return the name of IDL module + virtual std::string GetModuleName() = 0; }; //============================================================================= @@ -99,7 +152,7 @@ template class HypothesisCreator_i: public GenericHypothesisCreator_i public: virtual SMESH_Hypothesis_i* Create (PortableServer::POA_ptr thePOA, int theStudyId, - ::SMESH_Gen* theGenImpl) + ::SMESH_Gen* theGenImpl) { return new T (thePOA, theStudyId, theGenImpl); };