X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.h;h=fcadee8ddaf1942e4d7bdc0b31c393cc0e5c007e;hp=c15484b84b3accbdf1891af22217c485ddf49273;hb=e26ffcc005221f12d4ff91e074c4c8464ca044e4;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.h b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index c15484b84..fcadee8dd 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -78,14 +78,17 @@ signals:
 protected:
   struct StdParam
   {
-    QString   myName;
-    QVariant  myValue;
-    bool      isVariable;
-    QString   myText;
-    StdParam(){
+    QString    myName;
+    QVariant   myValue;
+    bool       isVariable;
+    QString    myText;
+    QByteArray myTextAsBytes;
+    StdParam() {
       isVariable = false;
     }
-    const char* text() const { return myText.toLatin1().constData(); }
+    const char* text() const {
+      ((QByteArray&) myTextAsBytes) = myText.toLatin1(); return myTextAsBytes.constData();
+    }
   };
 
   typedef QList<StdParam>      ListOfStdParams;
@@ -96,6 +99,7 @@ protected:
   bool                         hasInitParamsHypothesis() const;
   const ListOfWidgets&         widgets() const;
   ListOfWidgets&               changeWidgets();
+  QLabel*                      getLabel(int i) const;
   QtxDialog*                   dlg() const;
   QString                      getVariableName(const char* methodName) const;
 
@@ -127,9 +131,11 @@ private:
 
 private:
   SMESH::SMESH_Hypothesis_var  myHypo, myInitParamsHypo;
+  bool                         myToDeleteInitParamsHypo;
   QString                      myHypName;
   QString                      myHypType;
   ListOfWidgets                myParamWidgets;
+  ListOfWidgets                myParamLabels;
   bool                         myIsCreate;
   QtxDialog*                   myDlg;
   QString                      myShapeEntry;
@@ -167,7 +173,7 @@ class HypothesisData
 public:
   HypothesisData( const QString&, const QString&, const QString&,
                   const QString&, const QString&, const QString&,
-                  const QList<int>&, const bool,
+                  const QString&, const QList<int>&, const bool,
                   const QStringList&, const QStringList&,
                   const QStringList&, const QStringList&,
                   const bool=true, const bool supportSub=false );
@@ -178,13 +184,15 @@ public:
   QString ClientLibName;   //!< client library name
   QString Label;           //!< label
   QString IconId;          //!< icon identifier
+  QString Context;         //!< ["GLOBAL","LOCAL","ANY"(default)]
   QList<int> Dim;          //!< list of supported dimensions (see SMESH::Dimension enumeration)
-  bool IsAux;              //!< TRUE if given hypothesis is auxiliary one, FALSE otherwise
+  bool IsAuxOrNeedHyp;     //!< TRUE if given hypothesis is auxiliary one, FALSE otherwise
+  //!<                          TRUE if given algorithm can't work w/o hypotheses
   bool IsNeedGeometry;     //!< TRUE if the algorithm works with shapes only, FALSE otherwise
   bool IsSupportSubmeshes; //!< TRUE if the algo building all-dim elems supports submeshes
 
   // for algorithm only: dependencies algo <-> algo and algo -> hypos
-  QStringList NeededHypos;  //!< list of obligatory hypotheses
+  QStringList BasicHypos;   //!< list of basic hypotheses
   QStringList OptionalHypos;//!< list of optional hypotheses
   QStringList InputTypes;   //!< list of element types required as a prerequisite
   QStringList OutputTypes;  //!< list of types of generated elements