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

#4828 Summary Plot Templates : Robustification

Browse Source
This commit is contained in:
Magne Sjaastad 2019-10-08 07:27:45 +02:00
parent 5a410ca8be
commit cc746a20cb
3 changed files with 113 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/PlotTemplateCommands/RicSavePlotTemplateFeature.cpp
View File

@ -170,7 +170,7 @@ QString RicSavePlotTemplateFeature::createTextFromObject( RimSummaryPlot* summar
{
std::set<QString> ensembleReferenceStrings;
const QString summaryGroupFieldKeyword = RicSummaryPlotTemplateTools::summaryGroupFieldName();
const QString summaryGroupFieldKeyword = RicSummaryPlotTemplateTools::summaryGroupFieldKeyword();
for ( const auto& curveSet : newSummaryPlot->ensembleCurveSetCollection()->curveSets() )
{

97
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@ -84,20 +84,24 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection(
const std::vector<RimSummaryCase*>& selectedSummaryCases,
const std::vector<RimSummaryCaseCollection*>& selectedEnsembles )
{
if ( summaryPlot )
{
RimSummaryPlotCollection* plotColl =
RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
if ( !summaryPlot ) return;
if ( selectedSummaryCases.empty() && selectedEnsembles.empty() ) return;
RimSummaryPlotCollection* plotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
plotColl->summaryPlots.push_back( summaryPlot );
summaryPlot->resolveReferencesRecursively();
summaryPlot->initAfterReadRecursively();
{
// Replace single summary curves data sources
auto summaryCurves = summaryPlot->summaryCurves();
const QString summaryFieldKeyword = RicSummaryPlotTemplateTools::summaryCaseFieldKeyword();
int maximumIndexValue = -1;
for ( const auto& curve : summaryCurves )
{
auto fieldHandle = curve->findField( summaryFieldKeyword );
@ -111,14 +115,15 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection(
referenceString,
&conversionOk );
maximumIndexValue = std::max( maximumIndexValue, indexValue );
if ( conversionOk && indexValue >= 0 && indexValue < static_cast<int>( selectedSummaryCases.size() ) )
{
auto summaryCaseY = selectedSummaryCases[static_cast<int>( indexValue )];
curve->setSummaryCaseY( summaryCaseY );
auto currentAddressY = curve->summaryAddressY();
if ( summaryCaseY->summaryReader() &&
!summaryCaseY->summaryReader()->hasAddress( currentAddressY ) )
if ( summaryCaseY->summaryReader() && !summaryCaseY->summaryReader()->hasAddress( currentAddressY ) )
{
auto allAddresses = summaryCaseY->summaryReader()->allResultAddresses();
@ -132,44 +137,88 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection(
}
}
}
if ( selectedSummaryCases.size() > static_cast<size_t>( maximumIndexValue ) )
{
// Use the curve style of the last curve in template, and duplicate this for remaining data sources
if ( !summaryCurves.empty() )
{
auto lastSummaryCurve = summaryCurves.back();
for ( size_t i = maximumIndexValue; i < selectedSummaryCases.size(); i++ )
{
auto newCurve = dynamic_cast<RimSummaryCurve*>(
lastSummaryCurve->xmlCapability()->copyByXmlSerialization(
caf::PdmDefaultObjectFactory::instance() ) );
auto summaryCaseY = selectedSummaryCases[i];
newCurve->setSummaryCaseY( summaryCaseY );
summaryPlot->addCurveAndUpdate( newCurve );
}
}
}
}
{
auto summaryCurves = summaryPlot->ensembleCurveSetCollection()->curveSets();
// Replace ensemble data sources
const QString summaryGroupFieldKeyword = RicSummaryPlotTemplateTools::summaryGroupFieldName();
auto summaryCurveSets = summaryPlot->ensembleCurveSetCollection()->curveSets();
for ( const auto& curveSet : summaryCurves )
const QString summaryGroupFieldKeyword = RicSummaryPlotTemplateTools::summaryGroupFieldKeyword();
int maximumIndexValue = -1;
for ( const auto& curveSet : summaryCurveSets )
{
auto fieldHandle = curveSet->findField( summaryGroupFieldKeyword );
if ( fieldHandle )
{
auto referenceString = fieldHandle->xmlCapability()->referenceString();
auto stringList = referenceString.split( " " );
if ( stringList.size() == 2 )
{
QString indexAsString = stringList[1];
bool conversionOk = false;
auto index = indexAsString.toUInt( &conversionOk );
const QString placeholderString = RicSummaryPlotTemplateTools::placeholderTextForSummaryGroup();
if ( conversionOk && index < selectedEnsembles.size() )
auto referenceString = fieldHandle->xmlCapability()->referenceString();
int indexValue = RicSummaryPlotTemplateTools::findValueForKeyword( placeholderString,
referenceString,
&conversionOk );
maximumIndexValue = std::max( maximumIndexValue, indexValue );
if ( conversionOk && indexValue < selectedEnsembles.size() )
{
auto summaryCaseY = selectedEnsembles[index];
auto summaryCaseY = selectedEnsembles[indexValue];
curveSet->setSummaryCaseCollection( summaryCaseY );
}
}
}
}
}
// TODO: Create additional curves in selected case count is larger than template count
if ( selectedEnsembles.size() > static_cast<size_t>( maximumIndexValue ) )
{
// Use the curve style of the last curve in template, and duplicate this for remaining data sources
if ( !summaryCurveSets.empty() )
{
auto lastSummaryCurveSet = summaryCurveSets.back();
for ( size_t i = maximumIndexValue; i < selectedEnsembles.size(); i++ )
{
auto newCurveSet = dynamic_cast<RimEnsembleCurveSet*>(
lastSummaryCurveSet->xmlCapability()->copyByXmlSerialization(
caf::PdmDefaultObjectFactory::instance() ) );
auto ensembleDataSource = selectedEnsembles[i];
newCurveSet->setSummaryCaseCollection( ensembleDataSource );
summaryPlot->ensembleCurveSetCollection()->addCurveSet( newCurveSet );
}
}
}
}
plotColl->updateConnectedEditors();
summaryPlot->loadDataAndUpdate();
}
}
//--------------------------------------------------------------------------------------------------
///
@ -325,7 +374,7 @@ QString RicSummaryPlotTemplateTools::summaryCaseFieldKeyword()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicSummaryPlotTemplateTools::summaryGroupFieldName()
QString RicSummaryPlotTemplateTools::summaryGroupFieldKeyword()
{
return "SummaryGroup";
}
@ -343,7 +392,7 @@ QString RicSummaryPlotTemplateTools::placeholderTextForSummaryCase()
//--------------------------------------------------------------------------------------------------
QString RicSummaryPlotTemplateTools::placeholderTextForSummaryGroup()
{
return "ENSEMBLE";
return "ENSEMBLE_NAME";
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.h
View File

@ -56,7 +56,7 @@ public:
static std::vector<RimSummaryCaseCollection*> selectedSummaryCaseCollections();
static QString summaryCaseFieldKeyword();
static QString summaryGroupFieldName();
static QString summaryGroupFieldKeyword();
static QString placeholderTextForSummaryCase();
static QString placeholderTextForSummaryGroup();