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

System : Skip progress bar if no plots are present

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-17 09:43:42 +01:00
parent e846e50da4
commit 3209ad3a7c
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
ApplicationCode/Application/RiaApplication.cpp
View File

@ -687,56 +687,59 @@ void RiaApplication::loadAndUpdatePlotData()
plotCount += rftColl ? rftColl->rftPlots().size() : 0; plotCount += rftColl ? rftColl->rftPlots().size() : 0;
plotCount += pltColl ? pltColl->pltPlots().size() : 0; plotCount += pltColl ? pltColl->pltPlots().size() : 0;
caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data"); if (plotCount > 0)
if (wlpColl)
{ {
for (size_t wlpIdx = 0; wlpIdx < wlpColl->wellLogPlots().size(); ++wlpIdx) caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
if (wlpColl)
{ {
wlpColl->wellLogPlots[wlpIdx]->loadDataAndUpdate(); for (size_t wlpIdx = 0; wlpIdx < wlpColl->wellLogPlots().size(); ++wlpIdx)
{
wlpColl->wellLogPlots[wlpIdx]->loadDataAndUpdate();
plotProgress.incrementProgress();
}
}
if (spColl)
{
for (size_t wlpIdx = 0; wlpIdx < spColl->summaryPlots().size(); ++wlpIdx)
{
spColl->summaryPlots[wlpIdx]->loadDataAndUpdate();
plotProgress.incrementProgress();
}
}
if (scpColl)
{
for (auto plot : scpColl->summaryPlots())
{
plot->loadDataAndUpdate();
plotProgress.incrementProgress();
}
}
if (flowColl)
{
plotProgress.setNextProgressIncrement(flowColl->plotCount());
flowColl->loadDataAndUpdate();
plotProgress.incrementProgress(); plotProgress.incrementProgress();
} }
}
if (spColl) if (rftColl)
{
for (size_t wlpIdx = 0; wlpIdx < spColl->summaryPlots().size(); ++wlpIdx)
{ {
spColl->summaryPlots[wlpIdx]->loadDataAndUpdate(); for (const auto& rftPlot : rftColl->rftPlots())
plotProgress.incrementProgress(); {
rftPlot->loadDataAndUpdate();
plotProgress.incrementProgress();
}
} }
}
if (scpColl) if (pltColl)
{
for (auto plot : scpColl->summaryPlots())
{ {
plot->loadDataAndUpdate(); for (const auto& pltPlot : pltColl->pltPlots())
plotProgress.incrementProgress(); {
} pltPlot->loadDataAndUpdate();
} plotProgress.incrementProgress();
}
if (flowColl)
{
plotProgress.setNextProgressIncrement(flowColl->plotCount());
flowColl->loadDataAndUpdate();
plotProgress.incrementProgress();
}
if (rftColl)
{
for (const auto& rftPlot : rftColl->rftPlots())
{
rftPlot->loadDataAndUpdate();
plotProgress.incrementProgress();
}
}
if (pltColl)
{
for (const auto& pltPlot : pltColl->pltPlots())
{
pltPlot->loadDataAndUpdate();
plotProgress.incrementProgress();
} }
} }
} }