mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 23:20:29 -05:00
Rename RimFixedTrajectoryWellPath to RimPointBasedWellPath
- Renamed class from RimFixedTrajectoryWellPath to RimPointBasedWellPath - Updated header and implementation files - Changed PDM object display name to "Point-Based Well Path" - Updated script keyword from "FixedTrajectoryWellPath" to "PointBasedWellPath" - Modified CMakeLists_files.cmake to reference new filenames - Updated all includes and instantiation references - Applied clang-format-19 to modified C++ files - Updated Python docstring to reflect new return type The new name better describes the class purpose of creating well paths from XYZ coordinate points. All tests continue to pass.
This commit is contained in:
1 parent
d2bed679e1
commit
d8566b679f
5 files changed
+19
-19
No files matched your search
@@ -2,7 +2,7 @@ set(SOURCE_GROUP_HEADER_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPathGroup.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimFixedTrajectoryWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPointBasedWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimModeledWellPath.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPathGeometryDef.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPathGeometryDefTools.h
|
||||
@@ -24,7 +24,7 @@ set(SOURCE_GROUP_HEADER_FILES
|
||||
|
||||
set(SOURCE_GROUP_SOURCE_FILES
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimFixedTrajectoryWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimPointBasedWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimModeledWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPath.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimWellPathAttribute.cpp
|
||||
|
||||
+10
-10
@@ -16,7 +16,7 @@
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RimFixedTrajectoryWellPath.h"
|
||||
#include "RimPointBasedWellPath.h"
|
||||
|
||||
#include "Well/RigWellPath.h"
|
||||
|
||||
@@ -25,14 +25,14 @@
|
||||
#include "cafPdmObjectScriptingCapability.h"
|
||||
#include "cafPdmUiOrdering.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT( RimFixedTrajectoryWellPath, "FixedTrajectoryWellPath" );
|
||||
CAF_PDM_SOURCE_INIT( RimPointBasedWellPath, "PointBasedWellPath" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFixedTrajectoryWellPath::RimFixedTrajectoryWellPath()
|
||||
RimPointBasedWellPath::RimPointBasedWellPath()
|
||||
{
|
||||
CAF_PDM_InitScriptableObject( "Fixed Trajectory Well Path", ":/Well.svg", "", "FixedTrajectoryWellPath" );
|
||||
CAF_PDM_InitScriptableObject( "Point-Based Well Path", ":/Well.svg", "", "PointBasedWellPath" );
|
||||
|
||||
CAF_PDM_InitScriptableField( &m_trajectoryPoints, "TrajectoryPoints", std::vector<cvf::Vec3d>(), "Trajectory Points" );
|
||||
m_trajectoryPoints.uiCapability()->setUiHidden( true );
|
||||
@@ -41,14 +41,14 @@ RimFixedTrajectoryWellPath::RimFixedTrajectoryWellPath()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimFixedTrajectoryWellPath::~RimFixedTrajectoryWellPath()
|
||||
RimPointBasedWellPath::~RimPointBasedWellPath()
|
||||
{
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimFixedTrajectoryWellPath::setTrajectoryPoints( const std::vector<cvf::Vec3d>& wellTargets )
|
||||
void RimPointBasedWellPath::setTrajectoryPoints( const std::vector<cvf::Vec3d>& wellTargets )
|
||||
{
|
||||
m_trajectoryPoints = wellTargets;
|
||||
createWellPathGeometry();
|
||||
@@ -57,7 +57,7 @@ void RimFixedTrajectoryWellPath::setTrajectoryPoints( const std::vector<cvf::Vec
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<cvf::Vec3d> RimFixedTrajectoryWellPath::trajectoryPoints() const
|
||||
std::vector<cvf::Vec3d> RimPointBasedWellPath::trajectoryPoints() const
|
||||
{
|
||||
return m_trajectoryPoints();
|
||||
}
|
||||
@@ -65,7 +65,7 @@ std::vector<cvf::Vec3d> RimFixedTrajectoryWellPath::trajectoryPoints() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimFixedTrajectoryWellPath::createWellPathGeometry()
|
||||
void RimPointBasedWellPath::createWellPathGeometry()
|
||||
{
|
||||
if ( m_trajectoryPoints().empty() )
|
||||
{
|
||||
@@ -96,7 +96,7 @@ void RimFixedTrajectoryWellPath::createWellPathGeometry()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimFixedTrajectoryWellPath::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
void RimPointBasedWellPath::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
|
||||
{
|
||||
RimWellPath::defineUiOrdering( uiConfigName, uiOrdering );
|
||||
|
||||
@@ -107,7 +107,7 @@ void RimFixedTrajectoryWellPath::defineUiOrdering( QString uiConfigName, caf::Pd
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimFixedTrajectoryWellPath::initAfterRead()
|
||||
void RimPointBasedWellPath::initAfterRead()
|
||||
{
|
||||
createWellPathGeometry();
|
||||
}
|
||||
+3
-3
@@ -30,13 +30,13 @@
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimFixedTrajectoryWellPath : public RimWellPath
|
||||
class RimPointBasedWellPath : public RimWellPath
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
RimFixedTrajectoryWellPath();
|
||||
~RimFixedTrajectoryWellPath() override;
|
||||
RimPointBasedWellPath();
|
||||
~RimPointBasedWellPath() override;
|
||||
|
||||
void setTrajectoryPoints( const std::vector<cvf::Vec3d>& wellTargets );
|
||||
std::vector<cvf::Vec3d> trajectoryPoints() const;
|
||||
Reference in new issue
Block a user