[PVViewer] Add Catalyst menu

diff --git a/src/PVViewer/CMakeLists.txt b/src/PVViewer/CMakeLists.txt
index 45f3b7439f761a45ce0e1f20b91b721787feddf1..b40741f37d82fc86e602b465f57ff3b7ce12f445 100644 (file)
--- a/src/PVViewer/CMakeLists.txt
+++ b/src/PVViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  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
@@ -20,6 +20,17 @@
 # Install ParaView filters, etc ...
 ADD_SUBDIRECTORY(resources)
 
+FIND_PACKAGE(ParaView COMPONENTS vtkPVCatalyst vtkPVPythonCatalyst)
+LIST(FIND VTK_MODULES_ENABLED vtkPVCatalyst vtkPVCatalyst_index)
+LIST(FIND VTK_MODULES_ENABLED vtkPVPythonCatalyst vtkPVPythonCatalyst_index)
+IF (${vtkPVCatalyst_index} GREATER -1 AND
+    ${vtkPVPythonCatalyst_index} GREATER -1)
+  SET(PVCATALYST_ENABLED yes)
+ENDIF()
+IF (PVCATALYST_ENABLED)
+  ADD_DEFINITIONS("-DPVCATALYST_ENABLED")
+ENDIF()
+
 INCLUDE(UseQtExt)
 
 # --- options ---
@@ -39,12 +50,12 @@ ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   )
 
-SET(_link_LIBRARIES 
-  ${KERNEL_SALOMELocalTrace} 
+SET(_link_LIBRARIES
+  ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
-  PyInterp  
-  suit 
-  Event 
+  PyInterp
+  suit
+  Event
   PVServerService
   pqApplicationComponents
   #vtkRenderingFreeTypeOpenGL
@@ -96,11 +107,11 @@ SET(_other_SOURCES
   PVViewer_GUIElements.cxx
   PVViewer_Core.cxx
   )
-  
+
 # sources / to compile
-SET(PVViewer_SOURCES 
-  ${_other_SOURCES} 
-  ${_moc_SOURCES} 
+SET(PVViewer_SOURCES
+  ${_other_SOURCES}
+  ${_moc_SOURCES}
   ${_rcc_SOURCES}
   )
 

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index e2b77ddb84661e7d9b0cef57f6b155bb41fe596c..a30c17e5e24ef5fd4029c4677e459aa4a3cc2060 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2016  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
@@ -59,6 +59,10 @@ PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) :
   pqParaViewMenuBuilders::buildSourcesMenu(*sourcesMenu, desk);
   filtersMenu = new QMenu(0);
   pqParaViewMenuBuilders::buildFiltersMenu(*filtersMenu, desk);
+#ifdef PVCATALYST_ENABLED
+  catalystMenu = new QMenu(0);
+  pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
+#endif
   macrosMenu = new QMenu(0);
   pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu);
 

diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index a498ff333348b57052e99aa9f4566ff3cfa283cc..a61f88d05d71686a89c5e75062b0120ddb186bf0 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2016  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
@@ -52,6 +52,9 @@ public:
   QMenu* getFiltersMenu() { return filtersMenu; }
   QMenu* getSourcesMenu() { return sourcesMenu; }
   QMenu* getMacrosMenu()  { return macrosMenu; }
+#ifdef PVCATALYST_ENABLED
+  QMenu* getCatalystMenu()  { return catalystMenu; }
+#endif
 
   pqVCRToolbar* getVCRToolbar() { return vcrToolbar; }
   pqAnimationTimeToolbar* getTimeToolbar() { return timeToolbar; }
@@ -76,6 +79,9 @@ private:
   QMenu* sourcesMenu;
   QMenu* filtersMenu;
   QMenu* macrosMenu;
+#ifdef PVCATALYST_ENABLED
+  QMenu* catalystMenu;
+#endif
 
   // Toolbars also need to be instanciated early:
   QToolBar* mainToolBar;