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

#1495 Rename to FishboneWellPath and FishboneWellPathCollection

Browse Source
This commit is contained in:
Magne Sjaastad
2017-05-19 13:47:44 +02:00
parent d8dc62c5a7
commit fd254565e6
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@@ -43,7 +43,7 @@
#include "RimWellLogCurve.h"
#include "RimWellLogPlot.h"
#include "RimWellLogTrack.h"
#include "RimWellPathCompletion.h"
#include "RimFishboneWellPath.h"
#include "RimPerforationInterval.h"
#include "cafCmdExecCommandManager.h"
@@ -93,7 +93,7 @@ bool isDeletable(caf::PdmUiItem* uiItem)
if (dynamic_cast<RimIntersectionBox*>(uiItem)) return true;
if (dynamic_cast<RimFormationNames*>(uiItem)) return true;
if (dynamic_cast<RimFormationNamesCollection*>(uiItem)) return true;
if (dynamic_cast<RimWellPathCompletion*>(uiItem)) return true;
if (dynamic_cast<RimFishboneWellPath*>(uiItem)) return true;
if (dynamic_cast<RimFishbonesMultipleSubs*>(uiItem)) return true;
if (dynamic_cast<RimPerforationInterval*>(uiItem)) return true;

2
ApplicationCode/Commands/WellPathCommands/RicWellPathImportCompletionsFileFeature.cpp
View File

@@ -23,7 +23,7 @@
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellPathCompletionCollection.h"
#include "RimFishboneWellPathCollection.h"
#include "RiuMainWindow.h"

