Merge branch 'V9_9_BR'

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

diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
index b66c6f149fd7f02c1605617b06b509bbb9ecf93e..8f9ee27616a2e2185823e0809de166aa71d92f95 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  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
@@ -60,6 +60,8 @@ class SALOME_Actor;
 class SMESHGUI;
 class SMESH_Actor;
 class QtxDoubleSpinBox;
+class QtxDoubleSpinSlider;
+class QtxIntSpinSlider;
 class vtkActor;
 class vtkDataSetMapper;
 class vtkPlaneSource;
@@ -79,7 +81,7 @@ namespace SMESH
     public:
       static OrientedPlane *New();
       static OrientedPlane *New(SVTK_ViewWindow* theViewWindow);
-      vtkTypeMacro (OrientedPlane, vtkPlane);
+      vtkTypeMacro (OrientedPlane, vtkPlane)
 
       QPointer<SVTK_ViewWindow> myViewWindow;
       SMESH::Orientation myRelativeOrientation;
@@ -133,7 +135,7 @@ namespace SMESH
 
   typedef std::vector<TPlane>               TPlaneVector;
   typedef std::vector<TPlaneData>           TPlaneDataVector;
-};
+}
 
 //=================================================================================
 // class    : SMESHGUI_ClippingDlg
@@ -224,12 +226,9 @@ private:
   QLabel*                 TextLabelDistance;
   QLabel*                 TextLabelRotation1;
   QLabel*                 TextLabelRotation2;
-  QLabel*                 TLValueDistance;
-  QLabel*                 TLValueRotation1;
-  QLabel*                 TLValueRotation2;
-  QSlider*                SliderDistance;
-  QSlider*                SliderRotation1;
-  QSlider*                SliderRotation2;
+  QtxDoubleSpinSlider*    SpinSliderDistance;
+  QtxIntSpinSlider*       SpinSliderRotation1;
+  QtxIntSpinSlider*       SpinSliderRotation2;
   QComboBox*              CBRelativeOrientation;
 
   QCheckBox*              PreviewCheckBox;
@@ -266,9 +265,6 @@ public slots:
   void ClickOnApply();
   void ClickOnHelp();
 
-  void SliderDistanceHasMoved(int);
-  void SliderRotation1HasMoved(int);
-  void SliderRotation2HasMoved(int);
   void onSelectAbsoluteOrientation( int );
   void onSelectRelativeOrientation( int );
   void onReset();