#1213 Well allocation plot is now only created when requested.

Also made the fields in FlowPlotCollection private.
This commit is contained in:
Jacob Støren
2017-02-13 14:49:52 +01:00
parent df35335744
commit a25bfd4513
5 changed files with 79 additions and 24 deletions

View File

@@ -575,7 +575,7 @@ void RiaApplication::loadAndUpdatePlotData()
size_t plotCount = 0;
plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0;
plotCount += spColl ? spColl->summaryPlots().size() : 0;
plotCount += flowColl ? flowColl->flowPlots().size() : 0;
plotCount += flowColl ? flowColl->plotCount() : 0;
caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
if (wlpColl)
@@ -595,17 +595,15 @@ void RiaApplication::loadAndUpdatePlotData()
plotProgress.incrementProgress();
}
}
plotProgress.setNextProgressIncrement(flowColl->plotCount());
if (flowColl)
{
flowColl->defaultPlot->loadDataAndUpdate();
for (RimWellAllocationPlot* p : flowColl->flowPlots())
{
p->loadDataAndUpdate();
plotProgress.incrementProgress();
}
flowColl->loadDataAndUpdate();
}
plotProgress.incrementProgress();
}
//--------------------------------------------------------------------------------------------------