X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPVViewer%2FPVViewer_ViewManager.h;h=7c3bf2484d291d4ed9887ca0aeae7ce787fb0f55;hb=2400f3659b65727d5a776dccd3d5dd506d755a88;hp=78652de05a490472b7c083504a236c31e2326a7c;hpb=b330d1f023e897cfddde5a0cb7efd949c317d5a5;p=modules%2Fgui.git

diff --git a/src/PVViewer/PVViewer_ViewManager.h b/src/PVViewer/PVViewer_ViewManager.h
index 78652de05..7c3bf2484 100644
--- a/src/PVViewer/PVViewer_ViewManager.h
+++ b/src/PVViewer/PVViewer_ViewManager.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2014  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
@@ -16,51 +16,44 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// Author: Adrien Bruneton (CEA)
+
 #ifndef PVViewer_VIEWMANAGER_H
 #define PVViewer_VIEWMANAGER_H
 
+#include "PVViewer.h"
+
 #include <SUIT_ViewManager.h>
 
-class PVViewer_EngineWrapper;
 class SUIT_Desktop;
 class SUIT_Study;
 class SUIT_ViewWindow;
-class pqTabbedMultiViewWidget;
-class pqPVApplicationCore;
-class PVViewer_Behaviors;
-class pqPropertiesPanel;
-class pqPipelineBrowserWidget;
+class LogWindow;
+class PVServer_ServiceWrapper;
+class QMainWindow;
 
-class PVViewer_ViewManager : public SUIT_ViewManager
+class PVVIEWER_EXPORT PVViewer_ViewManager : public SUIT_ViewManager
 {
   Q_OBJECT
 
 public:
-  PVViewer_ViewManager( SUIT_Study*, SUIT_Desktop* );
+  PVViewer_ViewManager( SUIT_Study*, SUIT_Desktop*, LogWindow *);
   ~PVViewer_ViewManager() {}
 
-  static pqPVApplicationCore * GetPVApplication();
-  static PVViewer_EngineWrapper * GetEngine();
+  //! Get the CORBA engine wrapper.
+  static PVServer_ServiceWrapper * GetService();
 
-  //! Initialize ParaView if not yet done (once per session)
-  static bool   ParaviewInitApp(SUIT_Desktop* aDesktop);
-  static void   ParaviewInitBehaviors(bool fullSetup=false, SUIT_Desktop* aDesktop=0);
-  static void   ParaviewLoadConfigurations();
-  static void   ParaviewCleanup();
+  //! Get PVViewer configuration path as stored by SALOME's resource manager:
+  static QString GetPVConfigPath();
 
   //! Connect to the external PVServer, using the PARAVIS engine to launch it if it is not
   //! already up.
-  static bool   ConnectToExternalPVServer(SUIT_Desktop* aDesktop);
+  static bool   ConnectToExternalPVServer(QMainWindow* aDesktop);
 
-public slots:
-//  void onPVViewCreated(SUIT_ViewWindow*);
-  void onEmulateApply();
+protected slots:
+  void onWindowActivated(SUIT_ViewWindow*);
 
 private:
-  static pqPVApplicationCore* MyCoreApp;
-  static bool ConfigLoaded;
-  static PVViewer_Behaviors * ParaviewBehaviors;
-
   SUIT_Desktop * desktop;
 };