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

Improve reload and replace of cases

Browse Source 
* Move code to from features to helper classes
* Ask user if replace case should also happen for the associated grid or summary file
This commit is contained in:
Magne Sjaastad
2024-01-25 10:41:57 +01:00
committed by GitHub
parent cd0a56c924
commit 6922ba22b0
22 changed files with 299 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/Summary/RimRftCase.cpp
View File

@@ -18,7 +18,7 @@
#include "RimRftCase.h"
#include "RicReloadSummaryCaseFeature.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimSummaryCase.h"
@@ -84,7 +84,7 @@ void RimRftCase::fieldChangedByUi( const caf::PdmFieldHandle* changedField, cons
{
auto parentCase = firstAncestorOfType<RimSummaryCase>();
if ( parentCase ) RicReloadSummaryCaseFeature::reloadSummaryCase( parentCase );
if ( parentCase ) RiaSummaryTools::reloadSummaryCase( parentCase );
RimMainPlotCollection::current()->loadDataAndUpdateAllPlots();
}

20
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -110,26 +110,6 @@ RimSummaryCaseMainCollection::~RimSummaryCaseMainCollection()
m_caseCollections.deleteChildrenAsync();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryCaseMainCollection::findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclipseResultCase ) const
{
RiaEclipseFileNameTools helper( eclipseResultCase->gridFileName() );
auto summaryFileName = helper.findSummaryFileCandidates();
for ( const auto& candidateFileName : summaryFileName )
{
auto summaryCase = findTopLevelSummaryCaseFromFileName( candidateFileName );
if ( summaryCase )
{
return summaryCase;
}
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.h
View File

@@ -54,7 +54,6 @@ public:
std::vector<RimSummaryCase*> createSummaryCasesFromFileInfos( const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos,
bool showProgress = false );
RimSummaryCase* findSummaryCaseFromEclipseResultCase( const RimEclipseResultCase* eclResCase ) const;
RimSummaryCase* findTopLevelSummaryCaseFromFileName( const QString& fileName ) const;
void addCases( const std::vector<RimSummaryCase*> cases );