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:09:37 +02:00
parent f734bf595b
commit 73057cdcdc
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,14 +5,14 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
endif() endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RicAppendCrossSectionFeature.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}RicNewWellPathCrossSectionFeature.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}RicAppendCrossSectionFeature.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}RicNewWellPathCrossSectionFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewPolylineCrossSectionFeature.cpp

22
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.cpp → ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicAppendCrossSectionFeature.h" #include "RicAppendIntersectionFeature.h"
#include "RimIntersection.h" #include "RimIntersection.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
@ -29,12 +29,12 @@
#include <QAction> #include <QAction>
CAF_CMD_SOURCE_INIT(RicAppendCrossSectionFeature, "RicAppendCrossSectionFeature"); CAF_CMD_SOURCE_INIT(RicAppendIntersectionFeature, "RicAppendIntersectionFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicAppendCrossSectionFeature::isCommandEnabled() bool RicAppendIntersectionFeature::isCommandEnabled()
{ {
return true; return true;
} }
@ -42,7 +42,7 @@ bool RicAppendCrossSectionFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked) void RicAppendIntersectionFeature::onActionTriggered(bool isChecked)
{ {
std::vector<caf::PdmObjectHandle*> collection; std::vector<caf::PdmObjectHandle*> collection;
caf::SelectionManager::instance()->objectsByType(&collection); caf::SelectionManager::instance()->objectsByType(&collection);
@ -53,14 +53,14 @@ void RicAppendCrossSectionFeature::onActionTriggered(bool isChecked)
CVF_ASSERT(crossSectionCollection); CVF_ASSERT(crossSectionCollection);
RicAppendCrossSectionFeatureCmd* cmd = new RicAppendCrossSectionFeatureCmd(crossSectionCollection); RicAppendIntersectionFeatureCmd* cmd = new RicAppendIntersectionFeatureCmd(crossSectionCollection);
caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd); caf::CmdExecCommandManager::instance()->processExecuteCommand(cmd);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup) void RicAppendIntersectionFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setIcon(QIcon(":/CrossSection16x16.png"));
actionToSetup->setText("New Intersection"); actionToSetup->setText("New Intersection");
@ -69,7 +69,7 @@ void RicAppendCrossSectionFeature::setupActionLook(QAction* actionToSetup)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection) RicAppendIntersectionFeatureCmd::RicAppendIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection)
: CmdExecuteCommand(NULL), : CmdExecuteCommand(NULL),
m_crossSectionCollection(crossSectionCollection) m_crossSectionCollection(crossSectionCollection)
{ {
@ -78,14 +78,14 @@ RicAppendCrossSectionFeatureCmd::RicAppendCrossSectionFeatureCmd(RimIntersection
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicAppendCrossSectionFeatureCmd::~RicAppendCrossSectionFeatureCmd() RicAppendIntersectionFeatureCmd::~RicAppendIntersectionFeatureCmd()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RicAppendCrossSectionFeatureCmd::name() QString RicAppendIntersectionFeatureCmd::name()
{ {
return "New Intersection"; return "New Intersection";
} }
@ -93,7 +93,7 @@ QString RicAppendCrossSectionFeatureCmd::name()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicAppendCrossSectionFeatureCmd::redo() void RicAppendIntersectionFeatureCmd::redo()
{ {
CVF_ASSERT(m_crossSectionCollection); CVF_ASSERT(m_crossSectionCollection);
@ -105,6 +105,6 @@ void RicAppendCrossSectionFeatureCmd::redo()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicAppendCrossSectionFeatureCmd::undo() void RicAppendIntersectionFeatureCmd::undo()
{ {
} }

8
ApplicationCode/Commands/CrossSectionCommands/RicAppendCrossSectionFeature.h → ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.h
View File

@ -29,11 +29,11 @@ class RimIntersectionCollection;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicAppendCrossSectionFeatureCmd : public caf::CmdExecuteCommand class RicAppendIntersectionFeatureCmd : public caf::CmdExecuteCommand
{ {
public: public:
RicAppendCrossSectionFeatureCmd(RimIntersectionCollection* crossSectionCollection); RicAppendIntersectionFeatureCmd(RimIntersectionCollection* crossSectionCollection);
virtual ~RicAppendCrossSectionFeatureCmd(); virtual ~RicAppendIntersectionFeatureCmd();
virtual QString name(); virtual QString name();
virtual void redo(); virtual void redo();
@ -48,7 +48,7 @@ private:
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicAppendCrossSectionFeature : public caf::CmdFeature class RicAppendIntersectionFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -301,11 +301,11 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
} }
else if (dynamic_cast<RimIntersectionCollection*>(uiItem)) else if (dynamic_cast<RimIntersectionCollection*>(uiItem))
{ {
commandIds << "RicAppendCrossSectionFeature"; commandIds << "RicAppendIntersectionFeature";
} }
else if (dynamic_cast<RimIntersection*>(uiItem)) else if (dynamic_cast<RimIntersection*>(uiItem))
{ {
commandIds << "RicAppendCrossSectionFeature"; commandIds << "RicAppendIntersectionFeature";
commandIds << "Separator"; commandIds << "Separator";
commandIds << "RicDeleteItemFeature"; commandIds << "RicDeleteItemFeature";
} }