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

#3058 Implement a memory cleanup dialog for GeoMech data.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-06-18 14:17:13 +02:00
parent e3bffafb46
commit d13a52a8b4
22 changed files with 622 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -26,6 +26,10 @@
#include "RiaRegressionTest.h"
#include "RiaRegressionTestRunner.h"
#include "RigFemPartCollection.h"
#include "RigFemPartResultsCollection.h"
#include "RigGeoMechCaseData.h"
#include "Rim2dIntersectionView.h"
#include "Rim3dView.h"
#include "RimCellEdgeColors.h"
@@ -54,6 +58,7 @@
#include "RiuRelativePermeabilityPlotPanel.h"
#include "RiuResultInfoPanel.h"
#include "RiuResultQwtPlot.h"
#include "RiuTextDialog.h"
#include "RiuToolTipMenu.h"
#include "RiuTreeViewEventFilter.h"
#include "RiuViewer.h"
@@ -84,6 +89,7 @@
#include <QLayout>
#include <QMdiSubWindow>
#include <QMenuBar>
#include <QToolButton>
#include <QSpinBox>
#include <QStatusBar>
#include <QTimer>
@@ -145,13 +151,17 @@ RiuMainWindow::RiuMainWindow()
//caf::CmdExecCommandManager::instance()->enableUndoCommandSystem(true);
m_memoryCriticalWarning = new QLabel("");
m_memoryUsedStatus = new QLabel("");
m_memoryUsedButton = new QToolButton(nullptr);
m_memoryTotalStatus = new QLabel("");
m_memoryUsedButton->setDefaultAction(caf::CmdFeatureManager::instance()->action("RicShowMemoryCleanupDialogFeature"));
statusBar()->addPermanentWidget(m_memoryCriticalWarning);
statusBar()->addPermanentWidget(m_memoryUsedStatus);
statusBar()->addPermanentWidget(m_memoryUsedButton);
statusBar()->addPermanentWidget(m_memoryTotalStatus);
updateMemoryUsage();
m_memoryRefreshTimer = new QTimer(this);
@@ -456,6 +466,8 @@ void RiuMainWindow::createMenus()
QMenu* editMenu = menuBar()->addMenu("&Edit");
editMenu->addAction(cmdFeatureMgr->action("RicSnapshotViewToClipboardFeature"));
editMenu->addSeparator();
editMenu->addAction(cmdFeatureMgr->action("RicShowMemoryCleanupDialogFeature"));
editMenu->addSeparator();
editMenu->addAction(cmdFeatureMgr->action("RicEditPreferencesFeature"));
connect(editMenu, SIGNAL(aboutToShow()), SLOT(slotRefreshEditActions()));
@@ -1732,10 +1744,10 @@ void RiuMainWindow::updateMemoryUsage()
m_memoryCriticalWarning->setText(QString(""));
}
m_memoryUsedStatus->setText(QString("Physical Memory Used: %1 MiB").arg(currentUsage));
m_memoryUsedButton->setText(QString("Memory Used: %1 MiB").arg(currentUsage));
m_memoryTotalStatus->setText(QString("Total Physical Memory: %1 MiB").arg(totalPhysicalMemory));
m_memoryUsedStatus->setStyleSheet(QString("QLabel {color: %1; padding: 0px 5px 0px 0px;}").arg(usageColor.name()));
m_memoryUsedButton->setStyleSheet(QString("QLabel {color: %1; padding: 0px 5px 0px 0px;}").arg(usageColor.name()));
m_memoryTotalStatus->setStyleSheet(QString("QLabel {padding: 0px 5px 0px 0px; }"));
}

3
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -35,6 +35,7 @@
class QActionGroup;
class QMdiSubWindow;
class QToolButton;
class QSpinBox;
class QTimer;
class QUndoView;
@@ -183,7 +184,7 @@ private:
QMenu* m_windowMenu;
QLabel* m_memoryCriticalWarning;
QLabel* m_memoryUsedStatus;
QToolButton* m_memoryUsedButton;
QLabel* m_memoryTotalStatus;
QTimer* m_memoryRefreshTimer;