X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fsalomewrap%2FSalomeWrap_Module.cxx;h=9f04fe4f34917fc1e972d298a1b33a2d442267d3;hb=c7fbf57d46d72c3e2d27bd1a0e50f7984a6ce051;hp=d49f3d0f8c4c0cc55358f36a44eb3d11071df437;hpb=17b2be6fdceef9981751309428fbfe58f155c48e;p=modules%2Fyacs.git diff --git a/src/salomewrap/SalomeWrap_Module.cxx b/src/salomewrap/SalomeWrap_Module.cxx index d49f3d0f8..9f04fe4f3 100644 --- a/src/salomewrap/SalomeWrap_Module.cxx +++ b/src/salomewrap/SalomeWrap_Module.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2006-2016 CEA/DEN, EDF R&D +// Copyright (C) 2006-2019 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 @@ -71,20 +71,17 @@ QxScene_ViewWindow* SalomeWrap_Module::getNewWindow(QGraphicsScene *scene) return aView; } -int SalomeWrap_Module::AssociateViewToWindow(QGraphicsView* gView, +void SalomeWrap_Module::AssociateViewToWindow(QGraphicsView* 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() { + if ( !getApp()->objectBrowser() ) + return 0; + QWidget* wid = getApp()->objectBrowser()->treeView(); if ( !wid ) {