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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-05 08:41:25 +01:00
parent 619abd2f1f
commit 987c38ec38
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -21,11 +21,14 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaBaseDefs.h" #include "RiaBaseDefs.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaSummaryTools.h"
#include "RimEnsembleCurveSetCollection.h" #include "RimEnsembleCurveSetCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurveCollection.h" #include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimViewWindow.h" #include "RimViewWindow.h"
#include "RimWellAllocationPlot.h" #include "RimWellAllocationPlot.h"
#include "RimWellLogCurveCommonDataSource.h" #include "RimWellLogCurveCommonDataSource.h"
@ -40,6 +43,7 @@
#include "RiuWellLogPlot.h" #include "RiuWellLogPlot.h"
#include "cafCmdFeatureManager.h" #include "cafCmdFeatureManager.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiPropertyView.h" #include "cafPdmUiPropertyView.h"
#include "cafPdmUiToolBarEditor.h" #include "cafPdmUiToolBarEditor.h"
#include "cafPdmUiTreeView.h" #include "cafPdmUiTreeView.h"
@ -54,11 +58,13 @@
#include <QToolBar> #include <QToolBar>
#include <QTreeView> #include <QTreeView>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuPlotMainWindow::RiuPlotMainWindow() : m_activePlotViewWindow(nullptr), m_windowMenu(nullptr), m_blockSlotSubWindowActivated(false) RiuPlotMainWindow::RiuPlotMainWindow()
: m_activePlotViewWindow(nullptr)
, m_windowMenu(nullptr)
, m_blockSlotSubWindowActivated(false)
{ {
m_mdiArea = new QMdiArea; m_mdiArea = new QMdiArea;
m_mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation, true); m_mdiArea->setOption(QMdiArea::DontMaximizeSubWindowOnActivation, true);
@ -157,8 +163,7 @@ void RiuPlotMainWindow::closeEvent(QCloseEvent* event)
app->saveWinGeoAndDockToolBarLayout(); app->saveWinGeoAndDockToolBarLayout();
if (!app->tryCloseMainWindow()) if (!app->tryCloseMainWindow()) return;
return;
app->closeProject(); app->closeProject();
} }
@ -373,7 +378,8 @@ void RiuPlotMainWindow::createDockPanels()
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);
connect(m_projectTreeView->treeView(), SIGNAL(customContextMenuRequested(const QPoint&)), connect(m_projectTreeView->treeView(),
SIGNAL(customContextMenuRequested(const QPoint&)),
SLOT(customMenuRequested(const QPoint&))); SLOT(customMenuRequested(const QPoint&)));
m_projectTreeView->setUiConfigurationName("PlotWindow"); m_projectTreeView->setUiConfigurationName("PlotWindow");
@ -582,8 +588,7 @@ void RiuPlotMainWindow::addViewer(QWidget* viewer, const RimMdiWindowGeometry& w
if (wellLogPlot) if (wellLogPlot)
{ {
QSize preferredSize = wellLogPlot->preferredSize(); QSize preferredSize = wellLogPlot->preferredSize();
subWindowSize = subWindowSize = QSize(preferredSize.width(), m_mdiArea->height());
QSize(preferredSize.width(), m_mdiArea->height());
} }
else else
{ {
@ -636,12 +641,10 @@ void RiuPlotMainWindow::setPdmRoot(caf::PdmObject* pdmRoot)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuPlotMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow) void RiuPlotMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
{ {
if (!subWindow) if (!subWindow) return;
return;
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
if (!proj) if (!proj) return;
return;
// Select in Project Tree // Select in Project Tree
@ -669,8 +672,7 @@ void RiuPlotMainWindow::setActiveViewer(QWidget* viewer)
m_blockSlotSubWindowActivated = true; m_blockSlotSubWindowActivated = true;
QMdiSubWindow* swin = findMdiSubWindow(viewer); QMdiSubWindow* swin = findMdiSubWindow(viewer);
if (swin) if (swin) m_mdiArea->setActiveSubWindow(swin);
m_mdiArea->setActiveSubWindow(swin);
m_blockSlotSubWindowActivated = false; m_blockSlotSubWindowActivated = false;
} }
@ -745,7 +747,6 @@ void RiuPlotMainWindow::selectedObjectsChanged()
if (!firstSelectedObject) return; if (!firstSelectedObject) return;
RimViewWindow* selectedWindow = dynamic_cast<RimViewWindow*>(firstSelectedObject); RimViewWindow* selectedWindow = dynamic_cast<RimViewWindow*>(firstSelectedObject);
if (!selectedWindow) if (!selectedWindow)
{ {
@ -813,7 +814,6 @@ void RiuPlotMainWindow::restoreTreeViewState()
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -872,8 +872,7 @@ void RiuPlotMainWindow::tileWindows()
// Perform stable sort of list so we first sort by window position but retain activation order // 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. // for windows with the same position. Needs to be sorted in decreasing order for workaround below.
windowList.sort([](const QMdiSubWindow* lhs, const QMdiSubWindow* rhs) windowList.sort([](const QMdiSubWindow* lhs, const QMdiSubWindow* rhs) {
{
return lhs->frameGeometry().topLeft().rx() > rhs->frameGeometry().topLeft().rx(); return lhs->frameGeometry().topLeft().rx() > rhs->frameGeometry().topLeft().rx();
}); });