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

#3467 Improved code using RimWellPathComponentInterface

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-10-09 13:42:03 +02:00
parent 1019eeaa6a
commit e61e71ecbf
24 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimWellPathAttribute.cpp
View File

@@ -72,9 +72,9 @@ QString RimWellPathAttribute::diameterLabel() const
//--------------------------------------------------------------------------------------------------
bool RimWellPathAttribute::operator<(const RimWellPathAttribute& rhs) const
{
if (type() != rhs.type())
if (componentType() != rhs.componentType())
{
return type() < rhs.type();
return componentType() < rhs.componentType();
}
return endMD() > rhs.endMD();
}
@@ -91,7 +91,7 @@ void RimWellPathAttribute::setDepthsFromWellPath(const RimWellPath* wellPath)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaDefines::CompletionType RimWellPathAttribute::type() const
RiaDefines::WellPathComponentType RimWellPathAttribute::componentType() const
{
return m_type();
}
@@ -115,9 +115,9 @@ double RimWellPathAttribute::endMD() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellPathAttribute::completionLabel() const
QString RimWellPathAttribute::componentLabel() const
{
QString fullLabel = completionTypeLabel();
QString fullLabel = componentTypeLabel();
if (m_type() == RiaDefines::CASING || m_type() == RiaDefines::LINER)
{
fullLabel += QString(" %1").arg(diameterLabel());
@@ -128,7 +128,7 @@ QString RimWellPathAttribute::completionLabel() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellPathAttribute::completionTypeLabel() const
QString RimWellPathAttribute::componentTypeLabel() const
{
return m_type().uiText();
}
@@ -149,8 +149,8 @@ QList<caf::PdmOptionItemInfo> RimWellPathAttribute::calculateValueOptions(const
QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_type)
{
std::set<RiaDefines::CompletionType> supportedTypes = { RiaDefines::CASING, RiaDefines::LINER, RiaDefines::PACKER };
for (RiaDefines::CompletionType type : supportedTypes)
std::set<RiaDefines::WellPathComponentType> supportedTypes = { RiaDefines::CASING, RiaDefines::LINER, RiaDefines::PACKER };
for (RiaDefines::WellPathComponentType type : supportedTypes)
{
options.push_back(caf::PdmOptionItemInfo(CompletionTypeEnum::uiText(type), type));
}