Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #40644][CEA](2024-T1) Feature search.
[modules/gui.git]
/
src
/
SalomeApp
/
SalomeApp_Application.h
diff --git
a/src/SalomeApp/SalomeApp_Application.h
b/src/SalomeApp/SalomeApp_Application.h
index b7dffc9f52a61d609d8b8578d7da9b46e5a0d1e0..5a78e279ee3f6951017cf42827bf596cd388d455 100644
(file)
--- a/
src/SalomeApp/SalomeApp_Application.h
+++ b/
src/SalomeApp/SalomeApp_Application.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
@@
-44,6
+44,8
@@
#include <QPointer>
#include <QPointer>
+#include <memory>
+
class LightApp_Preferences;
class SalomeApp_Study;
#ifndef DISABLE_PYCONSOLE
class LightApp_Preferences;
class SalomeApp_Study;
#ifndef DISABLE_PYCONSOLE
@@
-62,14
+64,14
@@
class SALOME_LifeCycleCORBA;
\brief Application containing SalomeApp module or LightApp module
*/
\brief Application containing SalomeApp module or LightApp module
*/
-class SALOMEAPP_EXPORT SalomeApp_Application : public LightApp_Application
+class SALOMEAPP
IMPL
_EXPORT SalomeApp_Application : public LightApp_Application
{
Q_OBJECT
public:
enum { MenuToolsId = 5 };
enum { DumpStudyId = LightApp_Application::UserID, LoadScriptId, PropertiesId,
{
Q_OBJECT
public:
enum { MenuToolsId = 5 };
enum { DumpStudyId = LightApp_Application::UserID, LoadScriptId, PropertiesId,
- CatalogGenId, RegDisplayId, SaveGUIStateId, ConnectId, DisconnectId,
+ CatalogGenId, RegDisplayId,
FindActionId,
SaveGUIStateId, ConnectId, DisconnectId,
UserID };
typedef enum { WT_NoteBook = LightApp_Application::WT_User,
UserID };
typedef enum { WT_NoteBook = LightApp_Application::WT_User,
@@
-82,7
+84,7
@@
protected:
enum { LoadStudyId = LightApp_Application::OpenStudyId + 1, NewAndScriptId };
public:
enum { LoadStudyId = LightApp_Application::OpenStudyId + 1, NewAndScriptId };
public:
- SalomeApp_Application();
+ SalomeApp_Application(
SALOME_NamingService_Abstract *ns = nullptr
);
virtual ~SalomeApp_Application();
virtual void updateObjectBrowser( const bool = true );
virtual ~SalomeApp_Application();
virtual void updateObjectBrowser( const bool = true );
@@
-97,7
+99,7
@@
public:
static CORBA::ORB_var orb();
static _PTR(Study) getStudy();
static CORBA::ORB_var orb();
static _PTR(Study) getStudy();
- static SALOME_NamingService
*
namingService();
+ static SALOME_NamingService
_Abstract*
namingService();
static SALOME_LifeCycleCORBA* lcc();
SUIT_ViewManager* newViewManager(const QString&);
static SALOME_LifeCycleCORBA* lcc();
SUIT_ViewManager* newViewManager(const QString&);
@@
-173,8
+175,11
@@
protected:
virtual PyConsole_Interp* createPyInterp();
#endif
virtual PyConsole_Interp* createPyInterp();
#endif
+ virtual bool canOpenDoc( const QString& );
virtual void afterCloseDoc();
virtual void afterCloseDoc();
+ virtual void addCatalogue( const QString&, const QString& );
+
private slots:
void onDeleteInvalidReferences();
void onDblClick( SUIT_DataObject* );
private slots:
void onDeleteInvalidReferences();
void onDblClick( SUIT_DataObject* );
@@
-187,11
+192,13
@@
private slots:
void onCatalogGen();
void onRegDisplay();
void onCatalogGen();
void onRegDisplay();
+ void onFindAction();
void onOpenWith();
void onExtAction();
private:
void createExtraActions();
void onOpenWith();
void onExtAction();
private:
void createExtraActions();
+ void ensureShaperIsActivated();
private:
#ifndef DISABLE_PYCONSOLE
private:
#ifndef DISABLE_PYCONSOLE
@@
-208,6
+215,8
@@
signals:
bool theIsStudySaved );
void notebookVarUpdated( QString theVarName );
void objectDoubleClicked( SUIT_DataObject* );
bool theIsStudySaved );
void notebookVarUpdated( QString theVarName );
void objectDoubleClicked( SUIT_DataObject* );
+protected:
+ static std::unique_ptr<SALOME_NamingService_Abstract> _ns;
};
#ifdef WIN32
};
#ifdef WIN32