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
Merge remote branch 'origin/Doc_update_ver741' into V7_5_BR
[modules/gui.git]
/
src
/
LightApp
/
LightApp_Application.h
diff --git
a/src/LightApp/LightApp_Application.h
b/src/LightApp/LightApp_Application.h
index 967676ef11f12849cc4bd6573aa0a43cd36054ac..54be0df781f7e9e4622c2fd155a5b4a1300b2fa7 100644
(file)
--- a/
src/LightApp/LightApp_Application.h
+++ b/
src/LightApp/LightApp_Application.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-33,6
+33,7
@@
#include "LightApp.h"
#include <SUIT_TreeModel.h>
#include "LightApp.h"
#include <SUIT_TreeModel.h>
+#include <SUIT_DataObject.h>
#include <CAM_Application.h>
#include <QPointer>
#include <CAM_Application.h>
#include <QPointer>
@@
-41,6
+42,7
@@
class LogWindow;
#ifndef DISABLE_PYCONSOLE
class PyConsole_Console;
class LogWindow;
#ifndef DISABLE_PYCONSOLE
class PyConsole_Console;
+class PyConsole_Interp;
#endif
class LightApp_WidgetContainer;
class LightApp_Preferences;
#endif
class LightApp_WidgetContainer;
class LightApp_Preferences;
@@
-50,6
+52,7
@@
class LightApp_DataObject;
class SUIT_DataBrowser;
class SUIT_Study;
class SUIT_Accel;
class SUIT_DataBrowser;
class SUIT_Study;
class SUIT_Accel;
+class SUIT_ViewModel;
class CAM_Module;
class QString;
class CAM_Module;
class QString;
@@
-85,7
+88,7
@@
public:
CloseId, CloseAllId, GroupAllId,
PreferencesId, MRUId, ModulesListId,
NewGLViewId, NewPlot2dId, NewOCCViewId, NewVTKViewId,
CloseId, CloseAllId, GroupAllId,
PreferencesId, MRUId, ModulesListId,
NewGLViewId, NewPlot2dId, NewOCCViewId, NewVTKViewId,
- NewQxSceneViewId, NewGraphicsViewId, StyleId, FullScreenId,
+ NewQxSceneViewId, NewGraphicsViewId,
NewPVViewId,
StyleId, FullScreenId,
UserID };
protected:
UserID };
protected:
@@
-130,6
+133,7
@@
public:
virtual void removeViewManager( SUIT_ViewManager* );
virtual SUIT_ViewManager* createViewManager( const QString& vmType );
virtual SUIT_ViewManager* createViewManager( const QString& vmType, QWidget* w );
virtual void removeViewManager( SUIT_ViewManager* );
virtual SUIT_ViewManager* createViewManager( const QString& vmType );
virtual SUIT_ViewManager* createViewManager( const QString& vmType, QWidget* w );
+ virtual SUIT_ViewManager* createViewManager( SUIT_ViewModel* );
QWidget* getWindow( const int, const int = -1 );
QWidget* dockWindow( const int ) const;
QWidget* getWindow( const int, const int = -1 );
QWidget* dockWindow( const int ) const;
@@
-174,11
+178,21
@@
public:
void emitOperationFinished( const QString&, const QString&, const QStringList& );
void emitOperationFinished( const QString&, const QString&, const QStringList& );
+ void updateVisibilityState( DataObjectList& theList,
+ SUIT_ViewModel* theViewModel );
+
+ virtual bool checkExistingDoc();
+
+#ifndef DISABLE_PYCONSOLE
+ PyConsole_Interp* getPyInterp();
+#endif
+
signals:
void studyOpened();
void studySaved();
void studyClosed();
void preferenceChanged( const QString&, const QString&, const QString& );
signals:
void studyOpened();
void studySaved();
void studyClosed();
void preferenceChanged( const QString&, const QString&, const QString& );
+ void preferenceResetToDefaults();
void operationFinished( const QString&, const QString&, const QStringList& );
public slots:
void operationFinished( const QString&, const QString&, const QStringList& );
public slots:
@@
-186,6
+200,7
@@
public slots:
virtual void onHelpContextModule( const QString&, const QString&, const QString& = QString() );
virtual void onNewDoc();
virtual void onOpenDoc();
virtual void onHelpContextModule( const QString&, const QString&, const QString& = QString() );
virtual void onNewDoc();
virtual void onOpenDoc();
+
virtual void onHelpAbout();
virtual bool onOpenDoc( const QString& );
virtual void onCopy();
virtual void onHelpAbout();
virtual bool onOpenDoc( const QString& );
virtual void onCopy();
@@
-221,17
+236,23
@@
protected:
virtual QMap<int, QString> activateModuleActions() const;
virtual void moduleActionSelected( const int );
virtual QMap<int, QString> activateModuleActions() const;
virtual void moduleActionSelected( const int );
+#ifndef DISABLE_PYCONSOLE
+ virtual PyConsole_Interp* createPyInterp();
+#endif
+
protected slots:
virtual void onDesktopActivated();
protected slots:
virtual void onDesktopActivated();
+ virtual void onViewManagerRemoved( SUIT_ViewManager* );
+ virtual void onWindowActivated( SUIT_ViewWindow* theViewWindow );
void onNewWindow();
void onModuleActivation( const QString& );
void onCloseView( SUIT_ViewManager* );
void onNewWindow();
void onModuleActivation( const QString& );
void onCloseView( SUIT_ViewManager* );
- v
oid
onStudyCreated( SUIT_Study* );
- v
oid
onStudyOpened( SUIT_Study* );
- v
oid
onStudySaved( SUIT_Study* );
- v
oid
onStudyClosed( SUIT_Study* );
+ v
irtual void
onStudyCreated( SUIT_Study* );
+ v
irtual void
onStudyOpened( SUIT_Study* );
+ v
irtual void
onStudySaved( SUIT_Study* );
+ v
irtual void
onStudyClosed( SUIT_Study* );
void onWCDestroyed( QObject* );
void onWCDestroyed( QObject* );
@@
-286,9
+307,13
@@
protected:
private:
void emptyPreferences( const QString& );
private:
void emptyPreferences( const QString& );
- QList<QToolBar*> findToolBars();
+ QList<QToolBar*> findToolBars(
const QStringList& names = QStringList()
);
- QByteArray processState(QByteArray& input, const bool processWin,const bool processTb, QByteArray defaultState = QByteArray());
+ QByteArray processState(QByteArray& input,
+ const bool processWin,
+ const bool processTb,
+ const bool isRestoring,
+ QByteArray defaultState = QByteArray());
protected:
typedef QPointer<QWidget> WinPtr;
protected:
typedef QPointer<QWidget> WinPtr;