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 More renaming CrossSection -> Intersection

Browse Source
This commit is contained in:
Jacob Støren 2016-09-21 11:38:37 +02:00
parent 73057cdcdc
commit d549f45ad0
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake
View File

@ -7,14 +7,14 @@ endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h
${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.h
${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.h
${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.h ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewSimWellCrossSectionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewWellPathCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp
) )

24
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.cpp → ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicNewWellPathCrossSectionFeature.h" #include "RicNewWellPathIntersectionFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
@ -33,12 +33,12 @@
#include <QAction> #include <QAction>
CAF_CMD_SOURCE_INIT(RicNewWellPathCrossSectionFeature, "RicNewWellPathCrossSectionFeature"); CAF_CMD_SOURCE_INIT(RicNewWellPathIntersectionFeature, "RicNewWellPathIntersectionFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicNewWellPathCrossSectionFeature::RicNewWellPathCrossSectionFeature() RicNewWellPathIntersectionFeature::RicNewWellPathIntersectionFeature()
{ {
} }
@ -46,7 +46,7 @@ RicNewWellPathCrossSectionFeature::RicNewWellPathCrossSectionFeature()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicNewWellPathCrossSectionFeature::isCommandEnabled() bool RicNewWellPathIntersectionFeature::isCommandEnabled()
{ {
return true; return true;
} }
@ -54,7 +54,7 @@ bool RicNewWellPathCrossSectionFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathCrossSectionFeature::onActionTriggered(bool isChecked) void RicNewWellPathIntersectionFeature::onActionTriggered(bool isChecked)
{ {
RimView* activeView = RiaApplication::instance()->activeReservoirView(); RimView* activeView = RiaApplication::instance()->activeReservoirView();
if (!activeView) return; if (!activeView) return;
@ -65,14 +65,14 @@ void RicNewWellPathCrossSectionFeature::onActionTriggered(bool isChecked)
RimWellPath* wellPath = collection[0]; RimWellPath* wellPath = collection[0];
RicNewWellPathCrossSectionFeatureCmd* cmd = new RicNewWellPathCrossSectionFeatureCmd(activeView->crossSectionCollection, wellPath); RicNewWellPathIntersectionFeatureCmd* cmd = new RicNewWellPathIntersectionFeatureCmd(activeView->crossSectionCollection, wellPath);
caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd); caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup) void RicNewWellPathIntersectionFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
actionToSetup->setText("New Intersection"); actionToSetup->setText("New Intersection");
@ -81,7 +81,7 @@ void RicNewWellPathCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath) RicNewWellPathIntersectionFeatureCmd::RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath)
: CmdExecuteCommand(NULL), : CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection), m_crossSectionCollection(crossSectionCollection),
m_wellPath(wellPath) m_wellPath(wellPath)
@ -91,14 +91,14 @@ RicNewWellPathCrossSectionFeatureCmd::RicNewWellPathCrossSectionFeatureCmd(RimIn
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicNewWellPathCrossSectionFeatureCmd::~RicNewWellPathCrossSectionFeatureCmd() RicNewWellPathIntersectionFeatureCmd::~RicNewWellPathIntersectionFeatureCmd()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RicNewWellPathCrossSectionFeatureCmd::name() QString RicNewWellPathIntersectionFeatureCmd::name()
{ {
return "Create Intersection From Well Path"; return "Create Intersection From Well Path";
} }
@ -106,7 +106,7 @@ QString RicNewWellPathCrossSectionFeatureCmd::name()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathCrossSectionFeatureCmd::redo() void RicNewWellPathIntersectionFeatureCmd::redo()
{ {
CVF_ASSERT(m_crossSectionCollection); CVF_ASSERT(m_crossSectionCollection);
CVF_ASSERT(m_wellPath); CVF_ASSERT(m_wellPath);
@ -122,6 +122,6 @@ void RicNewWellPathCrossSectionFeatureCmd::redo()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathCrossSectionFeatureCmd::undo() void RicNewWellPathIntersectionFeatureCmd::undo()
{ {
} }

10
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathCrossSectionFeature.h → ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.h
View File

@ -30,11 +30,11 @@ class RimWellPath;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicNewWellPathCrossSectionFeatureCmd : public caf::CmdExecuteCommand class RicNewWellPathIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
RicNewWellPathCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath); RicNewWellPathIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection, RimWellPath* wellPath);
virtual ~RicNewWellPathCrossSectionFeatureCmd(); virtual ~RicNewWellPathIntersectionFeatureCmd();
virtual QString name(); virtual QString name();
virtual void redo(); virtual void redo();
@ -50,12 +50,12 @@ private:
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicNewWellPathCrossSectionFeature : public caf::CmdFeature class RicNewWellPathIntersectionFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
public: public:
RicNewWellPathCrossSectionFeature(); RicNewWellPathIntersectionFeature();
protected: protected:
// Overrides // Overrides

2
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -213,7 +213,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{ {
commandIds << "RicNewWellLogFileCurveFeature"; commandIds << "RicNewWellLogFileCurveFeature";
commandIds << "RicNewWellLogCurveExtractionFeature"; commandIds << "RicNewWellLogCurveExtractionFeature";
commandIds << "RicNewWellPathCrossSectionFeature"; commandIds << "RicNewWellPathIntersectionFeature";
commandIds << "RicWellPathDeleteFeature"; commandIds << "RicWellPathDeleteFeature";
} }
else if (dynamic_cast<RimCalcScript*>(uiItem)) else if (dynamic_cast<RimCalcScript*>(uiItem))

2
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -255,7 +255,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
commandIds << "RicNewWellLogFileCurveFeature"; commandIds << "RicNewWellLogFileCurveFeature";
commandIds << "RicNewWellLogCurveExtractionFeature"; commandIds << "RicNewWellLogCurveExtractionFeature";
commandIds << "RicNewWellPathCrossSectionFeature"; commandIds << "RicNewWellPathIntersectionFeature";
} }
} }