Revert "Merge branch 'agr/edf12447-catalyst'"

This reverts commit 9d4cbe023ff3be5adfc2b401fcf0aeba95b51941, reversing
changes made to 10b37dd7682b80461572726837d430f86b890cb8.

diff --git a/src/PVViewer/CMakeLists.txt b/src/PVViewer/CMakeLists.txt
index b40741f37d82fc86e602b465f57ff3b7ce12f445..45f3b7439f761a45ce0e1f20b91b721787feddf1 100644 (file)
--- a/src/PVViewer/CMakeLists.txt
+++ b/src/PVViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  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,17 +20,6 @@
 # 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 ---
@@ -50,12 +39,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
@@ -107,11 +96,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 a30c17e5e24ef5fd4029c4677e459aa4a3cc2060..e2b77ddb84661e7d9b0cef57f6b155bb41fe596c 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2015  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,10 +59,6 @@ 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 a61f88d05d71686a89c5e75062b0120ddb186bf0..a498ff333348b57052e99aa9f4566ff3cfa283cc 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2015  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,9 +52,6 @@ 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; }
@@ -79,9 +76,6 @@ private:
   QMenu* sourcesMenu;
   QMenu* filtersMenu;
   QMenu* macrosMenu;
-#ifdef PVCATALYST_ENABLED
-  QMenu* catalystMenu;
-#endif
 
   // Toolbars also need to be instanciated early:
   QToolBar* mainToolBar;