OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-05 05:37:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7761 Objective Function : Change formula and add several options

Browse Source
This commit is contained in:
Magne Sjaastad committed 2021-06-09 21:22:37 +02:00
1 parent c89e00b966
commit 4de91e885b
24 files changed
+883 -537
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
+3 -3
View File
@@ -23,6 +23,7 @@
#include "RimCustomObjectiveFunction.h"
#include "RimEnsembleCurveSet.h"
#include "RimObjectiveFunctionTools.h"
#include "RimSummaryAddress.h"
#include "RiuSummaryVectorSelectionDialog.h"
@@ -83,7 +84,7 @@ QString RimCustomObjectiveFunctionWeight::title() const
}
return QString( "%0 * %1::%2%3%4" )
.arg( m_weightValue, 0, 'f', 2 )
.arg( caf::AppEnum<RimObjectiveFunction::FunctionType>( m_objectiveFunction() ).uiText() )
.arg( caf::AppEnum<RimObjectiveFunction::FunctionType>( m_objectiveFunction() ).text() )
.arg( addressVector.size() > 1 ? "(" : "" )
.arg( QString::fromStdString( RifEclipseSummaryAddress::generateStringFromAddresses( addressVector, " + " ) ) )
.arg( addressVector.size() > 1 ? ")" : "" );
@@ -156,7 +157,7 @@ void RimCustomObjectiveFunctionWeight::fieldChangedByUi( const caf::PdmFieldHand
else if ( changedField == &m_objectiveValuesSelectSummaryAddressPushButton )
{
RiuSummaryVectorSelectionDialog dlg( nullptr );
dlg.enableMultiSelect( true );
RimObjectiveFunctionTools::configureDialogForObjectiveFunctions( &dlg );
RimSummaryCaseCollection* candidateEnsemble = parentCurveSet()->summaryCaseCollection();
std::vector<RifEclipseSummaryAddress> candidateAddresses;
@@ -165,7 +166,6 @@ void RimCustomObjectiveFunctionWeight::fieldChangedByUi( const caf::PdmFieldHand
candidateAddresses.push_back( address->address() );
}
dlg.hideSummaryCases();
dlg.setEnsembleAndAddresses( candidateEnsemble, candidateAddresses );
if ( dlg.exec() == QDialog::Accepted )