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
[bos #35160][EDF](2023-T1) Keyboard shortcuts.
[modules/geom.git]
/
src
/
GEOMBase
/
GEOMBase_Helper.h
diff --git
a/src/GEOMBase/GEOMBase_Helper.h
b/src/GEOMBase/GEOMBase_Helper.h
old mode 100755
(executable)
new mode 100644
(file)
index
feaf74a
..
a49a4dd
--- a/
src/GEOMBase/GEOMBase_Helper.h
+++ b/
src/GEOMBase/GEOMBase_Helper.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 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
@@
-41,6
+41,7
@@
#include <QMap>
#include <list>
#include <QMap>
#include <list>
+#include <string>
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
@@
-60,7
+61,7
@@
class GEOM_Operation;
class GEOMBASE_EXPORT GEOMBase_Helper
{
public:
class GEOMBASE_EXPORT GEOMBase_Helper
{
public:
- GEOMBase_Helper( SUIT_Desktop*
);
+ GEOMBase_Helper( SUIT_Desktop*
, SUIT_ViewWindow* aVW = 0
);
virtual ~GEOMBase_Helper();
static SUIT_ViewWindow* getActiveView();
virtual ~GEOMBase_Helper();
static SUIT_ViewWindow* getActiveView();
@@
-105,6
+106,7
@@
protected:
void localSelection( const ObjectList&, const int );
void localSelection( GEOM::GEOM_Object_ptr, const std::list<int> );
void localSelection( GEOM::GEOM_Object_ptr, const int );
void localSelection( const ObjectList&, const int );
void localSelection( GEOM::GEOM_Object_ptr, const std::list<int> );
void localSelection( GEOM::GEOM_Object_ptr, const int );
+ void localSelection( const std::string&, const std::string&, const std::list<int> );
void localSelection( const std::list<int> );
void localSelection( const int );
void activate( const int );
void localSelection( const std::list<int> );
void localSelection( const int );
void activate( const int );
@@
-124,7
+126,6
@@
protected:
bool hasCommand () const;
void updateObjBrowser() const;
bool hasCommand () const;
void updateObjBrowser() const;
- int getStudyId () const;
SalomeApp_Study* getStudy () const;
bool checkViewWindow ();
SalomeApp_Study* getStudy () const;
bool checkViewWindow ();
@@
-166,7
+167,7
@@
protected:
// It should perform the required operation and put all new or modified objects into
// <objects> argument.Should return <false> if some error occurs during its execution.
// It should perform the required operation and put all new or modified objects into
// <objects> argument.Should return <false> if some error occurs during its execution.
- virtual void restoreSubShapes( SALOMEDS::S
tudy_ptr theStudy, SALOMEDS::S
Object_ptr theSObject );
+ virtual void restoreSubShapes( SALOMEDS::SObject_ptr theSObject );
// This method is called by addInStudy().
virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj );
// This method is called by addInStudy().
virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj );