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

Improved progress bar a bit, for geomech cases

Browse Source
This commit is contained in:
Jacob Støren
2015-05-29 12:14:40 +02:00
parent a338c6abda
commit ca6d9d364d
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -732,6 +732,8 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName)
geoMechModelCollection->cases.push_back(geoMechCase); geoMechModelCollection->cases.push_back(geoMechCase);
RimGeoMechView* riv = geoMechCase->createAndAddReservoirView(); RimGeoMechView* riv = geoMechCase->createAndAddReservoirView();
caf::ProgressInfo progress(11, "Loading Case");
progress.setNextProgressIncrement(10);
riv->loadDataAndUpdate(); riv->loadDataAndUpdate();
@@ -739,7 +741,8 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName)
//{ //{
// riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); // riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
//} //}
progress.incrementProgress();
progress.setProgressDescription("Loading results information");
RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel();
uiModel->updateUiSubTree(m_project); uiModel->updateUiSubTree(m_project);

7
ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
View File

@@ -29,6 +29,8 @@
#include "RigStatisticsDataCache.h" #include "RigStatisticsDataCache.h"
#include <cmath> #include <cmath>
#include "cvfBoundingBox.h" #include "cvfBoundingBox.h"
#include "cafProgressInfo.h"
#include "..\src\corelib\tools\qstring.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -77,8 +79,13 @@ bool RigGeoMechCaseData::openAndReadFemParts()
{ {
m_femParts = new RigFemPartCollection(); m_femParts = new RigFemPartCollection();
caf::ProgressInfo progress(10, ""); // Here because the next call uses progress
progress.setNextProgressIncrement(9);
if (m_readerInterface->readFemParts(m_femParts.p())) if (m_readerInterface->readFemParts(m_femParts.p()))
{ {
progress.incrementProgress();
progress.setProgressDescription("Calculating element neighbors");
// Initialize results containers // Initialize results containers
m_femPartResults.resize(m_femParts->partCount()); m_femPartResults.resize(m_femParts->partCount());
std::vector<std::string> stepNames = m_readerInterface->stepNames(); std::vector<std::string> stepNames = m_readerInterface->stepNames();

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -116,7 +116,7 @@ void RimGeoMechView::updateViewerWidgetWindowTitle()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGeoMechView::loadDataAndUpdate() void RimGeoMechView::loadDataAndUpdate()
{ {
caf::ProgressInfo progress(7, "Loading Case"); caf::ProgressInfo progress(7, "");
progress.setNextProgressIncrement(5); progress.setNextProgressIncrement(5);
updateScaleTransform(); updateScaleTransform();