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 316a4cab39d46081f3f3cd2cad0955e34514e298..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,13
+84,11
@@
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 );
- virtual QString getFileFilter() const;
-
virtual void start();
virtual void contextMenuPopup( const QString&, QMenu*, QString& );
virtual void start();
virtual void contextMenuPopup( const QString&, QMenu*, QString& );
@@
-98,8
+98,8
@@
public:
virtual bool checkExistingDoc();
static CORBA::ORB_var orb();
virtual bool checkExistingDoc();
static CORBA::ORB_var orb();
- static
SALOMEDSClient_StudyManager* studyMgr
();
- static SALOME_NamingService
*
namingService();
+ static
_PTR(Study) getStudy
();
+ static SALOME_NamingService
_Abstract*
namingService();
static SALOME_LifeCycleCORBA* lcc();
SUIT_ViewManager* newViewManager(const QString&);
static SALOME_LifeCycleCORBA* lcc();
SUIT_ViewManager* newViewManager(const QString&);
@@
-119,11
+119,15
@@
public:
virtual bool renameObject( const QString&, const QString& );
public slots:
virtual bool renameObject( const QString&, const QString& );
public slots:
+ virtual void onNewDoc();
virtual void onLoadDoc();
virtual void onNewWithScript();
virtual bool onLoadDoc( const QString& );
virtual void onUnloadDoc( bool ask = true);
virtual void onCloseDoc( bool ask = true);
virtual void onLoadDoc();
virtual void onNewWithScript();
virtual bool onLoadDoc( const QString& );
virtual void onUnloadDoc( bool ask = true);
virtual void onCloseDoc( bool ask = true);
+ virtual void onOpenDoc();
+ virtual bool onOpenDoc( const QString& );
+ virtual bool onReopenDoc();
virtual void onExit();
virtual void onCopy();
virtual void onExit();
virtual void onCopy();
@@
-143,6
+147,8
@@
protected slots:
void onStudyOpened( SUIT_Study* );
void onDesktopMessage( const QString& );
void onStudyOpened( SUIT_Study* );
void onDesktopMessage( const QString& );
+ virtual void onModuleActivation( const QString& );
+
protected:
virtual void createActions();
virtual SUIT_Study* createNewStudy();
protected:
virtual void createActions();
virtual SUIT_Study* createNewStudy();
@@
-169,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* );
@@
-183,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
@@
-196,12
+207,16
@@
private:
QMap<QString, QAction*> myExtActions; // Map <AttributeUserID, QAction>
bool myIsCloseFromExit; // "Close from Exit" flag
QMap<QString, QAction*> myExtActions; // Map <AttributeUserID, QAction>
bool myIsCloseFromExit; // "Close from Exit" flag
+ bool myToIgnoreMessages;// to ignore messages from SALOMEDS
+
signals:
void dumpedStudyClosed( const QString& theDumpScript,
const QString& theStudyName,
bool theIsStudySaved );
void notebookVarUpdated( QString theVarName );
signals:
void dumpedStudyClosed( const QString& theDumpScript,
const QString& theStudyName,
bool theIsStudySaved );
void notebookVarUpdated( QString theVarName );
-
+ void objectDoubleClicked( SUIT_DataObject* );
+protected:
+ static std::unique_ptr<SALOME_NamingService_Abstract> _ns;
};
#ifdef WIN32
};
#ifdef WIN32