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

Add summary category time

Browse Source 
To be able to represent the time in a RifEclipseSummaryAddress object we add time as a category
This commit is contained in:
Magne Sjaastad 2023-09-18 09:25:00 +02:00
parent ae4a856343
commit c06cda3883
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@ -445,6 +445,16 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::ensembleStatisticsAddress( co
return addr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifEclipseSummaryAddress::timeAddress()
{
RifEclipseSummaryAddress addr;
addr.m_variableCategory = SummaryVarCategory::SUMMARY_TIME;
return addr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -1241,6 +1251,14 @@ bool RifEclipseSummaryAddress::isCalculated() const
return m_id != -1;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifEclipseSummaryAddress::isTime() const
{
return m_variableCategory == SummaryVarCategory::SUMMARY_TIME;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.h
View File

@ -89,6 +89,9 @@ public:
static RifEclipseSummaryAddress importedAddress( const std::string& vectorName, int calculationId = -1 );
static RifEclipseSummaryAddress ensembleStatisticsAddress( const std::string& vectorName, const std::string& datavectorName );
// Special address when time is used as x-axis
static RifEclipseSummaryAddress timeAddress();
static std::string generateStringFromAddresses( const std::vector<RifEclipseSummaryAddress>& addressVector,
const std::string jointString = "; " );
@ -147,6 +150,7 @@ public:
auto operator<=>( const RifEclipseSummaryAddress& rhs ) const = default;
bool isCalculated() const;
bool isTime() const;
std::string formatUiTextRegionToRegion() const;
static std::pair<int, int> regionToRegionPairFromUiText( const std::string& s );

3
ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h
View File

@ -47,7 +47,8 @@ enum class SummaryVarCategory
SUMMARY_BLOCK,
SUMMARY_BLOCK_LGR,
SUMMARY_IMPORTED,
SUMMARY_ENSEMBLE_STATISTICS
SUMMARY_ENSEMBLE_STATISTICS,
SUMMARY_TIME // Used to represent time as along the x-axis
};
enum class SummaryIdentifierType