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

Simplify access to RimMainPlotCollection

Browse Source 
* Add current() to RimMainPlotCollection to avoid include of RimProject
* Remove "segment" prefix
* Reload data when RftCase changes
This commit is contained in:
Magne Sjaastad
2022-08-19 05:30:25 -07:00
parent 9f9e29ff8c
commit 947de3ffb1
51 changed files with 240 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,13 @@
#include "RimRftCase.h"
#include "RicReloadSummaryCaseFeature.h"
#include "RimMainPlotCollection.h"
#include "RimSummaryCase.h"
#include "cafPdmUiFilePathEditor.h"
//==================================================================================================
//
//
@@ -69,3 +76,33 @@ QString RimRftCase::dataDeckFilePath() const
{
return m_dataDeckFilePath().path();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimRftCase::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
RimSummaryCase* parentCase = nullptr;
firstAncestorOfType( parentCase );
if ( parentCase ) RicReloadSummaryCaseFeature::reloadSummaryCase( parentCase );
RimMainPlotCollection::current()->loadDataAndUpdateAllPlots();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimRftCase::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_dataDeckFilePath )
{
auto* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>( attribute );
if ( myAttr )
{
myAttr->m_defaultPath = rftFilePath();
}
}
}

7
ApplicationLibCode/ProjectDataModel/Summary/RimRftCase.h
View File

@@ -39,6 +39,13 @@ public:
QString rftFilePath() const;
QString dataDeckFilePath() const;
private:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
private:
caf::PdmField<caf::FilePath> m_rftFilePath;
caf::PdmField<caf::FilePath> m_dataDeckFilePath;

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

@@ -39,7 +39,6 @@
#include "RimMultiPlotCollection.h"
#include "RimMultipleSummaryPlotNameHelper.h"
#include "RimPlotAxisProperties.h"
#include "RimProject.h"
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryAddressModifier.h"
@@ -533,8 +532,7 @@ void RimSummaryMultiPlot::updatePlotWindowTitle()
if ( title.isEmpty() )
{
auto proj = RimProject::current();
auto collections = proj->mainPlotCollection()->summaryMultiPlotCollection();
auto collections = RimMainPlotCollection::current()->summaryMultiPlotCollection();
size_t index = 0;
for ( auto p : collections->multiPlots() )