Merge branch 'OCCT780'

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_NbSegmentsCreator.h

diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
index f39b2feb9c2089939249f22eba6eb2deb2a7be74..67b612ce9e561573828a653b9d28ede1aaa1cae4 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, 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-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS


@@ -39,7 +39,9 @@ class SalomeApp_IntSpinBox;
 class QtxComboBox;
 class SMESHGUI_SpinBox;
 class StdMeshersGUI_DistrTableFrame;
 class QtxComboBox;
 class SMESHGUI_SpinBox;
 class StdMeshersGUI_DistrTableFrame;

-class StdMeshersGUI_DistrPreview;
+#ifndef DISABLE_PLOT2DVIEWER
+  class StdMeshersGUI_DistrPreview;
+#endif

 class QLineEdit;
 class QButtonGroup;
 class QGroupBox;
 class QLineEdit;
 class QButtonGroup;
 class QGroupBox;


@@ -47,15 +49,16 @@ class QGridLayout;
 class QRadioButton;
 class StdMeshersGUI_SubShapeSelectorWdg;
 class StdMeshersGUI_PropagationHelperWdg;
 class QRadioButton;
 class StdMeshersGUI_SubShapeSelectorWdg;
 class StdMeshersGUI_PropagationHelperWdg;

+class SMESHGUI_SpinBoxForbiddendRange;

 
 typedef struct
 {
   int                 myNbSeg, myDistrType, myConv;
   double              myScale;
 
 typedef struct
 {
   int                 myNbSeg, myDistrType, myConv;
   double              myScale;

+  double              myBeta;

   SMESH::double_array myTable;
   QString             myName, myExpr;
   QString             myNbSegVarName, myScaleVarName;
   SMESH::double_array myTable;
   QString             myName, myExpr;
   QString             myNbSegVarName, myScaleVarName;

-

 } NbSegmentsHypothesisData;
 
 class STDMESHERSGUI_EXPORT StdMeshersGUI_NbSegmentsCreator : public StdMeshersGUI_StdHypothesisCreator
 } NbSegmentsHypothesisData;
 
 class STDMESHERSGUI_EXPORT StdMeshersGUI_NbSegmentsCreator : public StdMeshersGUI_StdHypothesisCreator


@@ -85,12 +88,15 @@ private:
   SalomeApp_IntSpinBox*   myNbSeg;
   QtxComboBox*     myDistr;
   SMESHGUI_SpinBox*   myScale;
   SalomeApp_IntSpinBox*   myNbSeg;
   QtxComboBox*     myDistr;
   SMESHGUI_SpinBox*   myScale;

+  SMESHGUI_SpinBoxForbiddendRange*   myBeta;

   StdMeshersGUI_DistrTableFrame*  myTable;
   StdMeshersGUI_DistrTableFrame*  myTable;

+#ifndef DISABLE_PLOT2DVIEWER

   StdMeshersGUI_DistrPreview* myPreview;
   StdMeshersGUI_DistrPreview* myPreview;

+#endif

   QLineEdit       *myName, *myExpr;
   QGroupBox*       myConvBox;
   QButtonGroup*    myConv;
   QLineEdit       *myName, *myExpr;
   QGroupBox*       myConvBox;
   QButtonGroup*    myConv;

-  QLabel          *myLScale, *myLTable, *myLExpr, *myInfo;
+  QLabel          *myLScale, *myLTable, *myLExpr, *myInfo, *myLBeta;

   QGridLayout*     myGroupLayout;
   int              myTableRow, myPreviewRow;
   //QRadioButton*    myCutNeg;
   QGridLayout*     myGroupLayout;
   int              myTableRow, myPreviewRow;
   //QRadioButton*    myCutNeg;