Avoid transfert of PV3DViewer to MultiTabWidget sub widget

diff --git a/src/PVViewer/PVViewer_Core.cxx b/src/PVViewer/PVViewer_Core.cxx
index 86eef145ff9106ac19300ac0dfb9bfc6f72a67cc..6ac97835e2831408bb2725d2b6438713da88273e 100644 (file)
--- a/src/PVViewer/PVViewer_Core.cxx
+++ b/src/PVViewer/PVViewer_Core.cxx
@@ -131,7 +131,7 @@ bool PVViewer_Core::ParaviewInitApp()
     // Direct VTK log messages to our SALOME window - TODO: review this
     PVViewer_OutputWindow * w = PVViewer_OutputWindow::New();
     vtkOutputWindow::SetInstance(w);
-
+    pqActiveObjects::instance().setActiveView(nullptr);
     new pqTabbedMultiViewWidget(); // registers a "MULTIVIEW_WIDGET" on creation
     // Initialization of ParaView GUI widgets will be done when these widgets are
     // really needed.

diff --git a/src/PVViewer/PVViewer_ViewWindow.cxx b/src/PVViewer/PVViewer_ViewWindow.cxx
index 6e2516921f85034d804f7ed748e65cb0d42ee8ae..6309f86d38f123fb02521206cd14e57929c9ad93 100644 (file)
--- a/src/PVViewer/PVViewer_ViewWindow.cxx
+++ b/src/PVViewer/PVViewer_ViewWindow.cxx
@@ -32,6 +32,7 @@
 
 #include <pqTabbedMultiViewWidget.h>
 #include <pqApplicationCore.h>
+#include "pqActiveObjects.h"
 
 //---------------------------------------------------------
 #define USE_DEBUG
@@ -58,6 +59,7 @@ PVViewer_ViewWindow::PVViewer_ViewWindow( SUIT_Desktop* theDesktop, PVViewer_Vie
   myDesktop = theDesktop;
   myModel = theModel;
   setViewManager(myModel->getViewManager());
+  pqActiveObjects::instance().setActiveView(nullptr);
   myPVMgr = qobject_cast<pqTabbedMultiViewWidget*>(pqApplicationCore::instance()->manager("MULTIVIEW_WIDGET"));
   if (myPVMgr) {
     SUIT_Application* app = SUIT_Session::session()->activeApplication();