bos #20256: [CEA 18523] Porting SMESH to int 64 bits

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

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
index b86138e082765cf7a305c6c67e431650d5271003..524ec478be13315f5a38a01cb38b9a613e6c593b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -100,7 +100,7 @@ class SMESHGUI_EXPORT SMESHGUI_3TypesSelector : public QWidget
 
  private:
 
-  void                             addTmpIdSource( SMESH::long_array_var& ids,
+  void                             addTmpIdSource( SMESH::smIdType_array_var& ids,
                                                    int iType, int index);
 
   QGroupBox*                       myGroups   [3];
@@ -145,8 +145,11 @@ private:
   void                             getExtrusionVector(SMESH::DirStruct& aVector);
   void                             extrusionByNormal(SMESH::SMESH_MeshEditor_ptr meshEditor,
                                                      const bool                  makeGroups=false);
-  bool                             getScaleParams( SMESH::double_array*& scales,
-                                                   SMESH::double_array*& basePoint );
+  void                             getScaleParams( SMESH::double_array*& scales,
+                                                   SMESH::double_array*& basePoint,
+                                                   bool &                scalesVariation,
+                                                   SMESH::double_array*& angles,
+                                                   bool &                anglesVariation);
   
   bool                             isValid();
   bool                             isValuesValid();
@@ -154,6 +157,7 @@ private:
   LightApp_SelectionMgr*           mySelectionMgr;        /* User shape selection */
   SVTK_Selector*                   mySelector;
   QList<double>                    myScalesList;
+  QList<double>                    myAnglesList;
 
   // widgets
   SMESHGUI_3TypesSelector*         SelectorWdg;
@@ -185,18 +189,26 @@ private:
   QCheckBox*                       UseInputElemsOnlyCheck;
   QCheckBox*                       MakeGroupsCheck;
 
-  QCheckBox*                       LinearScalesCheck;
-  QGroupBox*                       ScalesGrp;
-  QListWidget*                     ScalesList;
-  QToolButton*                     AddScaleButton;
-  QToolButton*                     RemoveScaleButton;
-  SMESHGUI_SpinBox*                ScaleSpin;
   QGroupBox*                       BasePointGrp;
   QPushButton*                     SelectBasePointButton;
   SMESHGUI_SpinBox*                BasePoint_XSpin;
   SMESHGUI_SpinBox*                BasePoint_YSpin;
   SMESHGUI_SpinBox*                BasePoint_ZSpin;
 
+  QGroupBox*                       ScalesGrp;
+  QListWidget*                     ScalesList;
+  QToolButton*                     AddScaleButton;
+  QToolButton*                     RemoveScaleButton;
+  SMESHGUI_SpinBox*                ScaleSpin;
+  QCheckBox*                       LinearScalesCheck;
+
+  QGroupBox*                       AnglesGrp;
+  QListWidget*                     AnglesList;
+  QToolButton*                     AddAngleButton;
+  QToolButton*                     RemoveAngleButton;
+  SMESHGUI_SpinBox*                AngleSpin;
+  QCheckBox*                       LinearAnglesCheck;
+
   QGroupBox*                       GroupButtons;
   QPushButton*                     buttonOk;
   QPushButton*                     buttonCancel;