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

Slight progress-bar improvement

Browse Source
This commit is contained in:
Jacob Støren 2015-09-28 08:21:51 +02:00
parent 5677665dba
commit 30f3796bab
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/Application/RiaApplication.cpp
View File

@ -369,34 +369,34 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
// Add all "native" cases in the project // Add all "native" cases in the project
std::vector<RimCase*> casesToLoad; std::vector<RimCase*> casesToLoad;
m_project->allCases(casesToLoad); m_project->allCases(casesToLoad);
caf::ProgressInfo caseProgress(casesToLoad.size() , "Reading Cases");
for (size_t cIdx = 0; cIdx < casesToLoad.size(); ++cIdx)
{ {
RimCase* cas = casesToLoad[cIdx]; caf::ProgressInfo caseProgress(casesToLoad.size(), "Reading Cases");
CVF_ASSERT(cas);
caseProgress.setProgressDescription(cas->caseUserDescription()); for (size_t cIdx = 0; cIdx < casesToLoad.size(); ++cIdx)
std::vector<RimView*> views = cas->views();
caf::ProgressInfo viewProgress(views.size() , "Creating Views");
size_t j;
for (j = 0; j < views.size(); j++)
{ {
RimView* riv = views[j]; RimCase* cas = casesToLoad[cIdx];
CVF_ASSERT(riv); CVF_ASSERT(cas);
viewProgress.setProgressDescription(riv->name()); caseProgress.setProgressDescription(cas->caseUserDescription());
std::vector<RimView*> views = cas->views();
caf::ProgressInfo viewProgress(views.size(), "Creating Views");
riv->loadDataAndUpdate(); size_t j;
this->setActiveReservoirView(riv); for (j = 0; j < views.size(); j++)
viewProgress.incrementProgress(); {
RimView* riv = views[j];
CVF_ASSERT(riv);
viewProgress.setProgressDescription(riv->name());
riv->loadDataAndUpdate();
this->setActiveReservoirView(riv);
viewProgress.incrementProgress();
}
caseProgress.incrementProgress();
} }
caseProgress.incrementProgress();
} }
{ {
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection()) if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
{ {