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

Update text for curve names and plot titles when source data changes

Browse Source 
* Update titles after dropping vectors into plot
* Do not replace _Name variables
* Make sure signals are wired when opening a project file
* Add auto name field and set default on
* Remove includes from header files
This commit is contained in:
Magne Sjaastad
2022-12-09 08:46:36 +01:00
committed by GitHub
parent c83210701c
commit 5ec32f8613
35 changed files with 109 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -28,6 +28,7 @@
#include "RimObjectiveFunctionTools.h"
#include "RimSummaryAddress.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RiuSummaryVectorSelectionDialog.h"

3
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -27,9 +27,6 @@
#include "RimEnsembleCurveSetColorManager.h"
#include "RimEnsembleCurveSetInterface.h"
#include "RimObjectiveFunction.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimTimeStepFilter.h"
#include "RigEnsembleParameter.h"

5
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.cpp
View File

@@ -19,12 +19,15 @@
#include "RimEnsembleCurveSetColorManager.h"
#include "RiaColorTables.h"
#include "RimCustomObjectiveFunction.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimObjectiveFunction.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "cvfScalarMapper.h"
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.h
View File

@@ -21,7 +21,6 @@
#include "RiaDefines.h"
#include "RimRegularLegendConfig.h"
#include "RimSummaryCaseCollection.h"
#include "RigEnsembleParameter.h"
@@ -33,6 +32,9 @@ class RimEnsembleCurveSet;
class RimEnsembleCurveSetCollection;
class RimCustomObjectiveFunction;
class RimObjectiveFunction;
class RimSummaryCase;
class RifEclipseSummaryAddress;
class ObjectiveFunctionTimeConfig;
//--------------------------------------------------------------------------------------------------
///

1
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -25,6 +25,7 @@
#include "RigStatisticsMath.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCaseCollection.h"
#include <limits>
#include <set>

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

@@ -18,6 +18,7 @@
#include "RimSummaryCaseCollection.h"
#include "RiaEnsembleNameTools.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaStatisticsTools.h"
@@ -115,6 +116,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
m_cases.uiCapability()->setUiTreeHidden( true );
CAF_PDM_InitScriptableField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name" );
CAF_PDM_InitScriptableField( &m_autoName, "CreateAutoName", true, "Auto Name" );
CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name" );
m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount );
@@ -246,6 +248,28 @@ QString RimSummaryCaseCollection::name() const
return m_name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::ensureNameIsUpdated()
{
if ( m_autoName )
{
QStringList fileNames;
for ( const auto& summaryCase : m_cases )
{
fileNames.push_back( summaryCase->summaryHeaderFilename() );
}
RiaEnsembleNameTools::EnsembleGroupingMode groupingMode =
RiaEnsembleNameTools::EnsembleGroupingMode::FMU_FOLDER_STRUCTURE;
QString ensembleName = RiaEnsembleNameTools::findSuitableEnsembleName( fileNames, groupingMode );
m_name = ensembleName;
caseNameChanged.send();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1036,6 +1060,11 @@ void RimSummaryCaseCollection::initAfterRead()
}
updateIcon();
for ( const auto& summaryCase : m_cases )
{
summaryCase->nameChanged.connect( this, &RimSummaryCaseCollection::onCaseNameChanged );
}
}
//--------------------------------------------------------------------------------------------------
@@ -1049,6 +1078,14 @@ void RimSummaryCaseCollection::fieldChangedByUi( const caf::PdmFieldHandle* chan
{
updateIcon();
}
if ( changedField == &m_autoName )
{
ensureNameIsUpdated();
}
if ( changedField == &m_name )
{
caseNameChanged.send();
}
}
//--------------------------------------------------------------------------------------------------
@@ -1064,7 +1101,9 @@ void RimSummaryCaseCollection::onCaseNameChanged( const SignalEmitter* emitter )
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_autoName );
uiOrdering.add( &m_name );
m_name.uiCapability()->setUiReadOnly( m_autoName() );
if ( m_isEnsemble() )
{
uiOrdering.add( &m_ensembleId );

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

@@ -67,6 +67,7 @@ public:
void setName( const QString& name );
QString name() const;
void ensureNameIsUpdated();
bool isEnsemble() const;
void setAsEnsemble( bool isEnsemble );
@@ -145,6 +146,7 @@ protected:
private:
caf::PdmField<QString> m_name;
caf::PdmField<bool> m_autoName;
caf::PdmProxyValueField<QString> m_nameAndItemCount;
caf::PdmField<bool> m_isEnsemble;
caf::PdmChildField<RimSummaryAddressCollection*> m_dataVectorFolders;

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

@@ -424,6 +424,22 @@ void RimSummaryCaseMainCollection::loadAllSummaryCaseData()
RimSummaryCaseMainCollection::loadSummaryCaseData( sumCases );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseMainCollection::initAfterRead()
{
for ( auto sumCase : topLevelSummaryCases() )
{
sumCase->nameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
}
for ( auto caseCollection : summaryCaseCollections() )
{
caseCollection->caseNameChanged.connect( this, &RimSummaryCaseMainCollection::onCaseNameChanged );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@@ -79,6 +79,8 @@ public:
void onProjectBeingSaved();
private:
void initAfterRead() override;
static void loadSummaryCaseData( std::vector<RimSummaryCase*> summaryCases );
static void loadFileSummaryCaseData( std::vector<RimFileSummaryCase*> fileSummaryCases );
static void reassignSummaryCurves( const RimGridSummaryCase* fromGridCase, RimFileSummaryCase* toFileCase );

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@@ -526,7 +526,7 @@ void RimSummaryMultiPlot::defineEditorAttribute( const caf::PdmFieldHandle* fiel
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::updatePlotWindowTitle()
void RimSummaryMultiPlot::updatePlotTitles()
{
if ( m_autoPlotTitle )
{
@@ -727,7 +727,7 @@ void RimSummaryMultiPlot::initAfterRead()
void RimSummaryMultiPlot::onLoadDataAndUpdate()
{
RimMultiPlot::onLoadDataAndUpdate();
updatePlotWindowTitle();
updatePlotTitles();
analyzePlotsAndAdjustAppearanceSettings();
}
@@ -1344,7 +1344,7 @@ std::pair<int, int> RimSummaryMultiPlot::gridLayoutInfoForSubPlot( RimSummaryPlo
//--------------------------------------------------------------------------------------------------
void RimSummaryMultiPlot::onSubPlotChanged( const caf::SignalEmitter* emitter )
{
updatePlotWindowTitle();
updatePlotTitles();
applyPlotWindowTitleToWidgets();
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h
View File

@@ -79,7 +79,7 @@ public:
void removePlotNoUpdate( RimPlot* plot ) override;
void updateAfterPlotRemove() override;
void updatePlotWindowTitle() override;
void updatePlotTitles() override;
std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar() override;

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

@@ -188,5 +188,7 @@ void RimSummaryMultiPlotCollection::updateSummaryNameHasChanged()
{
plot->updateCaseNameHasChanged();
}
multiPlot->updatePlotTitles();
}
}

1
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -51,6 +51,7 @@
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryCurvesData.h"

3
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -30,6 +30,7 @@
#include "RimProject.h"
#include "RimSummaryAddressModifier.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCrossPlot.h"
#include "RimSummaryCurve.h"
@@ -517,7 +518,7 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle*
if ( summaryMultiPlot )
{
summaryMultiPlot->updatePlots();
summaryMultiPlot->updatePlotWindowTitle();
summaryMultiPlot->updatePlotTitles();
if ( isAutoZoomAllowed ) summaryMultiPlot->zoomAllYAxes();