Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAL19658: Deletion problem. Invalid actions were called by shortcuts.
[modules/geom.git]
/
src
/
PrimitiveGUI
/
PrimitiveGUI_TorusDlg.h
diff --git
a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
index 2eb3b32b5b213537cfbffb6fe8d0a07a9f43171f..1703b6a43fa573bada4cf3568c326f2046dbab8e 100644
(file)
--- a/
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
+++ b/
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
@@
-17,14
+17,13
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.
opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.
salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
// File : PrimitiveGUI_TorusDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
//
//
//
// File : PrimitiveGUI_TorusDlg.h
// Author : Lucien PIGNOLONI
// Module : GEOM
-// $Header$
#ifndef DIALOGBOX_TORUS_H
#define DIALOGBOX_TORUS_H
#ifndef DIALOGBOX_TORUS_H
#define DIALOGBOX_TORUS_H
@@
-33,13
+32,6
@@
#include "DlgRef_2Sel2Spin.h"
#include "DlgRef_2Spin.h"
#include "DlgRef_2Sel2Spin.h"
#include "DlgRef_2Spin.h"
-#include "PrimitiveGUI.h"
-
-#include "GEOM_EdgeFilter.hxx"
-#include "GEOM_ShapeTypeFilter.hxx"
-
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
//=================================================================================
// class : PrimitiveGUI_TorusDlg
//=================================================================================
// class : PrimitiveGUI_TorusDlg
@@
-50,44
+42,39
@@
class PrimitiveGUI_TorusDlg : public GEOMBase_Skeleton
Q_OBJECT
public:
Q_OBJECT
public:
- PrimitiveGUI_TorusDlg(QWidget* parent = 0, const char* name = 0, PrimitiveGUI* thePrimitiveGUI = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
+ PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
+ const char* name = 0, bool modal = FALSE, WFlags fl = 0);
~PrimitiveGUI_TorusDlg();
~PrimitiveGUI_TorusDlg();
+protected:
+ // redefined from GEOMBase_Helper
+ virtual GEOM::GEOM_IOperations_ptr createOperation();
+ virtual bool isValid( QString& );
+ virtual bool execute( ObjectList& objects );
+ virtual void addSubshapesToStudy();
+
private:
void Init();
void enterEvent(QEvent* e);
private:
void Init();
void enterEvent(QEvent* e);
- void MakeTorusSimulationAndDisplay();
-
- PrimitiveGUI* myPrimitiveGUI;
- double step;
- int myConstructorId;
- Handle(GEOM_ShapeTypeFilter) myVertexFilter;
- Handle(GEOM_EdgeFilter) myEdgeFilter; /* Filter selection */
+ double getRadius1() const;
+ double getRadius2() const;
- gp_Pnt myPoint1; /* topology used */
- gp_Dir myDir;
- bool myOkPoint1; /* to check when arguments is defined */
- bool myOkDir;
-
- Standard_Real myRadius1;
- Standard_Real myRadius2;
- bool myOkRadius1;
- bool myOkRadius2;
+ GEOM::GEOM_Object_var myPoint, myDir;
DlgRef_2Sel2Spin* GroupPoints;
DlgRef_2Spin* GroupDimensions;
private slots:
void ClickOnOk();
DlgRef_2Sel2Spin* GroupPoints;
DlgRef_2Spin* GroupDimensions;
private slots:
void ClickOnOk();
- void ClickOnApply();
+ bool ClickOnApply();
+
void ActivateThisDialog();
void LineEditReturnPressed();
void SelectionIntoArgument();
void SetEditCurrentArgument();
void ActivateThisDialog();
void LineEditReturnPressed();
void SelectionIntoArgument();
void SetEditCurrentArgument();
- void ConstructorsClicked(int constructorId);
- void ValueChangedInSpinBox(double newValue);
-
+ void ConstructorsClicked(int);
+ void ValueChangedInSpinBox();
};
#endif // DIALOGBOX_TORUS_H
};
#endif // DIALOGBOX_TORUS_H