OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05: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
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
#include "RicAppendCrossSectionFeature.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "cafCmdExecCommandManager.h"
@@ -97,7 +97,7 @@ void RicAppendCrossSectionFeatureCmd::redo()
{
CVF_ASSERT(m_crossSectionCollection);
RimCrossSection* crossSection = new RimCrossSection();
RimIntersection* crossSection = new RimIntersection();
crossSection->name = QString("Intersection");
m_crossSectionCollection->appendCrossSection(crossSection);
}
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp
+5 -5
View File
@@ -22,7 +22,7 @@
#include "RiaApplication.h"
#include "RimCase.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimView.h"
@@ -80,7 +80,7 @@ void RicNewPolylineCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
{
std::vector<RimCrossSection*> selection;
std::vector<RimIntersection*> selection;
caf::SelectionManager::instance()->objectsByType(&selection);
if (selection.size() == 1)
@@ -88,7 +88,7 @@ bool RicNewPolylineCrossSectionFeature::handleEvent(cvf::Object* eventObject)
RicViewerEventObject* polylineUiEvent = dynamic_cast<RicViewerEventObject*>(eventObject);
if (polylineUiEvent)
{
RimCrossSection* crossSection = selection[0];
RimIntersection* crossSection = selection[0];
if (crossSection->inputFromViewerEnabled())
{
RimCase* rimCase = NULL;
@@ -137,9 +137,9 @@ void RicNewPolylineCrossSectionFeatureCmd::redo()
{
CVF_ASSERT(m_crossSectionCollection);
RimCrossSection* crossSection = new RimCrossSection();
RimIntersection* crossSection = new RimIntersection();
crossSection->name = "Polyline";
crossSection->type = RimCrossSection::CS_POLYLINE;
crossSection->type = RimIntersection::CS_POLYLINE;
crossSection->inputFromViewerEnabled = true;
m_crossSectionCollection->appendCrossSection(crossSection);
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellCrossSectionFeature.cpp
+3 -3
View File
@@ -19,7 +19,7 @@
#include "RicNewSimWellCrossSectionFeature.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
@@ -102,9 +102,9 @@ void RicNewSimWellCrossSectionCmd::redo()
CVF_ASSERT(m_crossSectionCollection);
CVF_ASSERT(m_wellPath);
RimCrossSection* crossSection = new RimCrossSection();
RimIntersection* crossSection = new RimIntersection();
crossSection->name = m_wellPath->name;
crossSection->type = RimCrossSection::CS_SIMULATION_WELL;
crossSection->type = RimIntersection::CS_SIMULATION_WELL;
crossSection->simulationWell = m_wellPath;
m_crossSectionCollection->appendCrossSection(crossSection);
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp
+3 -3
View File
@@ -21,7 +21,7 @@
#include "RiaApplication.h"
#include "RimCrossSection.h"
#include "RimIntersection.h"
#include "RimCrossSectionCollection.h"
#include "RimWellPath.h"
#include "RimView.h"
@@ -111,9 +111,9 @@ void RicNewWellPathCrossSectionFeatureCmd::redo()
CVF_ASSERT(m_crossSectionCollection);
CVF_ASSERT(m_wellPath);
RimCrossSection* crossSection = new RimCrossSection();
RimIntersection* crossSection = new RimIntersection();
crossSection->name = m_wellPath->name;
crossSection->type = RimCrossSection::CS_WELL_PATH;
crossSection->type = RimIntersection::CS_WELL_PATH;
crossSection->wellPath = m_wellPath;
m_crossSectionCollection->appendCrossSection(crossSection);