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

#4795 Summary Plot Templates : Make sure summary address is valid

Browse Source 
If the summary address specified in the template does not exist, uses the first valid address of the specified quantity.
This commit is contained in:
Magne Sjaastad 2019-09-27 16:18:12 +02:00
parent cf482edd3e
commit d2df004cf3
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.cpp
View File

@ -25,6 +25,8 @@
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "RifSummaryReaderInterface.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h"
#include "RimDialogData.h"
#include "RimMainPlotCollection.h"
@ -100,12 +102,29 @@ void RicCreatePlotFromSelectionFeature::onActionTriggered( bool isChecked )
if ( conversionOk && index < sumCases.size() )
{
curve->setSummaryCaseY( sumCases[index] );
auto summaryCaseY = sumCases[index];
curve->setSummaryCaseY( summaryCaseY );
auto currentAddressY = curve->summaryAddressY();
if ( summaryCaseY->summaryReader() &&
!summaryCaseY->summaryReader()->hasAddress( currentAddressY ) )
{
auto allAddresses = summaryCaseY->summaryReader()->allResultAddresses();
auto candidate = RicCreatePlotFromSelectionFeature::firstAddressByQuantity( currentAddressY,
allAddresses );
if ( candidate.category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
{
curve->setSummaryAddressY( candidate );
}
}
}
}
}
}
// TODO: Create additional curves in selected case count is larger than template count
plotColl->updateConnectedEditors();
newSummaryPlot->loadDataAndUpdate();
@ -131,3 +150,21 @@ std::vector<RimSummaryCase*> RicCreatePlotFromSelectionFeature::selectedSummaryC
return objects;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress
RicCreatePlotFromSelectionFeature::firstAddressByQuantity( const RifEclipseSummaryAddress& sourceAddress,
const std::set<RifEclipseSummaryAddress>& allAddresses )
{
for ( const auto& a : allAddresses )
{
if ( sourceAddress.quantityName() == a.quantityName() )
{
return a;
}
}
return RifEclipseSummaryAddress();
}

8
ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.h
View File

@ -18,8 +18,12 @@
#pragma once
#include "RifEclipseSummaryAddress.h"
#include "cafCmdFeature.h"
#include <set>
class RimSummaryCase;
//==================================================================================================
@ -35,5 +39,7 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
std::vector<RimSummaryCase*> selectedSummaryCases() const;
std::vector<RimSummaryCase*> selectedSummaryCases() const;
static RifEclipseSummaryAddress firstAddressByQuantity( const RifEclipseSummaryAddress& sourceAddress,
const std::set<RifEclipseSummaryAddress>& allAddresses );
};