OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#815 Renamed RimCrossSectionCollection -> RimIntersectionCollection

Browse Source
This commit is contained in:
Jacob Støren 2016-09-21 10:52:16 +02:00
parent 08baa5ccc9
commit f734bf595b
18 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RicAppendCrossSectionFeature.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "cafCmdExecCommandManager.h"
#include "cafSelectionManager.h"
@ -48,7 +48,7 @@ void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked)
caf::SelectionManager::instance()->objectsByType(&collection);
CVF_ASSERT(collection.size() == 1);
RimCrossSectionCollection* crossSectionCollection = NULL;
RimIntersectionCollection* crossSectionCollection = NULL;
collection[0]->firstAnchestorOrThisOfType(crossSectionCollection);
CVF_ASSERT(crossSectionCollection);
@ -69,7 +69,7 @@ void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection)
RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection)
: CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection)
{

6
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.h
View File

@ -23,7 +23,7 @@
#include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h"
class RimCrossSectionCollection;
class RimIntersectionCollection;
//==================================================================================================
@ -32,7 +32,7 @@ class RimCrossSectionCollection;
class RicAppendCrossSectionFeatureCmd : public caf::CmdExecuteCommand
{
public:
RicAppendCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection);
RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection);
virtual ~RicAppendCrossSectionFeatureCmd();
virtual QString name();
@ -40,7 +40,7 @@ public:
virtual void undo();
private:
caf::PdmPointer<RimCrossSectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimIntersectionCollection> m_crossSectionCollection;
};

4
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp
View File

@ -23,7 +23,7 @@
#include "RimCase.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimView.h"
#include "RiuMainWindow.h"
@ -109,7 +109,7 @@ bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewPolylineCrossSectionFeatureCmd::RicNewPolylineCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection)
RicNewPolylineCrossSectionFeatureCmd::RicNewPolylineCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection)
: CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection)
{

6
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.h
View File

@ -28,7 +28,7 @@
#include "cvfObject.h"
#include "cvfVector3.h"
class RimCrossSectionCollection;
class RimIntersectionCollection;
//==================================================================================================
@ -37,7 +37,7 @@ class RimCrossSectionCollection;
class RicNewPolylineCrossSectionFeatureCmd : public caf::CmdExecuteCommand
{
public:
RicNewPolylineCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection);
RicNewPolylineCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection);
virtual ~RicNewPolylineCrossSectionFeatureCmd();
virtual QString name();
@ -45,7 +45,7 @@ public:
virtual void undo();
private:
caf::PdmPointer<RimCrossSectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimIntersectionCollection> m_crossSectionCollection;
};

4
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellCrossSectionFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RicNewSimWellCrossSectionFeature.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
@ -72,7 +72,7 @@ void RicNewSimWellCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewSimWellCrossSectionCmd::RicNewSimWellCrossSectionCmd(RimCrossSectionCollection* crossSectionCollection, RimEclipseWell* simWell)
RicNewSimWellCrossSectionCmd::RicNewSimWellCrossSectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell)
: CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection),
m_wellPath(simWell)

6
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellCrossSectionFeature.h
View File

@ -23,7 +23,7 @@
#include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h"
class RimCrossSectionCollection;
class RimIntersectionCollection;
class RimEclipseWell;
@ -33,7 +33,7 @@ class RimEclipseWell;
class RicNewSimWellCrossSectionCmd : public caf::CmdExecuteCommand
{
public:
RicNewSimWellCrossSectionCmd(RimCrossSectionCollection* crossSectionCollection, RimEclipseWell* simWell);
RicNewSimWellCrossSectionCmd(RimIntersectionCollection* crossSectionCollection, RimEclipseWell* simWell);
virtual ~RicNewSimWellCrossSectionCmd();
virtual QString name();
@ -41,7 +41,7 @@ public:
virtual void undo();
private:
caf::PdmPointer<RimCrossSectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimIntersectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimEclipseWell> m_wellPath;
};

4
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimWellPath.h"
#include "RimView.h"
@ -81,7 +81,7 @@ void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection, RimWellPath* wellPath)
RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath)
: CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection),
m_wellPath(wellPath)

6
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.h
View File

@ -23,7 +23,7 @@
#include "cafCmdExecuteCommand.h"
#include "cafPdmPointer.h"
class RimCrossSectionCollection;
class RimIntersectionCollection;
class RimWellPath;
@ -33,7 +33,7 @@ class RimWellPath;
class RicNewWellPathCrossSectionFeatureCmd : public caf::CmdExecuteCommand
{
public:
RicNewWellPathCrossSectionFeatureCmd(RimCrossSectionCollection* crossSectionCollection, RimWellPath* wellPath);
RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath);
virtual ~RicNewWellPathCrossSectionFeatureCmd();
virtual QString name();
@ -41,7 +41,7 @@ public:
virtual void undo();
private:
caf::PdmPointer<RimCrossSectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimIntersectionCollection> m_crossSectionCollection;
caf::PdmPointer<RimWellPath> m_wellPath;
};

