Merge branch V7_3_1_BR

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_Hypotheses.h

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.h b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index 475763191d3844df55a9f5962d64346530dda03e..fcadee8ddaf1942e4d7bdc0b31c393cc0e5c007e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  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
@@ -99,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;
 
@@ -134,6 +135,7 @@ private:
   QString                      myHypName;
   QString                      myHypType;
   ListOfWidgets                myParamWidgets;
+  ListOfWidgets                myParamLabels;
   bool                         myIsCreate;
   QtxDialog*                   myDlg;
   QString                      myShapeEntry;
@@ -171,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 );
@@ -182,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