OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 10:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

#5399 Export LAS-curves of WBS-parameters with the LAS-name rather than the Ui name

Browse Source
This commit is contained in:
Gaute Lindkvist committed 2020-01-29 09:45:38 +01:00
1 parent a399a843b0
commit b40f3dcd39
18 files changed
+113 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ReservoirDataModel/RigWbsParameter.cpp
+15 -6
View File
@@ -119,13 +119,13 @@ void RigWbsParameter::setOptionsExclusive( bool exclusive )
///
//--------------------------------------------------------------------------------------------------
std::vector<QString>
RigWbsParameter::allSourceLabels( const QString& delimiter /*= " "*/,
double userDefinedValue /*= std::numeric_limits<double>::infinity() */ )
RigWbsParameter::allSourceUiLabels( const QString& delimiter /*= " "*/,
double userDefinedValue /*= std::numeric_limits<double>::infinity() */ )
{
std::vector<QString> allLabels;
for ( size_t i = 0; i < SourceEnum::size(); ++i )
{
allLabels.push_back( sourceLabel( SourceEnum::fromIndex( i ), delimiter, userDefinedValue ) );
allLabels.push_back( sourceUiLabel( SourceEnum::fromIndex( i ), delimiter, userDefinedValue ) );
}
return allLabels;
}
@@ -133,9 +133,9 @@ std::vector<QString>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWbsParameter::sourceLabel( Source currentSource,
const QString& delimiter,
double userDefinedValue /*= std::numeric_limits<double>::infinity() */ )
QString RigWbsParameter::sourceUiLabel( Source currentSource,
const QString& delimiter,
double userDefinedValue /*= std::numeric_limits<double>::infinity() */ )
{
QString sourceLabel;
if ( currentSource == USER_DEFINED )
@@ -150,6 +150,15 @@ QString RigWbsParameter::sourceLabel( Source currentSource,
return sourceLabel;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigWbsParameter::sourceLabel( Source source )
{
SourceAddress addr = address( source );
return addr.primary;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationCode/ReservoirDataModel/RigWbsParameter.h
+6 -5
View File
@@ -57,11 +57,12 @@ public:
bool exclusiveOptions() const;
void setOptionsExclusive( bool exclusive );
std::vector<QString> allSourceLabels( const QString& delimiter = " ",
double userDefinedValue = std::numeric_limits<double>::infinity() );
QString sourceLabel( Source currentSource,
const QString& delimiter = " ",
double userDefinedValue = std::numeric_limits<double>::infinity() );
std::vector<QString> allSourceUiLabels( const QString& delimiter = " ",
double userDefinedValue = std::numeric_limits<double>::infinity() );
QString sourceUiLabel( Source currentSource,
const QString& delimiter = " ",
double userDefinedValue = std::numeric_limits<double>::infinity() );
QString sourceLabel( Source currentSource );
bool operator==( const RigWbsParameter& rhs ) const;
bool operator<( const RigWbsParameter& rhs ) const;