4
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -22,7 +22,7 @@
#include "RicDeleteItemExecData.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimProject.h"
@ -103,7 +103,7 @@ void RicDeleteItemExec::redo()
view->scheduleCreateDisplayModelAndRedraw();
}
RimCrossSectionCollection* crossSectionColl;
RimIntersectionCollection* crossSectionColl;
parentObj->firstAnchestorOrThisOfType(crossSectionColl);
if (view && crossSectionColl)
{

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -76,7 +76,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogFile.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h
${CEE_CURRENT_LIST_DIR}RimIntersection.h
${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.h
${CEE_CURRENT_LIST_DIR}RimIntersectionCollection.h
${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.h
${CEE_CURRENT_LIST_DIR}RimGridCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h
@ -167,7 +167,7 @@ ${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp
${CEE_CURRENT_LIST_DIR}RimIntersection.cpp
${CEE_CURRENT_LIST_DIR}RimCrossSectionCollection.cpp
${CEE_CURRENT_LIST_DIR}RimIntersectionCollection.cpp
${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.cpp
${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -24,7 +24,7 @@
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
@ -299,7 +299,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicAddWellLogToPlotFeature";
}
else if (dynamic_cast<RimCrossSectionCollection*>(uiItem))
else if (dynamic_cast<RimIntersectionCollection*>(uiItem))
{
commandIds << "RicAppendCrossSectionFeature";
}

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -33,7 +33,7 @@
#include "RimCellEdgeColors.h"
#include "RimCellRangeFilterCollection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"

2
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
View File

@ -20,7 +20,7 @@
#include "RimEclipseWell.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWellCollection.h"

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -30,7 +30,7 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"

22
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.cpp → ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimIntersection.h"
#include "RimEclipseWell.h"
@ -28,12 +28,12 @@
#include "RivIntersectionPartMgr.h"
CAF_PDM_SOURCE_INIT(RimCrossSectionCollection, "CrossSectionCollection");
CAF_PDM_SOURCE_INIT(RimIntersectionCollection, "CrossSectionCollection");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCrossSectionCollection::RimCrossSectionCollection()
RimIntersectionCollection::RimIntersectionCollection()
{
CAF_PDM_InitObject("Intersections", ":/CrossSections16x16.png", "", "");
@ -47,7 +47,7 @@ RimCrossSectionCollection::RimCrossSectionCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCrossSectionCollection::~RimCrossSectionCollection()
RimIntersectionCollection::~RimIntersectionCollection()
{
m_crossSections.deleteAllChildObjects();
}
@ -55,7 +55,7 @@ RimCrossSectionCollection::~RimCrossSectionCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCrossSectionCollection::objectToggleField()
caf::PdmFieldHandle* RimIntersectionCollection::objectToggleField()
{
return &isActive;
}
@ -63,7 +63,7 @@ caf::PdmFieldHandle* RimCrossSectionCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::applySingleColorEffect()
void RimIntersectionCollection::applySingleColorEffect()
{
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
@ -78,7 +78,7 @@ void RimCrossSectionCollection::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::updateCellResultColor(size_t timeStepIndex)
void RimIntersectionCollection::updateCellResultColor(size_t timeStepIndex)
{
for (size_t csIdx = 0; csIdx < m_crossSections.size(); ++csIdx)
{
@ -93,7 +93,7 @@ void RimCrossSectionCollection::updateCellResultColor(size_t timeStepIndex)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform)
void RimIntersectionCollection::appendPartsToModel(cvf::ModelBasicList* model, cvf::Transform* scaleTransform)
{
if (!isActive) return;
@ -116,7 +116,7 @@ void RimCrossSectionCollection::appendPartsToModel(cvf::ModelBasicList* model, c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::appendCrossSection(RimIntersection* crossSection)
void RimIntersectionCollection::appendCrossSection(RimIntersection* crossSection)
{
m_crossSections.push_back(crossSection);
@ -134,7 +134,7 @@ void RimCrossSectionCollection::appendCrossSection(RimIntersection* crossSection
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCrossSectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimIntersectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &isActive)
{
@ -150,7 +150,7 @@ void RimCrossSectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimCrossSectionCollection::hasActiveCrossSectionForSimulationWell(RimEclipseWell* eclipseWell) const
bool RimIntersectionCollection::hasActiveCrossSectionForSimulationWell(RimEclipseWell* eclipseWell) const
{
if (!isActive) return false;

6
ApplicationCode/ProjectDataModel/RimCrossSectionCollection.h → ApplicationCode/ProjectDataModel/RimIntersectionCollection.h
View File

@ -37,13 +37,13 @@ namespace cvf {
//
//
//==================================================================================================
class RimCrossSectionCollection : public caf::PdmObject
class RimIntersectionCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimCrossSectionCollection();
~RimCrossSectionCollection();
RimIntersectionCollection();
~RimIntersectionCollection();
caf::PdmField<bool> isActive;

4
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@ -7,7 +7,7 @@
#include "Rim3dOverlayInfoConfig.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCrossSectionCollection.h"
#include "RimIntersectionCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimGridCollection.h"
@ -125,7 +125,7 @@ RimView::RimView(void)
CAF_PDM_InitFieldNoDefault(&crossSectionCollection, "CrossSections", "Intersections", "", "", "");
crossSectionCollection.uiCapability()->setUiHidden(true);
crossSectionCollection = new RimCrossSectionCollection();
crossSectionCollection = new RimIntersectionCollection();
CAF_PDM_InitFieldNoDefault(&intersectionBoxCollection, "IntersectionBoxes", "Intersection Boxes", "", "", "");
intersectionBoxCollection.uiCapability()->setUiHidden(true);

4
ApplicationCode/ProjectDataModel/RimView.h
View File

@ -44,7 +44,7 @@ class Rim3dOverlayInfoConfig;
class RimCase;
class RimCellRangeFilter;
class RimCellRangeFilterCollection;
class RimCrossSectionCollection;
class RimIntersectionCollection;
class RimGridCollection;
class RimIntersectionBoxCollection;
class RimPropertyFilterCollection;
@ -97,7 +97,7 @@ public:
void replaceRangeFilterCollectionWithOverride();
caf::PdmChildField<RimCrossSectionCollection*> crossSectionCollection;
caf::PdmChildField<RimIntersectionCollection*> crossSectionCollection;
caf::PdmChildField<RimIntersectionBoxCollection*> intersectionBoxCollection;
// Draw style