X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPVGUI%2FPVGUI_Module_widgets.cxx;h=7ddee81bfcf2221be03b8e2d633d47c44ab9734d;hb=fe837bd5f2aae9a93c8986af24a84520551b2995;hp=8a5c767335ce4216f9d46d1c44f998632c6c999f;hpb=a6321e4ee15cbc55b51c5f79d2c2a84637ad6723;p=modules%2Fparavis.git diff --git a/src/PVGUI/PVGUI_Module_widgets.cxx b/src/PVGUI/PVGUI_Module_widgets.cxx index 8a5c7673..7ddee81b 100644 --- a/src/PVGUI/PVGUI_Module_widgets.cxx +++ b/src/PVGUI/PVGUI_Module_widgets.cxx @@ -28,7 +28,7 @@ #include #include -#include +#include // // should ultimately be a LightApp only #include #include @@ -67,31 +67,35 @@ #include #include -//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" ); -// if ( w ) { -// QShowEvent e; -// QApplication::sendEvent( w, &e ); -// } -// pqPVAnimationWidget::resizeEvent( e ); -// } -//}; +#include + +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" ); + 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. @@ -105,6 +109,7 @@ void PVGUI_Module::setupDockWidgets() desk->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); desk->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); + desk->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); // Pipeline QDockWidget* pipelineBrowserDock = new QDockWidget( tr( "TTL_PIPELINE_BROWSER" ), desk ); @@ -114,8 +119,13 @@ void PVGUI_Module::setupDockWidgets() pqPipelineBrowserWidget* browser = guiElements->getPipelineBrowserWidget(); pipelineBrowserDock->setWidget(browser); 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 ); @@ -128,8 +138,64 @@ void PVGUI_Module::setupDockWidgets() QAction* tempDeleteAction = new QAction(this); pqDeleteReaction* handler = new pqDeleteReaction(tempDeleteAction); handler->connect(propertiesPanel, SIGNAL(deleteRequested(pqPipelineSource*)), SLOT(deleteSource(pqPipelineSource*))); - 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); @@ -137,7 +203,7 @@ void PVGUI_Module::setupDockWidgets() QWidget* informationWidgetFrame = new QWidget(informationDock); informationWidgetFrame->setObjectName("informationWidgetFrame"); - + QVBoxLayout* verticalLayout_2 = new QVBoxLayout(informationWidgetFrame); verticalLayout_2->setSpacing(0); verticalLayout_2->setContentsMargins(0, 0, 0, 0); @@ -156,10 +222,10 @@ void PVGUI_Module::setupDockWidgets() myDockWidgets[informationDock] = true; - desk->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); - 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 ); @@ -175,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 @@ -263,8 +329,8 @@ void PVGUI_Module::setupDockWidgets() aProgress->setEnabled(true); // Set up the dock window corners to give the vertical docks more room. - desk->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - desk->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); +// desk->setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); +// desk->setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); // Setup the default dock configuration ... statisticsViewDock->hide(); @@ -384,12 +450,15 @@ void PVGUI_Module::storeCommonWindowsState() { // restoreCommonWindowsState() method, and at the moment of the ParaVis activation we call // this method. + //LightApp_Application* anApp = getApp(); SalomeApp_Application* anApp = getApp(); if(!anApp) return; - int begin = SalomeApp_Application::WT_ObjectBrowser; - int end = SalomeApp_Application::WT_NoteBook; +// int begin = SalomeApp_Application::WT_ObjectBrowser; +// int end = SalomeApp_Application::WT_NoteBook; + int begin = LightApp_Application::WT_ObjectBrowser; + int end = LightApp_Application::WT_User; for( int i = begin; i <= end; i++ ) { QWidget* wg = anApp->getWindow(i); if(wg) { @@ -415,6 +484,7 @@ void PVGUI_Module::storeCommonWindowsState() { */ void PVGUI_Module::restoreCommonWindowsState() { SalomeApp_Application* anApp = getApp(); +// LightApp_Application* anApp = getApp(); if(!anApp) return; DockWindowMap::const_iterator it = myCommonMap.begin();