OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#802 Better default dock and toolbar layout.

Browse Source 
Window managment toolbar moved.
Created a Draw Style toolbar
This commit is contained in:
Jacob Støren 2016-08-03 13:29:46 +02:00
parent 12e9768939
commit 3bcb7b9f1b
5 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@ -225,7 +225,7 @@ void RiuMainPlotWindow::createDockPanels()
RiuTreeViewEventFilter* treeViewEventFilter = new RiuTreeViewEventFilter(this); RiuTreeViewEventFilter* treeViewEventFilter = new RiuTreeViewEventFilter(this);
m_projectTreeView->treeView()->installEventFilter(treeViewEventFilter); m_projectTreeView->treeView()->installEventFilter(treeViewEventFilter);
addDockWidget(Qt::RightDockWidgetArea, dockWidget); addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
connect(m_projectTreeView, SIGNAL(selectionChanged()), this, SLOT(selectedObjectsChanged())); connect(m_projectTreeView, SIGNAL(selectionChanged()), this, SLOT(selectedObjectsChanged()));
m_projectTreeView->treeView()->setContextMenuPolicy(Qt::CustomContextMenu); m_projectTreeView->treeView()->setContextMenuPolicy(Qt::CustomContextMenu);

45
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -493,7 +493,15 @@ void RiuMainWindow::createToolBars()
m_snapshotToolbar->addAction(m_snapshotToFile); m_snapshotToolbar->addAction(m_snapshotToFile);
m_snapshotToolbar->addAction(m_snapshotAllViewsToFile); m_snapshotToolbar->addAction(m_snapshotAllViewsToFile);
// View toolbar {
QToolBar* toolbar = addToolBar(tr("Window Management"));
toolbar->setObjectName(toolbar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicLinkVisibleViewsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicTileWindowsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicShowPlotWindowFeature"));
}
// View toolbar
m_viewToolBar = addToolBar(tr("View")); m_viewToolBar = addToolBar(tr("View"));
m_viewToolBar->setObjectName(m_viewToolBar->windowTitle()); m_viewToolBar->setObjectName(m_viewToolBar->windowTitle());
m_viewToolBar->addAction(m_zoomAll); m_viewToolBar->addAction(m_zoomAll);
@ -503,15 +511,6 @@ void RiuMainWindow::createToolBars()
m_viewToolBar->addAction(m_viewFromWest); m_viewToolBar->addAction(m_viewFromWest);
m_viewToolBar->addAction(m_viewFromAbove); m_viewToolBar->addAction(m_viewFromAbove);
m_viewToolBar->addAction(m_viewFromBelow); m_viewToolBar->addAction(m_viewFromBelow);
m_viewToolBar->addSeparator();
m_viewToolBar->addAction(m_drawStyleLinesAction);
m_viewToolBar->addAction(m_drawStyleLinesSolidAction);
m_viewToolBar->addAction(m_drawStyleSurfOnlyAction);
m_viewToolBar->addAction(m_drawStyleFaultLinesSolidAction);
m_viewToolBar->addAction(m_disableLightingAction);
m_viewToolBar->addAction(m_drawStyleHideGridCellsAction);
m_viewToolBar->addAction(m_toggleFaultsLabelAction);
m_viewToolBar->addAction(m_addWellCellsToRangeFilterAction);
QLabel* scaleLabel = new QLabel(m_viewToolBar); QLabel* scaleLabel = new QLabel(m_viewToolBar);
scaleLabel->setText("Scale"); scaleLabel->setText("Scale");
@ -521,21 +520,24 @@ void RiuMainWindow::createToolBars()
m_scaleFactor->setValue(0); m_scaleFactor->setValue(0);
m_viewToolBar->addWidget(m_scaleFactor); m_viewToolBar->addWidget(m_scaleFactor);
connect(m_scaleFactor, SIGNAL(valueChanged(int)), SLOT(slotScaleChanged(int))); connect(m_scaleFactor, SIGNAL(valueChanged(int)), SLOT(slotScaleChanged(int)));
{
QToolBar* dsToolBar = addToolBar(tr("Draw Style"));
dsToolBar->addAction(m_drawStyleLinesAction);
dsToolBar->addAction(m_drawStyleLinesSolidAction);
dsToolBar->addAction(m_drawStyleSurfOnlyAction);
dsToolBar->addAction(m_drawStyleFaultLinesSolidAction);
dsToolBar->addAction(m_disableLightingAction);
dsToolBar->addAction(m_drawStyleHideGridCellsAction);
dsToolBar->addAction(m_toggleFaultsLabelAction);
dsToolBar->addAction(m_addWellCellsToRangeFilterAction);
}
// Create animation toolbar // Create animation toolbar
m_animationToolBar = new caf::AnimationToolBar("Animation", this); m_animationToolBar = new caf::AnimationToolBar("Animation", this);
addToolBar(m_animationToolBar); addToolBar(m_animationToolBar);
//connect(m_animationToolBar, SIGNAL(signalFrameRateChanged(double)), SLOT(slotFramerateChanged(double))); //connect(m_animationToolBar, SIGNAL(signalFrameRateChanged(double)), SLOT(slotFramerateChanged(double)));
{
// Snapshots
QToolBar* toolbar = addToolBar(tr("Window Management"));
toolbar->setObjectName(toolbar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicLinkVisibleViewsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicTileWindowsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicShowPlotWindowFeature"));
}
refreshAnimationActions(); refreshAnimationActions();
refreshDrawStyleActions(); refreshDrawStyleActions();
} }
@ -573,7 +575,7 @@ void RiuMainWindow::createDockPanels()
RiuTreeViewEventFilter* treeViewEventFilter = new RiuTreeViewEventFilter(this); RiuTreeViewEventFilter* treeViewEventFilter = new RiuTreeViewEventFilter(this);
m_projectTreeView->treeView()->installEventFilter(treeViewEventFilter); m_projectTreeView->treeView()->installEventFilter(treeViewEventFilter);
addDockWidget(Qt::RightDockWidgetArea, dockWidget); addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
connect(m_projectTreeView, SIGNAL(selectionChanged()), this, SLOT(selectedObjectsChanged())); connect(m_projectTreeView, SIGNAL(selectionChanged()), this, SLOT(selectedObjectsChanged()));
m_projectTreeView->treeView()->setContextMenuPolicy(Qt::CustomContextMenu); m_projectTreeView->treeView()->setContextMenuPolicy(Qt::CustomContextMenu);
@ -631,6 +633,7 @@ void RiuMainWindow::createDockPanels()
dockPanel->setWidget(m_processMonitor); dockPanel->setWidget(m_processMonitor);
addDockWidget(Qt::BottomDockWidgetArea, dockPanel); addDockWidget(Qt::BottomDockWidgetArea, dockPanel);
dockPanel->hide();
} }
{ {
@ -640,7 +643,7 @@ void RiuMainWindow::createDockPanels()
m_resultQwtPlot = new RiuResultQwtPlot(dockPanel); m_resultQwtPlot = new RiuResultQwtPlot(dockPanel);
dockPanel->setWidget(m_resultQwtPlot); dockPanel->setWidget(m_resultQwtPlot);
addDockWidget(Qt::RightDockWidgetArea, dockPanel); addDockWidget(Qt::BottomDockWidgetArea, dockPanel);
} }
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);

2
ApplicationCode/UserInterface/RiuResultQwtPlot.cpp
View File

@ -113,7 +113,7 @@ void RiuResultQwtPlot::deleteAllCurves()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QSize RiuResultQwtPlot::sizeHint() const QSize RiuResultQwtPlot::sizeHint() const
{ {
return QSize(0, 0); return QSize(100, 100);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp
View File

@ -158,5 +158,13 @@ PdmObjectHandle* PdmUiPropertyView::currentObject()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QSize PdmUiPropertyView::sizeHint() const
{
return QSize(200, 200);
}
} //End of namespace caf } //End of namespace caf

5
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
View File

@ -60,7 +60,10 @@ public:
void setUiConfigurationName(QString uiConfigName); void setUiConfigurationName(QString uiConfigName);
PdmObjectHandle* currentObject(); PdmObjectHandle* currentObject();
public slots:
virtual QSize sizeHint() const override;
public slots:
void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
private: private: