X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPVGUI%2FPVGUI_Module_widgets.cxx;h=7ddee81bfcf2221be03b8e2d633d47c44ab9734d;hb=fe837bd5f2aae9a93c8986af24a84520551b2995;hp=e171081fcb92d476d9f393c53e77e599cd552224;hpb=6eb77d473b876723c667cd008659ca38012514aa;p=modules%2Fparavis.git

diff --git a/src/PVGUI/PVGUI_Module_widgets.cxx b/src/PVGUI/PVGUI_Module_widgets.cxx
index e171081f..7ddee81b 100644
--- a/src/PVGUI/PVGUI_Module_widgets.cxx
+++ b/src/PVGUI/PVGUI_Module_widgets.cxx
@@ -67,31 +67,35 @@
 #include <pqColorMapEditor.h>
 #include <pqDeleteReaction.h>
 
-//class ResizeHelper : public pqPVAnimationWidget
-//{
-//  // TEMPORARILY WORKAROUND AROUND PARAVIEW 3.14 BUG:
-//  // WHEN ANIMATION VIEW IS RESIZED, ITS CONTENTS IS NOT PREPERLY RE-ARRANGED
-//  // CAUSING SOME CONTROLS TO STAY NON-VISIBLE
-//  // THIS BUG IS NATURALLY FIXED BY ADDING
-//  //      this->updateGeometries();
-//  // TO THE
-//  //     void pqAnimationWidget::resizeEvent(QResizeEvent* e);
-//  // BUT THIS CANNOT BE DONE DIRECTLY, SINCE CORRESPONDING API IS NOT PUBLIC
-//  // THE ONLY WAY TO DO THIS BY SENDING SHOW EVENT TO THE WIDGET
-//
-//public:
-//  ResizeHelper( QWidget* parent ) : pqPVAnimationWidget( parent ) {}
-//protected:
-//  void resizeEvent(QResizeEvent* e)
-//  {
-//    pqAnimationWidget* w = findChild<pqAnimationWidget*>( "pqAnimationWidget" );
-//    if ( w ) {
-//      QShowEvent e;
-//      QApplication::sendEvent( w, &e );
-//    }
-//    pqPVAnimationWidget::resizeEvent( e );
-//  }
-//};
+#include <vtkPVGeneralSettings.h>
+
+class ResizeHelper : public pqPVAnimationWidget
+{
+  // TEMPORARILY WORKAROUND AROUND PARAVIEW 3.14 BUG:
+  // WHEN ANIMATION VIEW IS RESIZED, ITS CONTENTS IS NOT PREPERLY RE-ARRANGED
+  // CAUSING SOME CONTROLS TO STAY NON-VISIBLE
+  // THIS BUG IS NATURALLY FIXED BY ADDING
+  //      this->updateGeometries();
+  // TO THE
+  //     void pqAnimationWidget::resizeEvent(QResizeEvent* e);
+  // BUT THIS CANNOT BE DONE DIRECTLY, SINCE CORRESPONDING API IS NOT PUBLIC
+  // THE ONLY WAY TO DO THIS BY SENDING SHOW EVENT TO THE WIDGET
+
+public:
+  ResizeHelper( QWidget* parent ) : pqPVAnimationWidget( parent ) {}
+protected:
+  void resizeEvent(QResizeEvent* e)
+  {
+    pqAnimationWidget* w = findChild<pqAnimationWidget*>( "pqAnimationWidget" );
+    if ( w ) {
+      QShowEvent e;
+      QApplication::sendEvent( w, &e );
+    }
+    pqPVAnimationWidget::resizeEvent( e );
+  }
+};
+
+
 
 /*!
   \brief Create dock widgets for ParaView widgets such as object inspector, pipeline browser, etc.
@@ -117,7 +121,11 @@ void PVGUI_Module::setupDockWidgets()
   myDockWidgets[pipelineBrowserDock] = true;
   pipelineBrowserDock->hide();
 
-  // Properties dock (previously called OBJECT_INSPECTOR)
+  // PROPERTIES, DISPLAY and VIEW:
+  // See ParaViewMainWindow.cxx - those three panels can be separated or grouped.
+  pqSettings *settings = pqApplicationCore::instance()->settings();
+
+  //    Properties dock (previously called OBJECT_INSPECTOR)
   QDockWidget* propertiesDock = new QDockWidget( tr( "TTL_OBJECT_INSPECTOR" ), desk );
   propertiesDock->setObjectName("propertiesDock");
   propertiesDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea );
@@ -133,6 +141,62 @@ void PVGUI_Module::setupDockWidgets()
   myDockWidgets[propertiesDock] = true;
   propertiesDock->hide();
 
+  // Display dock
+  QDockWidget* displayPropertiesDock = new QDockWidget( tr( "TTL_DISPLAY" ), desk );
+  displayPropertiesDock->setObjectName("displayPropertiesDock");
+  displayPropertiesDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea );
+  desk->addDockWidget( Qt::LeftDockWidgetArea, displayPropertiesDock );
+
+  pqPropertiesPanel* displayPropertiesPanel = new pqPropertiesPanel();
+  displayPropertiesPanel->setObjectName("displayPropertiesPanel");
+  displayPropertiesPanel->setProperty("panelMode", QVariant(2));  // probably to have only the Display part
+  displayPropertiesDock->setWidget(displayPropertiesPanel);
+  myDockWidgets[displayPropertiesDock] = false;
+  displayPropertiesDock->hide();
+
+  // View dock
+  QDockWidget* viewPropertiesDock = new QDockWidget( tr( "TTL_VIEW_PANEL" ), desk );
+  viewPropertiesDock->setObjectName("viewPropertiesDock");
+  viewPropertiesDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea );
+  desk->addDockWidget( Qt::LeftDockWidgetArea, viewPropertiesDock );
+
+  pqPropertiesPanel* viewPropertiesPanel = new pqPropertiesPanel();
+  viewPropertiesPanel->setObjectName("viewPropertiesPanel");
+  viewPropertiesPanel->setProperty("panelMode", QVariant(4)); // probably to have only the View part
+  viewPropertiesDock->setWidget(viewPropertiesPanel);
+  myDockWidgets[viewPropertiesDock] = false;
+  viewPropertiesDock->hide();
+
+  // Taken from ParaViewMainWindow.cxx:
+  int propertiesPanelMode = settings->value(
+      "GeneralSettings.PropertiesPanelMode", vtkPVGeneralSettings::ALL_IN_ONE).toInt();
+  switch (propertiesPanelMode)
+  {
+    case vtkPVGeneralSettings::SEPARATE_DISPLAY_PROPERTIES:
+      viewPropertiesDock->hide();
+      propertiesPanel->setPanelMode(
+          pqPropertiesPanel::SOURCE_PROPERTIES|pqPropertiesPanel::VIEW_PROPERTIES);
+      break;
+
+    case vtkPVGeneralSettings::SEPARATE_VIEW_PROPERTIES:
+      displayPropertiesDock->hide();
+      propertiesPanel->setPanelMode(
+          pqPropertiesPanel::SOURCE_PROPERTIES|pqPropertiesPanel::DISPLAY_PROPERTIES);
+      break;
+
+    case vtkPVGeneralSettings::ALL_SEPARATE:
+      propertiesPanel->setPanelMode(pqPropertiesPanel::SOURCE_PROPERTIES);
+      break;
+
+    case vtkPVGeneralSettings::ALL_IN_ONE:
+    default:
+      propertiesPanel->setPanelMode(
+                pqPropertiesPanel::SOURCE_PROPERTIES|pqPropertiesPanel::VIEW_PROPERTIES|pqPropertiesPanel::DISPLAY_PROPERTIES);
+      viewPropertiesDock->hide();
+      displayPropertiesDock->hide();
+      break;
+  }
+
   // Information dock
   QDockWidget* informationDock = new QDockWidget(tr( "TTL_INFORMATION" ), desk);
   informationDock->setObjectName("informationDock");
@@ -158,10 +222,10 @@ void PVGUI_Module::setupDockWidgets()
 
   myDockWidgets[informationDock] = true;
 
-
-  desk->tabifyDockWidget(informationDock, propertiesDock);
-  desk->tabifyDockWidget(propertiesDock, pipelineBrowserDock);
-  //propertiesDock->raise();
+  desk->tabifyDockWidget(propertiesDock, viewPropertiesDock);
+  desk->tabifyDockWidget(propertiesDock, displayPropertiesDock);
+  desk->tabifyDockWidget(propertiesDock, informationDock);
+  propertiesDock->raise();
 
   // Statistic View
   QDockWidget* statisticsViewDock  = new QDockWidget( tr( "TTL_STATISTICS_VIEW" ), desk );
@@ -177,7 +241,7 @@ void PVGUI_Module::setupDockWidgets()
   QDockWidget* animationViewDock     = new QDockWidget( tr( "TTL_ANIMATION_VIEW" ), desk );
   animationViewDock->setObjectName("animationViewDock");
   desk->addDockWidget( Qt::BottomDockWidgetArea, animationViewDock );
-  pqPVAnimationWidget* animation_panel = new pqPVAnimationWidget(animationViewDock); // [ABN] was resizeHelper
+  pqPVAnimationWidget* animation_panel = new ResizeHelper(animationViewDock); // [ABN] was resizeHelper
   animationViewDock->setWidget(animation_panel);
   myDockWidgets[animationViewDock] = false; // hidden by default