Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MakeNodeAtPointDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h
b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h
index d1d0f09ba5528b4f5f92424c54418631702a8a62..728e6511844c5f5d28f30a351512cc53b1eb6cb3 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
2
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-30,7
+30,9
@@
#include "SMESH_SMESHGUI.hxx"
#include "SMESHGUI_Dialog.h"
#include "SMESH_SMESHGUI.hxx"
#include "SMESHGUI_Dialog.h"
-#include "SMESHGUI_SelectionOp.h"
+#include "SMESHGUI_InteractiveOp.h"
+
+#include <vtkSmartPointer.h>
class QButtonGroup;
class QCheckBox;
class QButtonGroup;
class QCheckBox;
@@
-42,28
+44,35
@@
class SMESHGUI_SpinBox;
class SMESHGUI_MeshEditPreview;
class SMESHGUI_MakeNodeAtPointDlg;
class SMESHGUI_MeshEditPreview;
class SMESHGUI_MakeNodeAtPointDlg;
+
/*!
* \brief Operation to make a mesh pass through a point
*/
/*!
* \brief Operation to make a mesh pass through a point
*/
-class SMESHGUI_EXPORT SMESHGUI_MakeNodeAtPointOp: public SMESHGUI_
Selection
Op
+class SMESHGUI_EXPORT SMESHGUI_MakeNodeAtPointOp: public SMESHGUI_
Interactive
Op
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- SMESHGUI_MakeNodeAtPointOp();
+ SMESHGUI_MakeNodeAtPointOp(
int defaultConstructor = 0
);
virtual ~SMESHGUI_MakeNodeAtPointOp();
virtual LightApp_Dialog* dlg() const;
protected:
virtual ~SMESHGUI_MakeNodeAtPointOp();
virtual LightApp_Dialog* dlg() const;
protected:
- virtual void startOperation();
- virtual void stopOperation();
+ virtual void startOperation()
override
;
+ virtual void stopOperation()
override
;
- virtual void activateSelection();
+ virtual void activateSelection()
override
;
bool isValid( QString& );
bool isValid( QString& );
+ virtual void processStyleEvents(unsigned long event,
+ void* calldata) override;
+
+ virtual void processInteractorEvents(unsigned long event,
+ void* calldata) override;
+
protected slots:
virtual bool onApply();
protected slots:
virtual bool onApply();
@@
-75,14
+84,15
@@
private slots:
void onDestCoordChanged();
void onOpenView();
void onCloseView();
void onDestCoordChanged();
void onOpenView();
void onCloseView();
+ void constructorChanged();
private:
int GetConstructorId();
private:
int GetConstructorId();
+ int myDefaultConstructor;
SMESHGUI_MakeNodeAtPointDlg* myDlg;
SUIT_SelectionFilter* myFilter;
SMESHGUI_MakeNodeAtPointDlg* myDlg;
SUIT_SelectionFilter* myFilter;
- int myMeshOldDisplayMode;
SMESHGUI* mySMESHGUI;
SMESHGUI_MeshEditPreview* mySimulation;
SMESH_Actor* myMeshActor;
SMESHGUI* mySMESHGUI;
SMESHGUI_MeshEditPreview* mySimulation;
SMESH_Actor* myMeshActor;
@@
-110,6
+120,7
@@
private:
QButtonGroup* myButtonGroup;
QRadioButton* myRButNodeToMove;
QRadioButton* myRButMoveWithoutNode;
QButtonGroup* myButtonGroup;
QRadioButton* myRButNodeToMove;
QRadioButton* myRButMoveWithoutNode;
+ QRadioButton* myRButMoveInteractive;
QPushButton* myDestBtn;
QPushButton* myUpdateBtn;
QGroupBox* myDestinationGrp;
QPushButton* myDestBtn;
QPushButton* myUpdateBtn;
QGroupBox* myDestinationGrp;