Merge remote-tracking branch 'remotes/origin/hydro/imps_2017_salome_83' into HEAD

[modules/geom.git] / src / EntityGUI / EntityGUI_FieldDlg.h

diff --git a/src/EntityGUI/EntityGUI_FieldDlg.h b/src/EntityGUI/EntityGUI_FieldDlg.h
index c3a0b7ae1d958b442f55ae55a025ab93feb52a5a..4e5cf39c51554ed785deb4652ab0e641c3b0ae2e 100644 (file)
--- a/src/EntityGUI/EntityGUI_FieldDlg.h
+++ b/src/EntityGUI/EntityGUI_FieldDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -59,7 +59,6 @@ class EntityGUI_FieldDlg : public GEOMBase_Skeleton
   class Delegate;
 
 public:
-
   EntityGUI_FieldDlg (GeometryGUI* theGeometryGUI,
                       GEOM::GEOM_Field_ptr theField, int stepID=0,
                       QWidget* parent=0,
@@ -71,6 +70,7 @@ protected:
   virtual GEOM::GEOM_IOperations_ptr  createOperation();
   virtual bool                        isValid (QString&);
   virtual bool                        execute ();
+  virtual QList<GEOM::GeomObjPtr>     getSourceObjects();
 
 private slots:
   void                                ClickOnOk();
@@ -105,7 +105,6 @@ private:
   int                                 getSelectedSubshapes (TColStd_IndexedMapOfInteger& map);
 
 private:
-
   bool                                myIsCreation;
   GEOM::GEOM_Field_var                myField;
   GEOM::GEOM_Object_var               myShape;
@@ -120,6 +119,8 @@ private:
   int                                 myDmMode;
   bool                                myIsHiddenMain;
 
+  QList<int>                          myHiddenFieldStepIds;
+
   QPushButton*                        myShapeSelBtn;
   QLineEdit*                          myShapeName;
   QComboBox*                          myTypeCombo;
@@ -131,6 +132,7 @@ private:
   SalomeApp_IntSpinBox*               myNbCompsSpin;
   QWidget*                            mySwitchTableWdg;
   QComboBox*                          myStepsCombo;
+  QLineEdit*                          myStepEdit;
   SalomeApp_IntSpinBox*               myStampSpin;
 
 };
@@ -151,6 +153,7 @@ class EntityGUI_FieldDlg::StepTable : public QTableWidget
   bool                     myIsChanged;
 
   QTableWidgetItem * newDefaultItem();
+
 public:
   StepTable( int stepID, int dataType, int nbRows, int nbColumns,
              QString shapeName, QStringList headers,
@@ -181,8 +184,10 @@ public:
   void                     setHeaders(const QStringList& headers);
   GEOM::GEOM_FieldStep_var getStep() { return myStep; }
   void                     setValues(GEOM::GEOM_FieldStep_var& step);
+
 public slots:
   void                     setIsChanged() { myIsChanged = true; }
+  void                     headerDblClicked( int );
 };
 
 #endif