diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 0ab4587679..81e4491a9a 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -732,6 +732,8 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName) geoMechModelCollection->cases.push_back(geoMechCase); RimGeoMechView* riv = geoMechCase->createAndAddReservoirView(); + caf::ProgressInfo progress(11, "Loading Case"); + progress.setNextProgressIncrement(10); riv->loadDataAndUpdate(); @@ -739,13 +741,14 @@ bool RiaApplication::openOdbCaseFromFile(const QString& fileName) //{ // riv->cellResult()->setResultVariable(RimDefines::undefinedResultName()); //} - + progress.incrementProgress(); + progress.setProgressDescription("Loading results information"); RimUiTreeModelPdm* uiModel = RiuMainWindow::instance()->uiPdmModel(); uiModel->updateUiSubTree(m_project); RiuMainWindow::instance()->setCurrentObjectInTreeView(riv->cellResult()); - + return true; } diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp index 9de9185387..d8f8d51b93 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp @@ -29,6 +29,8 @@ #include "RigStatisticsDataCache.h" #include #include "cvfBoundingBox.h" +#include "cafProgressInfo.h" +#include "..\src\corelib\tools\qstring.h" //-------------------------------------------------------------------------------------------------- /// @@ -77,8 +79,13 @@ bool RigGeoMechCaseData::openAndReadFemParts() { 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())) { + progress.incrementProgress(); + progress.setProgressDescription("Calculating element neighbors"); + // Initialize results containers m_femPartResults.resize(m_femParts->partCount()); std::vector stepNames = m_readerInterface->stepNames(); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index d294d47044..17e83d9d42 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -116,7 +116,7 @@ void RimGeoMechView::updateViewerWidgetWindowTitle() //-------------------------------------------------------------------------------------------------- void RimGeoMechView::loadDataAndUpdate() { - caf::ProgressInfo progress(7, "Loading Case"); + caf::ProgressInfo progress(7, ""); progress.setNextProgressIncrement(5); updateScaleTransform();