6
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@@ -28,8 +28,8 @@
#include "RimFishbonesMultipleSubs.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellPathCompletion.h"
#include "RimWellPathCompletionCollection.h"
#include "RimFishboneWellPath.h"
#include "RimFishboneWellPathCollection.h"
#include "RimPerforationInterval.h"
#include "RimPerforationCollection.h"
@@ -123,7 +123,7 @@ void RivWellPathPartMgr::appendCompletionsToModel(cvf::ModelBasicList* model, ca
if (!m_rimWellPath || !m_rimWellPath->m_completionCollection->isChecked()) return;
RivPipeGeometryGenerator geoGenerator;
for (RimWellPathCompletion* completion : m_rimWellPath->m_completionCollection()->m_completions())
for (RimFishboneWellPath* completion : m_rimWellPath->m_completionCollection()->m_completions())
{
if (!completion->isChecked()) continue;

20
ApplicationCode/ProjectDataModel/RimWellPathCompletion.cpp → ApplicationCode/ProjectDataModel/RimFishboneWellPath.cpp
View File

@@ -17,19 +17,19 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellPathCompletion.h"
#include "RimFishboneWellPath.h"
#include "RimProject.h"
#include "cafPdmUiListEditor.h"
#include "cafPdmUiTextEditor.h"
CAF_PDM_SOURCE_INIT(RimWellPathCompletion, "WellPathCompletion");
CAF_PDM_SOURCE_INIT(RimFishboneWellPath, "WellPathCompletion");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCompletion::RimWellPathCompletion()
RimFishboneWellPath::RimFishboneWellPath()
{
CAF_PDM_InitObject("WellPathCompletion", ":/Well.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_coordinates, "Coordinates", "Coordinates", "", "", "");
@@ -39,7 +39,7 @@ RimWellPathCompletion::RimWellPathCompletion()
m_name.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_displayCoordinates, "DisplayCoordinates", "Coordinates", "", "", "");
m_displayCoordinates.registerGetMethod(this, &RimWellPathCompletion::displayCoordinates);
m_displayCoordinates.registerGetMethod(this, &RimFishboneWellPath::displayCoordinates);
m_displayCoordinates.uiCapability()->setUiReadOnly(true);
m_displayCoordinates.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
m_displayCoordinates.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::TOP);
@@ -49,14 +49,14 @@ RimWellPathCompletion::RimWellPathCompletion()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCompletion::~RimWellPathCompletion()
RimFishboneWellPath::~RimFishboneWellPath()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletion::setCoordinates(std::vector< cvf::Vec3d > coordinates)
void RimFishboneWellPath::setCoordinates(std::vector< cvf::Vec3d > coordinates)
{
m_coordinates = coordinates;
}
@@ -64,7 +64,7 @@ void RimWellPathCompletion::setCoordinates(std::vector< cvf::Vec3d > coordinates
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletion::setMeasuredDepths(std::vector< double > measuredDepths)
void RimFishboneWellPath::setMeasuredDepths(std::vector< double > measuredDepths)
{
m_measuredDepths = measuredDepths;
}
@@ -72,7 +72,7 @@ void RimWellPathCompletion::setMeasuredDepths(std::vector< double > measuredDept
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletion::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimFishboneWellPath::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimProject* proj;
this->firstAncestorOrThisOfType(proj);
@@ -82,7 +82,7 @@ void RimWellPathCompletion::fieldChangedByUi(const caf::PdmFieldHandle* changedF
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletion::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimFishboneWellPath::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_displayCoordinates);
}
@@ -90,7 +90,7 @@ void RimWellPathCompletion::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellPathCompletion::displayCoordinates() const
QString RimFishboneWellPath::displayCoordinates() const
{
CVF_ASSERT(m_coordinates().size() == m_measuredDepths().size());

6
ApplicationCode/ProjectDataModel/RimWellPathCompletion.h → ApplicationCode/ProjectDataModel/RimFishboneWellPath.h
View File

@@ -41,13 +41,13 @@
///
///
//==================================================================================================
class RimWellPathCompletion : public RimCheckableNamedObject
class RimFishboneWellPath : public RimCheckableNamedObject
{
CAF_PDM_HEADER_INIT;
public:
RimWellPathCompletion();
virtual ~RimWellPathCompletion();
RimFishboneWellPath();
virtual ~RimFishboneWellPath();
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

18
ApplicationCode/ProjectDataModel/RimWellPathCompletionCollection.cpp → ApplicationCode/ProjectDataModel/RimFishboneWellPathCollection.cpp
View File

@@ -17,10 +17,10 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellPathCompletionCollection.h"
#include "RimFishboneWellPathCollection.h"
#include "RimEclipseWell.h"
#include "RimWellPathCompletion.h"
#include "RimFishboneWellPath.h"
#include "RimView.h"
#include "RimProject.h"
@@ -31,12 +31,12 @@
#include "RiuMainWindow.h"
CAF_PDM_SOURCE_INIT(RimWellPathCompletionCollection, "WellPathCompletionCollection");
CAF_PDM_SOURCE_INIT(RimFishboneWellPathCollection, "WellPathCompletionCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCompletionCollection::RimWellPathCompletionCollection()
RimFishboneWellPathCollection::RimFishboneWellPathCollection()
{
CAF_PDM_InitObject("WellPathCompletions", ":/WellCollection.png", "", "");
@@ -50,7 +50,7 @@ RimWellPathCompletionCollection::RimWellPathCompletionCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCompletionCollection::~RimWellPathCompletionCollection()
RimFishboneWellPathCollection::~RimFishboneWellPathCollection()
{
m_completions.deleteAllChildObjects();
}
@@ -58,7 +58,7 @@ RimWellPathCompletionCollection::~RimWellPathCompletionCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletionCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimFishboneWellPathCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted(proj);
@@ -68,7 +68,7 @@ void RimWellPathCompletionCollection::fieldChangedByUi(const caf::PdmFieldHandle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletionCollection::appendCompletion(RimWellPathCompletion* completion)
void RimFishboneWellPathCollection::appendCompletion(RimFishboneWellPath* completion)
{
m_completions.push_back(completion);
@@ -88,7 +88,7 @@ void RimWellPathCompletionCollection::appendCompletion(RimWellPathCompletion* co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathCompletionCollection::importCompletionsFromFile(const QList<QString> filePaths)
void RimFishboneWellPathCollection::importCompletionsFromFile(const QList<QString> filePaths)
{
RifWellPathImporter wellPathImporter;
@@ -98,7 +98,7 @@ void RimWellPathCompletionCollection::importCompletionsFromFile(const QList<QStr
for (size_t i = 0; i < wellDataCount; ++i)
{
RifWellPathImporter::WellData wellData = wellPathImporter.readWellData(filePath, i);
RimWellPathCompletion* wellCompletion = new RimWellPathCompletion();
RimFishboneWellPath* wellCompletion = new RimFishboneWellPath();
wellCompletion->setName(wellData.m_name);
wellCompletion->setCoordinates(wellData.m_wellPathGeometry->m_wellPathPoints);
wellCompletion->setMeasuredDepths(wellData.m_wellPathGeometry->m_measuredDepths);

12
ApplicationCode/ProjectDataModel/RimWellPathCompletionCollection.h → ApplicationCode/ProjectDataModel/RimFishboneWellPathCollection.h
View File

@@ -20,7 +20,7 @@
#pragma once
#include "RimCheckableNamedObject.h"
#include "RimWellPathCompletion.h"
#include "RimFishboneWellPath.h"
#include "cafPdmObject.h"
#include "cafPdmChildArrayField.h"
@@ -31,18 +31,18 @@
//
//
//==================================================================================================
class RimWellPathCompletionCollection : public RimCheckableNamedObject
class RimFishboneWellPathCollection : public RimCheckableNamedObject
{
CAF_PDM_HEADER_INIT;
public:
RimWellPathCompletionCollection();
~RimWellPathCompletionCollection();
RimFishboneWellPathCollection();
~RimFishboneWellPathCollection();
void appendCompletion(RimWellPathCompletion* completion);
void appendCompletion(RimFishboneWellPath* completion);
void importCompletionsFromFile(const QList<QString> filePaths);
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
caf::PdmChildArrayField<RimWellPathCompletion*> m_completions;
caf::PdmChildArrayField<RimFishboneWellPath*> m_completions;
};

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -30,7 +30,7 @@
#include "RimWellLogFile.h"
#include "RimWellLogPlotCollection.h"
#include "RimWellPathCollection.h"
#include "RimWellPathCompletionCollection.h"
#include "RimFishboneWellPathCollection.h"
#include "RimPerforationCollection.h"
#include "RimFishbonesMultipleSubs.h"
@@ -105,7 +105,7 @@ RimWellPath::RimWellPath()
CAF_PDM_InitField(&wellPathColor, "WellPathColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Well path color", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_completionCollection, "Completions", "Completions", "", "", "");
m_completionCollection = new RimWellPathCompletionCollection;
m_completionCollection = new RimFishboneWellPathCollection;
m_completionCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_perforationCollection, "Perforations", "Perforations", "", "", "");

4
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@@ -36,7 +36,7 @@ class RifWellPathImporter;
class RigWellPath;
class RimProject;
class RimWellLogFile;
class RimWellPathCompletionCollection;
class RimFishboneWellPathCollection;
class RivWellPathPartMgr;
class RimFishbonesMultipleSubs;
@@ -73,7 +73,7 @@ public:
caf::PdmField<double> wellPathRadiusScaleFactor;
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
caf::PdmChildField<RimWellPathCompletionCollection*> m_completionCollection;
caf::PdmChildField<RimFishboneWellPathCollection*> m_completionCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
RigWellPath* wellPathGeometry();