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

Fix auto short names for regular Summary (non-ensemble) cases

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-15 14:00:10 +02:00
parent 71d032f4ad
commit 53f8364889
3 changed files with 111 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,9 @@
#include <QFileInfo>
#include <QRegularExpression>
CAF_PDM_ABSTRACT_SOURCE_INIT( RimSummaryCase, "SummaryCase" );
#define SUMMARY_CASE_SHORT_NAME_LENGTH 6 // TODO: Could make this a preference if required.
CAF_PDM_ABSTRACT_SOURCE_INIT( RimSummaryCase, "SummaryCase" );
namespace caf
{
template <>
@ -46,7 +47,7 @@ void AppEnum<RimSummaryCase::DisplayName>::setUp()
addItem( RimSummaryCase::DisplayName::FULL_CASE_NAME, "FULL_CASE_NAME", "Full Case Name" );
addItem( RimSummaryCase::DisplayName::SHORT_CASE_NAME, "SHORT_CASE_NAME", "Shortened Case Name" );
addItem( RimSummaryCase::DisplayName::CUSTOM, "CUSTOM_NAME", "Custom Name" );
setDefault( RimSummaryCase::DisplayName::SHORT_CASE_NAME );
setDefault( RimSummaryCase::DisplayName::FULL_CASE_NAME );
}
} // namespace caf
@ -256,6 +257,14 @@ RiaEclipseUnitTools::UnitSystemType RimSummaryCase::unitsSystem()
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCase::setDisplayNameOption( DisplayName displayNameOption )
{
m_displayNameOption = displayNameOption;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -277,20 +286,15 @@ void RimSummaryCase::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryCase::uniqueShortNameForCase( RimSummaryCase* summaryCase )
QString RimSummaryCase::uniqueShortNameForEnsembleCase( RimSummaryCase* summaryCase )
{
QString ensembleName = summaryCase->caseName();
std::vector<RimSummaryCase*> summaryCases;
CAF_ASSERT( summaryCase && summaryCase->ensemble() );
QString ensembleCaseName = summaryCase->caseName();
auto ensemble = summaryCase->ensemble();
if ( ensemble )
{
summaryCases = ensemble->allSummaryCases();
}
else
{
RimProject::current()->descendantsIncludingThisOfType( summaryCases );
}
std::vector<RimSummaryCase*> summaryCases = ensemble->allSummaryCases();
QRegularExpression trimRe( "^[^a-zA-Z0-9]+" );
@ -309,13 +313,13 @@ QString RimSummaryCase::uniqueShortNameForCase( RimSummaryCase* summaryCase )
RiaFilePathTools::keyPathComponentsForEachFilePath( summaryFilePaths );
QStringList keyFileComponents = keyFileComponentsForAllFiles[summaryCase->summaryHeaderFilename()];
if ( keyFileComponents.empty() ) return ensembleName;
if ( keyFileComponents.empty() ) return ensembleCaseName;
if ( !ensembleName.isEmpty() )
if ( !ensembleCaseName.isEmpty() )
{
for ( auto& component : keyFileComponents )
{
component = component.replace( ensembleName, "" );
component = component.replace( ensembleCaseName, "" );
component = component.replace( trimRe, "" );
}
}
@ -325,18 +329,20 @@ QString RimSummaryCase::uniqueShortNameForCase( RimSummaryCase* summaryCase )
for ( auto keyComponent : keyFileComponents )
{
QStringList subComponents;
QString numberGroup = numberRe.match( keyComponent ).captured();
QString numberGroup = numberRe.match( keyComponent ).captured();
int numberGroupAndDelimiterLength = numberGroup.length() + 1;
if ( !numberGroup.isEmpty() )
{
keyComponent = keyComponent.replace( numberGroup, "" );
QString stem = keyComponent.left( 4 );
QString stem =
keyComponent.left( std::max( 1, SUMMARY_CASE_SHORT_NAME_LENGTH - numberGroupAndDelimiterLength ) );
if ( !stem.isEmpty() ) subComponents.push_back( stem );
subComponents.push_back( numberGroup );
}
else
{
subComponents.push_back( keyComponent.left( 6 ) );
subComponents.push_back( keyComponent.left( SUMMARY_CASE_SHORT_NAME_LENGTH ) );
}
shortNameComponents.push_back( subComponents.join( "-" ) );
@ -344,6 +350,77 @@ QString RimSummaryCase::uniqueShortNameForCase( RimSummaryCase* summaryCase )
return shortNameComponents.join( "," );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryCase::uniqueShortNameForSummaryCase( RimSummaryCase* summaryCase )
{
std::set<QString> allAutoShortNames;
std::vector<RimSummaryCase*> allCases;
RimProject::current()->descendantsOfType( allCases );
for ( RimSummaryCase* sumCase : allCases )
{
if ( sumCase && sumCase != summaryCase )
{
allAutoShortNames.insert( sumCase->displayCaseName() );
}
}
bool foundUnique = false;
QString caseName = summaryCase->caseName();
QString shortName;
if ( caseName.size() > SUMMARY_CASE_SHORT_NAME_LENGTH )
{
QString candidate;
candidate += caseName[0];
for ( int i = 1; i < caseName.size(); ++i )
{
if ( foundUnique && !caseName[i].isLetterOrNumber() )
{
break;
}
candidate += caseName[i];
if ( allAutoShortNames.count( candidate ) == 0 )
{
shortName = candidate;
foundUnique = true;
if ( shortName.length() >= SUMMARY_CASE_SHORT_NAME_LENGTH )
{
break;
}
}
}
}
else
{
shortName = caseName.left( SUMMARY_CASE_SHORT_NAME_LENGTH );
if ( allAutoShortNames.count( shortName ) == 0 )
{
foundUnique = true;
}
}
int autoNumber = 1;
while ( !foundUnique )
{
QString candidate = QString( "%1 %2" ).arg( shortName ).arg( autoNumber++ );
if ( allAutoShortNames.count( candidate ) == 0 )
{
shortName = candidate;
foundUnique = true;
}
}
return shortName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -355,9 +432,15 @@ void RimSummaryCase::updateAutoShortName()
}
else if ( m_displayNameOption == DisplayName::SHORT_CASE_NAME )
{
m_displayName = RimSummaryCase::uniqueShortNameForCase( this );
if ( ensemble() )
{
m_displayName = RimSummaryCase::uniqueShortNameForEnsembleCase( this );
}
else
{
m_displayName = RimSummaryCase::uniqueShortNameForSummaryCase( this );
}
}
updateTreeItemName();
}

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

@ -63,6 +63,7 @@ public:
RiaEclipseUnitTools::UnitSystemType unitsSystem();
void setDisplayNameOption( DisplayName displayNameOption );
void updateAutoShortName();
void updateOptionSensitivity();
@ -95,7 +96,8 @@ protected:
void initAfterRead() override;
private:
static QString uniqueShortNameForCase( RimSummaryCase* summaryCase );
static QString uniqueShortNameForEnsembleCase( RimSummaryCase* summaryCase );
static QString uniqueShortNameForSummaryCase( RimSummaryCase* summaryCase );
protected:
caf::PdmField<QString> m_displayName;

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -288,6 +288,10 @@ RimSummaryCaseCollection*
}
summaryCaseCollection->addCase( summaryCase );
if ( isEnsemble )
{
summaryCase->setDisplayNameOption( RimSummaryCase::DisplayName::SHORT_CASE_NAME );
}
}
summaryCaseCollection->setAsEnsemble( isEnsemble );