mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-31 17:17:50 -05:00
Fix performance issue for replace ensemble
Make sure that update of connected ensemble curve sets and plots happens only once. wip
This commit is contained in:
1 parent
d592b29090
commit
0cf7a1f4bc
3 files changed
+42
-16
No files matched your search
+5
-14
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "RicReplaceSummaryEnsembleFeature.h"
|
||||
|
||||
#include "RiaLogging.h"
|
||||
#include "Summary/RiaSummaryTools.h"
|
||||
|
||||
#include "RicImportSummaryCasesFeature.h"
|
||||
@@ -60,20 +61,13 @@ void RicReplaceSummaryEnsembleFeature::onActionTriggered( bool isChecked )
|
||||
|
||||
RicImportSummaryCasesFeature::CreateConfig createConfig{ .fileType = fileType, .ensembleOrGroup = false, .allowDialogs = false };
|
||||
auto [isOk, newCases] = RicImportSummaryCasesFeature::createSummaryCasesFromFiles( fileNames, createConfig );
|
||||
if ( !isOk ) return;
|
||||
|
||||
// Remove cases first, delegate delete to a separate thread
|
||||
auto casesToBeDeleted = summaryEnsemble->allSummaryCases();
|
||||
for ( auto summaryCase : casesToBeDeleted )
|
||||
if ( !isOk || newCases.empty() )
|
||||
{
|
||||
summaryEnsemble->removeCase( summaryCase );
|
||||
RiaLogging::warning( "No new cases are created." );
|
||||
return;
|
||||
}
|
||||
|
||||
// Add the summary case
|
||||
for ( auto summaryCase : newCases )
|
||||
{
|
||||
summaryEnsemble->addCase( summaryCase );
|
||||
}
|
||||
summaryEnsemble->replaceCases( newCases );
|
||||
|
||||
// Update name of cases and ensemble after all cases are added
|
||||
for ( auto summaryCase : newCases )
|
||||
@@ -87,9 +81,6 @@ void RicReplaceSummaryEnsembleFeature::onActionTriggered( bool isChecked )
|
||||
{
|
||||
sumCaseMainColl->updateAllRequiredEditors();
|
||||
}
|
||||
|
||||
// Delete previous cases in a separate thread, as this operation can be time-consuming
|
||||
caf::AsyncPdmObjectVectorDeleter<RimSummaryCase> summaryCaseDeleter( casesToBeDeleted );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user