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

#3552 and #453 Tile windows by master/managed view + position if they have different positions

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-10-24 11:30:34 +02:00
parent f80472ffa6
commit b316e1ee83
5 changed files with 109 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -548,6 +548,21 @@ void RimViewLinker::addDependentView(RimGridView* view)
viewContr->setManagedView(view);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLinker::isFirstViewDependentOnSecondView(const RimGridView* firstView, const RimGridView* secondView) const
{
for (const RimViewController* controller : m_viewControllers())
{
if (controller->masterView() == secondView && controller->managedView() == firstView)
{
return true;
}
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimViewLinker.h
View File

@ -56,8 +56,8 @@ public:
void setMasterView(RimGridView* view);
RimGridView* masterView() const;
void addDependentView(RimGridView* view);
bool isFirstViewDependentOnSecondView(const RimGridView* firstView, const RimGridView* secondView) const;
void updateDependentViews();
void removeViewController(RimViewController* viewController);

73
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -42,6 +42,9 @@
#include "RimIntersection.h"
#include "RimProject.h"
#include "RimSimWellInViewCollection.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RimViewWindow.h"
#include "RiuDockWidgetTools.h"
#include "RiuDragDrop.h"
@ -990,6 +993,26 @@ QMdiSubWindow* RiuMainWindow::findMdiSubWindow(QWidget* viewer)
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewWindow* RiuMainWindow::findViewWindowFromSubWindow(QMdiSubWindow* subWindow)
{
std::vector<RimViewWindow*> allViewWindows;
RiaApplication::instance()->project()->descendantsIncludingThisOfType(allViewWindows);
for (RimViewWindow* viewWindow : allViewWindows)
{
if (viewWindow->viewWidget() == subWindow->widget())
{
return viewWindow;
}
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -1958,17 +1981,61 @@ RimMdiWindowGeometry RiuMainWindow::windowGeometryForViewer(QWidget* viewer)
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::tileWindows()
{
QMdiArea::WindowOrder currentActivationOrder = m_mdiArea->activationOrder();
// Tile Windows so the one with the leftmost left edge gets sorted first.
std::list<QMdiSubWindow*> windowList;
for (QMdiSubWindow* subWindow : m_mdiArea->subWindowList(currentActivationOrder))
{
windowList.push_back(subWindow);
}
// Get the active view linker if there is one
RimProject * proj = RiaApplication::instance()->project();
RimViewLinkerCollection* viewLinkerCollection = proj->viewLinkerCollection();
RimViewLinker* viewLinker = nullptr;
if (viewLinkerCollection && viewLinkerCollection->isActive())
{
viewLinker = viewLinkerCollection->viewLinker();
}
// Perform stable sort of list so we first sort by window position but retain activation order
// for windows with the same position. Needs to be sorted in decreasing order for the workaround below.
windowList.sort([this, viewLinker](QMdiSubWindow* lhs, QMdiSubWindow* rhs)
{
RimViewWindow* lhsViewWindow = findViewWindowFromSubWindow(lhs);
RimViewWindow* rhsViewWindow = findViewWindowFromSubWindow(rhs);
RimGridView* lhsGridView = dynamic_cast<RimGridView*>(lhsViewWindow);
RimGridView* rhsGridView = dynamic_cast<RimGridView*>(rhsViewWindow);
if (viewLinker)
{
if (viewLinker->isFirstViewDependentOnSecondView(lhsGridView, rhsGridView))
{
return true;
}
else if (viewLinker->isFirstViewDependentOnSecondView(rhsGridView, lhsGridView))
{
return false;
}
}
return lhs->frameGeometry().topLeft().rx() > rhs->frameGeometry().topLeft().rx();
});
// Based on workaround described here
// https://forum.qt.io/topic/50053/qmdiarea-tilesubwindows-always-places-widgets-in-activationhistoryorder-in-subwindowview-mode
// Force activation order so they end up in the order of the loop.
m_mdiArea->setActivationOrder(QMdiArea::ActivationHistoryOrder);
QMdiSubWindow *a = m_mdiArea->activeSubWindow();
QList<QMdiSubWindow *> list = m_mdiArea->subWindowList(m_mdiArea->activationOrder());
for (int i = 0; i < list.count(); i++)
for (QMdiSubWindow* subWindow : windowList)
{
m_mdiArea->setActiveSubWindow(list[i]);
m_mdiArea->setActiveSubWindow(subWindow);
}
m_mdiArea->tileSubWindows();
// Set back the original activation order to avoid messing with the standard ordering
m_mdiArea->setActivationOrder(currentActivationOrder);
m_mdiArea->setActiveSubWindow(a);
}

2
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -41,6 +41,7 @@ class QTimer;
class QUndoView;
class RimCase;
class RimViewWindow;
class RiuMessagePanel;
class RiuProcessMonitor;
@ -115,6 +116,7 @@ public:
void tileWindows();
bool isAnyMdiSubWindowVisible();
QMdiSubWindow* findMdiSubWindow(QWidget* viewer);
RimViewWindow* findViewWindowFromSubWindow(QMdiSubWindow* lhs);
QList<QMdiSubWindow*> subWindowList(QMdiArea::WindowOrder order);
RiuResultQwtPlot* resultPlot();

25
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -822,18 +822,35 @@ RimMdiWindowGeometry RiuPlotMainWindow::windowGeometryForViewer(QWidget* viewer)
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindow::tileWindows()
{
QMdiArea::WindowOrder currentActivationOrder = m_mdiArea->activationOrder();
std::list<QMdiSubWindow*> windowList;
for (QMdiSubWindow* subWindow : m_mdiArea->subWindowList(currentActivationOrder))
{
windowList.push_back(subWindow);
}
// Perform stable sort of list so we first sort by window position but retain activation order
// for windows with the same position. Needs to be sorted in decreasing order for workaround below.
windowList.sort([](const QMdiSubWindow* lhs, const QMdiSubWindow* rhs)
{
return lhs->frameGeometry().topLeft().rx() > rhs->frameGeometry().topLeft().rx();
});
// Based on workaround described here
// https://forum.qt.io/topic/50053/qmdiarea-tilesubwindows-always-places-widgets-in-activationhistoryorder-in-subwindowview-mode
QMdiSubWindow* a = m_mdiArea->activeSubWindow();
QList<QMdiSubWindow*> list = m_mdiArea->subWindowList(m_mdiArea->activationOrder());
for (int i = 0; i < list.count(); i++)
// Force activation order so they end up in the order of the loop.
m_mdiArea->setActivationOrder(QMdiArea::ActivationHistoryOrder);
for (QMdiSubWindow* subWindow : windowList)
{
m_mdiArea->setActiveSubWindow(list[i]);
m_mdiArea->setActiveSubWindow(subWindow);
}
m_mdiArea->tileSubWindows();
// Set back the original activation order to avoid messing with the standard ordering
m_mdiArea->setActivationOrder(currentActivationOrder);
m_mdiArea->setActiveSubWindow(a);
}