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

Merge pull request #5009 from OPM/feature-replace-summary-case

Browse Source 
Replace binary eclipse case and summary case feature.

Closes #4499 and #4987.
This commit is contained in:
Kristian Bendiksen
2019-11-13 13:29:40 +01:00
committed by GitHub
parent 57f6ee0660 b09103e596
commit f8468dc7a6
11 changed files with 313 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -34,6 +34,8 @@
CAF_PDM_ABSTRACT_SOURCE_INIT( RimSummaryCase, "SummaryCase" );
const QString RimSummaryCase::DEFAULT_DISPLAY_NAME = "Display Name";
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -41,7 +43,7 @@ RimSummaryCase::RimSummaryCase()
{
CAF_PDM_InitObject( "Summary Case", ":/SummaryCase16x16.png", "", "" );
CAF_PDM_InitField( &m_shortName, "ShortName", QString( "Display Name" ), "Display Name", "", "", "" );
CAF_PDM_InitField( &m_shortName, "ShortName", QString( "Display Name" ), DEFAULT_DISPLAY_NAME, "", "", "" );
CAF_PDM_InitField( &m_useAutoShortName, "AutoShortyName", false, "Use Auto Display Name", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_summaryHeaderFilename, "SummaryHeaderFilename", "Summary Header File", "", "", "" );
@@ -231,10 +233,19 @@ void RimSummaryCase::updateAutoShortName()
m_shortName = oilField->uniqueShortNameForCase( this );
}
else if ( m_shortName() == QString( "Display Name" ) )
else if ( m_shortName() == DEFAULT_DISPLAY_NAME )
{
m_shortName = caseName();
}
updateTreeItemName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCase::resetAutoShortName()
{
m_shortName = DEFAULT_DISPLAY_NAME;
updateAutoShortName();
}

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -50,6 +50,7 @@ public:
RiaEclipseUnitTools::UnitSystemType unitsSystem();
void updateAutoShortName();
void resetAutoShortName();
void updateOptionSensitivity();
virtual void createSummaryReaderInterface() = 0;
@@ -87,6 +88,8 @@ protected:
std::shared_ptr<RigCaseRealizationParameters> m_crlParameters;
static const QString DEFAULT_DISPLAY_NAME;
private:
void initAfterRead() override;
};