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

Fix source stepping on calculated vectors

Browse Source 
Make sure the calculation ID is set when a calculated vector is selected in the toolbar
This commit is contained in:
Magne Sjaastad
2024-03-19 14:18:41 +01:00
parent a248be13cc
commit 84875bef4f
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp
View File

@@ -18,12 +18,10 @@
#include "RimDataSourceSteppingTools.h" #include "RimDataSourceSteppingTools.h"
#include "RiaSummaryAddressAnalyzer.h" #include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddress.h"
#include "cafPdmUiFieldHandle.h"
#include "cvfAssert.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -184,12 +182,34 @@ bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimDataSourceSteppingTools::updateQuantityIfMatching( const QVariant& oldValue, const QVariant& newValue, RifEclipseSummaryAddress& adr ) bool RimDataSourceSteppingTools::updateQuantityIfMatching( const QVariant& oldValue, const QVariant& newValue, RifEclipseSummaryAddress& adr )
{ {
std::string oldString = oldValue.toString().toStdString(); std::string oldString = oldValue.toString().toStdString();
std::string newString = newValue.toString().toStdString(); auto newQString = newValue.toString();
std::string newString = newQString.toStdString();
// Calculation ID < 0 means native summary vector
int calculationId = -1;
RimSummaryCalculationCollection* calculationColl = RimProject::current()->calculationCollection();
if ( calculationColl )
{
// Parse the calculations and find ID if text is matching. This can cause issues if a calculation has the same name as a native
// summary vector imported from file.
auto calculations = calculationColl->calculations();
for ( auto c : calculations )
{
if ( c->shortName() == newQString )
{
calculationId = c->id();
break;
}
}
}
if ( adr.vectorName() == oldString ) if ( adr.vectorName() == oldString )
{ {
adr.setVectorName( newString ); adr.setVectorName( newString );
adr.setId( calculationId );
return true; return true;
} }

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@@ -1165,6 +1165,8 @@ void RimSummaryCaseCollection::onCalculationUpdated()
m_dataVectorFolders->deleteCalculatedObjects(); m_dataVectorFolders->deleteCalculatedObjects();
m_dataVectorFolders->updateFolderStructure( ensembleSummaryAddresses(), -1, m_ensembleId ); m_dataVectorFolders->updateFolderStructure( ensembleSummaryAddresses(), -1, m_ensembleId );
m_analyzer.reset();
updateConnectedEditors(); updateConnectedEditors();
} }