From a79b837b499b79aeafe2eef3cd33ed1d2033e3af Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 4 Aug 2017 16:26:38 +0300 Subject: [PATCH] Add 'Catalyst' menu into ParaVis module. --- src/PVViewer/PVViewer_GUIElements.cxx | 12 ++++++++++++ src/PVViewer/PVViewer_GUIElements.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx index 6c21812f2..1b13be9c3 100644 --- a/src/PVViewer/PVViewer_GUIElements.cxx +++ b/src/PVViewer/PVViewer_GUIElements.cxx @@ -68,6 +68,7 @@ PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) : sourcesMenu(0), filtersMenu(0), macrosMenu(0), + catalystMenu(0), myPVWidgetsFlag(false) { } @@ -118,6 +119,12 @@ void PVViewer_GUIElements::buildPVWidgets() pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu); } + // Catalyst Menu + if (!catalystMenu) { + catalystMenu = new QMenu(0); + pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu); + } + mainToolBar = new pqMainControlsToolbar(myDesktop) << pqSetName("MainControlsToolbar"); mainToolBar->layout()->setSpacing(0); @@ -336,6 +343,11 @@ QMenu* PVViewer_GUIElements::getMacrosMenu() { return macrosMenu; } +QMenu* PVViewer_GUIElements::getCatalystMenu() { + buildPVWidgets(); + return catalystMenu; +} + void PVViewer_GUIElements::publishExistingSources() { vtkSMSessionProxyManager* pxm = pqActiveObjects::instance().proxyManager(); pqServerManagerModel* smmodel = pqApplicationCore::instance()->getServerManagerModel(); diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h index 1d36c612c..57c2e735e 100644 --- a/src/PVViewer/PVViewer_GUIElements.h +++ b/src/PVViewer/PVViewer_GUIElements.h @@ -53,6 +53,7 @@ public: QMenu* getFiltersMenu(); QMenu* getSourcesMenu(); QMenu* getMacrosMenu(); + QMenu* getCatalystMenu(); pqVCRToolbar* getVCRToolbar(); pqAnimationTimeToolbar* getTimeToolbar(); @@ -82,6 +83,7 @@ private: QMenu* sourcesMenu; QMenu* filtersMenu; QMenu* macrosMenu; + QMenu* catalystMenu; // Toolbars also need to be instanciated early: QToolBar* mainToolBar; -- 2.39.2