Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2021
[modules/yacs.git]
/
src
/
salomewrap
/
SalomeWrap_Module.cxx
diff --git
a/src/salomewrap/SalomeWrap_Module.cxx
b/src/salomewrap/SalomeWrap_Module.cxx
index ecf25ea149d943800c67c46aa273fc5f2240ec47..41f3650b37c4ae63cb488d834f353714754e790d 100644
(file)
--- a/
src/salomewrap/SalomeWrap_Module.cxx
+++ b/
src/salomewrap/SalomeWrap_Module.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2006-20
14
CEA/DEN, EDF R&D
+// Copyright (C) 2006-20
21
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-71,20
+71,17
@@
QxScene_ViewWindow* SalomeWrap_Module::getNewWindow(QGraphicsScene *scene)
return aView;
}
return aView;
}
-
int
SalomeWrap_Module::AssociateViewToWindow(QGraphicsView* gView,
+
void
SalomeWrap_Module::AssociateViewToWindow(QGraphicsView* gView,
QxScene_ViewWindow* viewWindow)
{
viewWindow->setSceneView(gView);
viewWindow->setCentralWidget(gView);
QxScene_ViewWindow* viewWindow)
{
viewWindow->setSceneView(gView);
viewWindow->setCentralWidget(gView);
- return viewWindow->getViewManager()->study()->id();
-}
-
-int SalomeWrap_Module::activeStudyId()
-{
- return getApp()->activeStudy()->id();
}
QDockWidget* SalomeWrap_Module::objectBrowser() {
}
QDockWidget* SalomeWrap_Module::objectBrowser() {
+ if ( !getApp()->objectBrowser() )
+ return 0;
+
QWidget* wid = getApp()->objectBrowser()->treeView();
if ( !wid ) {
QWidget* wid = getApp()->objectBrowser()->treeView();
if ( !wid ) {
@@
-169,9
+166,9
@@
int SalomeWrap_Module::wCreateMenu(QAction* action,
return createMenu(action, menu, actionId, groupId, index);
}
return createMenu(action, menu, actionId, groupId, index);
}
-int SalomeWrap_Module::wCreateTool(const QString& name)
+int SalomeWrap_Module::wCreateTool(const QString&
title, const QString&
name)
{
{
- return createTool(name);
+ return createTool(
title,
name);
}
int SalomeWrap_Module::wCreateTool(const int actionId,
}
int SalomeWrap_Module::wCreateTool(const int actionId,