mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-14 17:32: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:
1 parent
3d53c9de1e
commit
af77fdad81
17 files changed
+306
-28
No files matched your search
@@ -561,6 +561,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
else if ( dynamic_cast<RimSummaryMultiPlotCollection*>( firstUiItem ) )
|
||||
{
|
||||
menuBuilder << "RicNewSummaryMultiPlotFeature";
|
||||
menuBuilder << "RicOpenSummaryPlotEditorFeature";
|
||||
menuBuilder << "Separator";
|
||||
menuBuilder << "RicPasteSummaryPlotFeature";
|
||||
menuBuilder << "RicPasteAsciiDataToSummaryPlotFeature";
|
||||
@@ -774,6 +775,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicNewSummaryMultiPlotFeature";
|
||||
menuBuilder << "RicNewDerivedEnsembleFeature";
|
||||
menuBuilder << "RicOpenSummaryPlotEditorFeature";
|
||||
menuBuilder << "RicNewSummaryCrossPlotFeature";
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicConvertGroupToEnsembleFeature";
|
||||
@@ -781,6 +783,9 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
}
|
||||
else if ( dynamic_cast<RimSummaryCase*>( firstUiItem ) )
|
||||
{
|
||||
menuBuilder << "RicShowDataSourcesForRealization";
|
||||
menuBuilder.addSeparator();
|
||||
|
||||
menuBuilder.subMenuStart( "Import" );
|
||||
menuBuilder << "RicImportSummaryCaseFeature";
|
||||
menuBuilder << "RicImportSummaryCasesFeature";
|
||||
@@ -789,6 +794,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder.subMenuEnd();
|
||||
menuBuilder.addSeparator();
|
||||
menuBuilder << "RicNewSummaryMultiPlotFeature";
|
||||
menuBuilder << "RicOpenSummaryPlotEditorFeature";
|
||||
menuBuilder << "RicNewSummaryCrossPlotFeature";
|
||||
menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
|
||||
menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";
|
||||
@@ -1092,6 +1098,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
|
||||
menuBuilder << "RicNewSummaryMultiPlotFeature";
|
||||
menuBuilder << "RicNewDerivedEnsembleFeature";
|
||||
menuBuilder << "RicOpenSummaryPlotEditorFeature";
|
||||
menuBuilder << "RicNewSummaryCrossPlotFeature";
|
||||
menuBuilder << "RicSummaryCurveSwitchAxisFeature";
|
||||
menuBuilder << "RicNewDerivedSummaryFeature";
|
||||
@@ -1110,7 +1117,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
|
||||
menuBuilder << "RicReloadSummaryCaseFeature";
|
||||
menuBuilder << "RicReplaceSummaryCaseFeature";
|
||||
menuBuilder << "RicCreateSummaryCaseCollectionFeature";
|
||||
menuBuilder << "RicShowDataSourcesForRealization";
|
||||
menuBuilder << "Separator";
|
||||
menuBuilder << "RicCutReferencesToClipboardFeature";
|
||||
|
||||
|
||||
@@ -184,6 +184,8 @@ void RimSummaryCaseCollection::addCase( RimSummaryCase* summaryCase )
|
||||
{
|
||||
summaryCase->nameChanged.connect( this, &RimSummaryCaseCollection::onCaseNameChanged );
|
||||
|
||||
if ( m_cases.empty() ) summaryCase->setShowRealizationDataSource( true );
|
||||
|
||||
m_cases.push_back( summaryCase );
|
||||
m_cachedSortedEnsembleParameters.clear();
|
||||
m_analyzer.reset();
|
||||
|
||||
@@ -1162,7 +1162,13 @@ void RimSummaryMultiPlot::summaryPlotItemInfos( QList<caf::PdmOptionItemInfo>* o
|
||||
{
|
||||
for ( RimSummaryPlot* plot : summaryPlots() )
|
||||
{
|
||||
QString displayName = plot->description();
|
||||
QString displayName;
|
||||
|
||||
if ( plot && plot->userDescriptionField() && plot->userDescriptionField() )
|
||||
{
|
||||
displayName = plot->userDescriptionField()->uiCapability()->uiValue().toString();
|
||||
}
|
||||
|
||||
optionInfos->push_back( caf::PdmOptionItemInfo( displayName, plot, false, plot->uiCapability()->uiIconProvider() ) );
|
||||
}
|
||||
}
|
||||
@@ -1217,8 +1223,6 @@ void RimSummaryMultiPlot::analyzePlotsAndAdjustAppearanceSettings()
|
||||
// Disable sub plot linking to be able to configure individually
|
||||
setSubPlotAxesLinked( false );
|
||||
|
||||
axisProp->setShowDescription( false );
|
||||
|
||||
auto [row, col] = gridLayoutInfoForSubPlot( p );
|
||||
if ( col == 0 )
|
||||
axisProp->setShowUnitText( true );
|
||||
|
||||
@@ -564,7 +564,8 @@ void RimSummaryPlot::updatePlotTitle()
|
||||
RimMultiPlot* plotWindow = nullptr;
|
||||
firstAncestorOrThisOfType( plotWindow );
|
||||
|
||||
auto index = plotWindow->plotIndex( this );
|
||||
size_t index = 0;
|
||||
if ( plotWindow ) index = plotWindow->plotIndex( this );
|
||||
|
||||
QString title = QString( "Sub Plot %1" ).arg( index + 1 );
|
||||
m_fallbackPlotName = title;
|
||||
@@ -2361,6 +2362,11 @@ RiuPlotWidget* RimSummaryPlot::doCreatePlotViewWidget( QWidget* mainWindowParent
|
||||
useQtCharts = true;
|
||||
}
|
||||
|
||||
// Disable all use of QtCharts for now. If a plot was created using QtCharts during the period this flag was
|
||||
// active, the use of QtCharts was stored in the project file or template file. Set flag to false to force use
|
||||
// of Qwt
|
||||
useQtCharts = false;
|
||||
|
||||
if ( useQtCharts )
|
||||
{
|
||||
m_summaryPlot = std::make_unique<RiuSummaryQtChartsPlot>( this, mainWindowParent );
|
||||
|
||||
@@ -62,6 +62,8 @@ RimSummaryPlotSourceStepping::RimSummaryPlotSourceStepping()
|
||||
{
|
||||
CAF_PDM_InitObject( "Summary Curves Modifier" );
|
||||
|
||||
setNotifyAllFieldsInMultiFieldChangedEvents( true );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_stepDimension, "StepDimension", "Step Dimension" );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_summaryCase, "CurveCase", "Case" );
|
||||
|
||||
Reference in new issue
Block a user