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
IMPs 21188, 21053, 21064
[modules/geom.git]
/
src
/
BasicGUI
/
BasicGUI_MarkerDlg.h
diff --git
a/src/BasicGUI/BasicGUI_MarkerDlg.h
b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 364b0d7375786a1e1bbaee3650b0dbe759f5c3ee..e2cdb7f0711b54e17eb5959dcdeb547ecb03767c 100644
(file)
--- a/
src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/
src/BasicGUI/BasicGUI_MarkerDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// GEOM GEOMGUI : GUI for Geometry component
// File : BasicGUI_MarkerDlg.h
// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
// GEOM GEOMGUI : GUI for Geometry component
// File : BasicGUI_MarkerDlg.h
// Author : Sergey LITONIN, Open CASCADE S.A.S. (sergey.litonin@opencascade.com)
@@
-26,7
+27,8
@@
#ifndef BASICGUI_MARKERDLG_H
#define BASICGUI_MARKERDLG_H
#ifndef BASICGUI_MARKERDLG_H
#define BASICGUI_MARKERDLG_H
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
#include <QMap>
#include <QMap>
@@
-56,11
+58,17
@@
protected:
const bool = true,
const bool = true,
const double = -1 );
const bool = true,
const bool = true,
const double = -1 );
+ virtual void addSubshapesToStudy();
private:
void enterEvent( QEvent* );
void onSelectionDone0();
private:
void enterEvent( QEvent* );
void onSelectionDone0();
+ GEOM::GeomObjPtr myShape;
+ GEOM::GeomObjPtr myPoint;
+ GEOM::GeomObjPtr myVectorX;
+ GEOM::GeomObjPtr myVectorY;
+
private slots:
void onOk();
bool onApply();
private slots:
void onOk();
bool onApply();
@@
-69,7
+77,6
@@
private slots:
void onSelectionDone();
void onValueChanged( double );
void ConstructorsClicked( int );
void onSelectionDone();
void onValueChanged( double );
void ConstructorsClicked( int );
- void LineEditReturnPressed();
void SetEditCurrentArgument();
private:
void SetEditCurrentArgument();
private: