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

#815 Renamed RimCrossSection -> RimIntersection

Browse Source
This commit is contained in:
Jacob Støren
2016-09-21 10:48:25 +02:00
parent e5cf69a3fe
commit 08baa5ccc9
19 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -75,7 +75,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
${CEE_CURRENT_LIST_DIR}RimWellLogFile.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h
${CEE_CURRENT_LIST_DIR}RimCrossSection.h
${CEE_CURRENT_LIST_DIR}RimIntersection.h
${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.h
${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.h
${CEE_CURRENT_LIST_DIR}RimGridCollection.h
@@ -166,7 +166,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp
${CEE_CURRENT_LIST_DIR}RimCrossSection.cpp
${CEE_CURRENT_LIST_DIR}RimIntersection.cpp
${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.cpp
${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.cpp
${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -23,7 +23,7 @@
#include "RimCaseCollection.h"
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
@@ -303,7 +303,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicAppendCrossSectionFeature";
}
else if (dynamic_cast<RimCrossSection*>(uiItem))
else if (dynamic_cast<RimIntersection*>(uiItem))
{
commandIds << "RicAppendCrossSectionFeature";
commandIds << "Separator";

14
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp
View File

@@ -19,7 +19,7 @@
#include "RimCrossSectionCollection.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimEclipseWell.h"
#include "RimView.h"
@@ -67,7 +67,7 @@ void RimCrossSectionCollection::applySingleColorEffect()
{
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
RimCrossSection* cs = m_crossSections[csIdx];
RimIntersection* cs = m_crossSections[csIdx];
if (cs->isActive)
{
cs->crossSectionPartMgr()->applySingleColorEffect();
@@ -82,7 +82,7 @@ void RimCrossSectionCollection::updateCellResultColor(size_t timeStepIndex)
{
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
RimCrossSection* cs = m_crossSections[csIdx];
RimIntersection* cs = m_crossSections[csIdx];
if (cs->isActive)
{
cs->crossSectionPartMgr()->updateCellResultColor(timeStepIndex);
@@ -99,7 +99,7 @@ void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, c
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
RimCrossSection* cs = m_crossSections[csIdx];
RimIntersection* cs = m_crossSections[csIdx];
if (cs->isActive)
{
cs->crossSectionPartMgr()->appendNativeCrossSectionFacesToModel(model, scaleTransform);
@@ -116,7 +116,7 @@ void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::appendCrossSection(RimCrossSection* crossSection)
void RimCrossSectionCollection::appendCrossSection(RimIntersection* crossSection)
{
m_crossSections.push_back(crossSection);
@@ -156,10 +156,10 @@ bool RimCrossSectionCollection::hasActiveCrossSectionForSimulationWell(RimEclips
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
RimCrossSection* cs = m_crossSections[csIdx];
RimIntersection* cs = m_crossSections[csIdx];
if (cs->isActive &&
cs->type() == RimCrossSection::CS_SIMULATION_WELL &&
cs->type() == RimIntersection::CS_SIMULATION_WELL &&
cs->simulationWell() == eclipseWell)
{
return true;

6
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.h
View File

@@ -23,7 +23,7 @@
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
class RimCrossSection;
class RimIntersection;
class RimEclipseCellColors;
class RimEclipseWell;
@@ -47,7 +47,7 @@ public:
caf::PdmField<bool> isActive;
void appendCrossSection(RimCrossSection* crossSection);
void appendCrossSection(RimIntersection* crossSection);
bool hasActiveCrossSectionForSimulationWell(RimEclipseWell* eclipseWell) const;
@@ -62,5 +62,5 @@ protected:
virtual caf::PdmFieldHandle* objectToggleField();
private:
caf::PdmChildArrayField<RimCrossSection*> m_crossSections;
caf::PdmChildArrayField<RimIntersection*> m_crossSections;
};

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -32,7 +32,7 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimCellEdgeColors.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"

58
ApplicationCode/ProjectDataModel/RimCrossSection.cpp → ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RiaApplication.h"
@@ -44,31 +44,31 @@
namespace caf {
template<>
void caf::AppEnum< RimCrossSection::CrossSectionEnum >::setUp()
void caf::AppEnum< RimIntersection::CrossSectionEnum >::setUp()
{
addItem(RimCrossSection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path");
addItem(RimCrossSection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well");
addItem(RimCrossSection::CS_POLYLINE, "CS_POLYLINE", "Polyline");
setDefault(RimCrossSection::CS_WELL_PATH);
addItem(RimIntersection::CS_WELL_PATH, "CS_WELL_PATH", "Well Path");
addItem(RimIntersection::CS_SIMULATION_WELL, "CS_SIMULATION_WELL", "Simulation Well");
addItem(RimIntersection::CS_POLYLINE, "CS_POLYLINE", "Polyline");
setDefault(RimIntersection::CS_WELL_PATH);
}
template<>
void caf::AppEnum< RimCrossSection::CrossSectionDirEnum >::setUp()
void caf::AppEnum< RimIntersection::CrossSectionDirEnum >::setUp()
{
addItem(RimCrossSection::CS_VERTICAL, "CS_VERTICAL", "Vertical");
addItem(RimCrossSection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal");
setDefault(RimCrossSection::CS_VERTICAL);
addItem(RimIntersection::CS_VERTICAL, "CS_VERTICAL", "Vertical");
addItem(RimIntersection::CS_HORIZONTAL, "CS_HORIZONTAL", "Horizontal");
setDefault(RimIntersection::CS_VERTICAL);
}
}
CAF_PDM_SOURCE_INIT(RimCrossSection, "CrossSection");
CAF_PDM_SOURCE_INIT(RimIntersection, "CrossSection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCrossSection::RimCrossSection()
RimIntersection::RimIntersection()
{
CAF_PDM_InitObject("Intersection", ":/CrossSection16x16.png", "", "");
@@ -98,7 +98,7 @@ RimCrossSection::RimCrossSection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCrossSection::~RimCrossSection()
RimIntersection::~RimIntersection()
{
}
@@ -106,7 +106,7 @@ RimCrossSection::~RimCrossSection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimIntersection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &isActive ||
changedField == &type ||
@@ -147,7 +147,7 @@ void RimCrossSection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimIntersection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&name);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Intersecting Geometry");
@@ -195,7 +195,7 @@ void RimCrossSection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCrossSection::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
@@ -256,7 +256,7 @@ QList<caf::PdmOptionItemInfo> RimCrossSection::calculateValueOptions(const caf::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCrossSection::userDescriptionField()
caf::PdmFieldHandle* RimIntersection::userDescriptionField()
{
return &name;
}
@@ -264,7 +264,7 @@ caf::PdmFieldHandle* RimCrossSection::userDescriptionField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCrossSection::objectToggleField()
caf::PdmFieldHandle* RimIntersection::objectToggleField()
{
return &isActive;
}
@@ -272,7 +272,7 @@ caf::PdmFieldHandle* RimCrossSection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseWellCollection* RimCrossSection::simulationWellCollection()
RimEclipseWellCollection* RimIntersection::simulationWellCollection()
{
RimEclipseView* eclipseView = NULL;
firstAnchestorOrThisOfType(eclipseView);
@@ -288,7 +288,7 @@ RimEclipseWellCollection* RimCrossSection::simulationWellCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
std::vector< std::vector <cvf::Vec3d> > RimIntersection::polyLines() const
{
std::vector< std::vector <cvf::Vec3d> > lines;
if (type == CS_WELL_PATH)
@@ -336,7 +336,7 @@ std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr()
RivIntersectionPartMgr* RimIntersection::crossSectionPartMgr()
{
if (m_crossSectionPartMgr.isNull()) m_crossSectionPartMgr = new RivIntersectionPartMgr(this);
@@ -346,7 +346,7 @@ RivIntersectionPartMgr* RimCrossSection::crossSectionPartMgr()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::updateWellCenterline() const
void RimIntersection::updateWellCenterline() const
{
if (isActive() && type == CS_SIMULATION_WELL && simulationWell())
{
@@ -366,7 +366,7 @@ void RimCrossSection::updateWellCenterline() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
void RimIntersection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
{
size_t lineVxCount = polyLine.size();
@@ -422,7 +422,7 @@ void RimCrossSection::addExtents(std::vector<cvf::Vec3d> &polyLine) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::updateWellExtentDefaultValue()
void RimIntersection::updateWellExtentDefaultValue()
{
RimCase* ownerCase = NULL;
firstAnchestorOrThisOfType(ownerCase);
@@ -440,7 +440,7 @@ void RimCrossSection::updateWellExtentDefaultValue()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::updateName()
void RimIntersection::updateName()
{
if (type == CS_SIMULATION_WELL && simulationWell())
{
@@ -460,7 +460,7 @@ void RimCrossSection::updateName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
void RimIntersection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
{
RimCase* ownerCase = NULL;
firstAnchestorOrThisOfType(ownerCase);
@@ -506,7 +506,7 @@ void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
void RimIntersection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
if (field == &inputFromViewerEnabled)
{
@@ -534,7 +534,7 @@ void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QS
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::appendPointToPolyLine(const cvf::Vec3d& point)
void RimIntersection::appendPointToPolyLine(const cvf::Vec3d& point)
{
m_userPolyline.v().push_back(point);
@@ -546,7 +546,7 @@ void RimCrossSection::appendPointToPolyLine(const cvf::Vec3d& point)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSection::rebuildGeometryAndScheduleCreateDisplayModel()
void RimIntersection::rebuildGeometryAndScheduleCreateDisplayModel()
{
m_crossSectionPartMgr = NULL;

6
ApplicationCode/ProjectDataModel/RimCrossSection.h → ApplicationCode/ProjectDataModel/RimIntersection.h
View File

@@ -39,7 +39,7 @@ class RivIntersectionPartMgr;
//
//
//==================================================================================================
class RimCrossSection : public caf::PdmObject
class RimIntersection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
@@ -58,8 +58,8 @@ public:
};
public:
RimCrossSection();
~RimCrossSection();
RimIntersection();
~RimIntersection();
caf::PdmField<QString> name;
caf::PdmField<bool> isActive;