Bug fix: pipeline was disconnected when executing Python script.

This comes from the new way widgets instanciation is handled.
See KitWare issue #10871: https://www.kitware.com/Bug/view.php?id=10871

More to come to align the rest (i.e. Prop panels, etc ...)

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 70e3607162455672d8bb499e14b98dc1ed05fabf..4421a22e887fc27c1f735f2c68a86d6d4bc7074c 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -64,6 +64,7 @@ PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) :
   myDesktop(desk),
   propertiesPanel(0),
   pipelineBrowserWidget(0),
+  pipelineModel(0),
   sourcesMenu(0),
   filtersMenu(0),
   macrosMenu(0),
@@ -88,7 +89,10 @@ void PVViewer_GUIElements::buildPVWidgets()
 
     //Pipeline Browser
     if ( !pipelineBrowserWidget ) {
-      pipelineBrowserWidget  = new pqPipelineBrowserWidget(myDesktop);
+        pqPipelineModel* pipelineModel = new pqPipelineModel(*pqApplicationCore::instance()->getServerManagerModel(), this);
+        pipelineModel->setView(pqActiveObjects::instance().activeView());
+        pipelineBrowserWidget  = new pqPipelineBrowserWidget(myDesktop);
+        pipelineBrowserWidget->setModel(pipelineModel);
     }
 
     // Properties panel

diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index eead0ef142780a6cdaba9a01df78ea53dd35ee96..1d36c612cfaffc7a2d5d19cbd7c70b5b02628443 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -28,6 +28,7 @@
 
 class pqPropertiesPanel;
 class pqPipelineBrowserWidget;
+class pqPipelineModel;
 class QMainWindow;
 class QMenu;
 class QToolBar;
@@ -75,6 +76,7 @@ private:
   // Widgets
   pqPropertiesPanel* propertiesPanel;
   pqPipelineBrowserWidget* pipelineBrowserWidget;
+  pqPipelineModel* pipelineModel;
 
   // Dummy QMenus receiving ParaView's reaction for automatic add when new sources are added
   QMenu* sourcesMenu;