mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Prepare for release
Always create plots using Qwt Always create plot for command "New Summary Plot" #9103 : Fix missing updates in multiselect field update operation Add Open Summary Plot Editor Trigger missing load of data Enable data source display for first realization of an ensemble Always show legend text Set version to 2022.06.0-RC-02
This commit is contained in:
+2
-2
@@ -93,10 +93,10 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot* s
|
||||
adrMod.setAddress( modifiedAdr );
|
||||
}
|
||||
summaryMultiPlot->addPlot( duplicatedPlot );
|
||||
|
||||
duplicatedPlot->resolveReferencesRecursively();
|
||||
duplicatedPlot->loadDataAndUpdate();
|
||||
}
|
||||
|
||||
duplicatedPlot->loadDataAndUpdate();
|
||||
}
|
||||
info.incrementProgress();
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "RicSummaryPlotBuilder.h"
|
||||
|
||||
#include "RimProject.h"
|
||||
#include "RimSummaryCase.h"
|
||||
#include "RimSummaryCaseCollection.h"
|
||||
#include "RimSummaryMultiPlot.h"
|
||||
@@ -60,22 +61,30 @@ void RicNewSummaryMultiPlotFeature::onActionTriggered( bool isChecked )
|
||||
std::vector<caf::PdmUiItem*> selectedUiItems;
|
||||
caf::SelectionManager::instance()->selectedItems( selectedUiItems );
|
||||
|
||||
RimSummaryMultiPlotCollection* coll = selectedCollection( selectedUiItems );
|
||||
if ( coll )
|
||||
{
|
||||
std::vector<caf::PdmObjectHandle*> objects = {};
|
||||
RimSummaryMultiPlot* multiPlot = RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( objects );
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<RimSummaryCase*> selectedIndividualSummaryCases;
|
||||
std::vector<RimSummaryCaseCollection*> selectedEnsembles;
|
||||
|
||||
if ( selectedCases( &selectedIndividualSummaryCases, &selectedEnsembles ) )
|
||||
RimSummaryMultiPlotCollection* coll = selectedCollection( selectedUiItems );
|
||||
if ( coll )
|
||||
{
|
||||
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases, selectedEnsembles );
|
||||
auto ensembles = RimProject::current()->summaryGroups();
|
||||
if ( !ensembles.empty() )
|
||||
selectedEnsembles.push_back( ensembles.front() );
|
||||
else
|
||||
{
|
||||
auto summaryCases = RimProject::current()->allSummaryCases();
|
||||
if ( !summaryCases.empty() ) selectedIndividualSummaryCases.push_back( summaryCases.front() );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
selectedCases( &selectedIndividualSummaryCases, &selectedEnsembles );
|
||||
}
|
||||
|
||||
bool skipCreationOfPlotBasedOnPreferences = false;
|
||||
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,
|
||||
selectedEnsembles,
|
||||
skipCreationOfPlotBasedOnPreferences );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -410,11 +410,14 @@ void RicSummaryPlotBuilder::appendPlotsToMultiPlot( RimMultiPlot* multiPlot, con
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryMultiPlot*
|
||||
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
|
||||
const std::vector<RimSummaryCaseCollection*>& ensembles )
|
||||
const std::vector<RimSummaryCaseCollection*>& ensembles,
|
||||
bool skipCreationOfPlotBasedOnPreferences )
|
||||
{
|
||||
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
|
||||
|
||||
if ( prefs->defaultSummaryPlotType() == RiaPreferencesSummary::DefaultSummaryPlotType::NONE ) return nullptr;
|
||||
if ( skipCreationOfPlotBasedOnPreferences &&
|
||||
prefs->defaultSummaryPlotType() == RiaPreferencesSummary::DefaultSummaryPlotType::NONE )
|
||||
return nullptr;
|
||||
|
||||
if ( prefs->defaultSummaryPlotType() == RiaPreferencesSummary::DefaultSummaryPlotType::PLOT_TEMPLATES )
|
||||
{
|
||||
@@ -424,10 +427,17 @@ RimSummaryMultiPlot*
|
||||
{
|
||||
plotToSelect = RicSummaryPlotTemplateTools::create( filename, cases, ensembles );
|
||||
}
|
||||
return plotToSelect;
|
||||
|
||||
if ( plotToSelect ) return plotToSelect;
|
||||
|
||||
if ( skipCreationOfPlotBasedOnPreferences )
|
||||
{
|
||||
return plotToSelect;
|
||||
}
|
||||
}
|
||||
|
||||
if ( prefs->defaultSummaryCurvesTextFilter().trimmed().isEmpty() ) return nullptr;
|
||||
if ( skipCreationOfPlotBasedOnPreferences && prefs->defaultSummaryCurvesTextFilter().trimmed().isEmpty() )
|
||||
return nullptr;
|
||||
|
||||
RimProject* project = RimProject::current();
|
||||
auto* plotCollection = project->mainPlotCollection()->summaryMultiPlotCollection();
|
||||
|
||||
@@ -77,7 +77,8 @@ public:
|
||||
|
||||
static RimSummaryMultiPlot*
|
||||
createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
|
||||
const std::vector<RimSummaryCaseCollection*>& ensembles );
|
||||
const std::vector<RimSummaryCaseCollection*>& ensembles,
|
||||
bool skipCreationOfPlotBasedOnPreferences = true );
|
||||
|
||||
static RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlotNoAutoSettings( RimSummaryPlot* plot );
|
||||
static RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlot( RimSummaryPlot* plot );
|
||||
|
||||
Reference in New Issue
Block a user