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

Renamed files

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-12 21:09:03 +02:00
parent 9bee1b81fc
commit bf5dae4887
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@@ -40,9 +40,9 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.h
${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.h ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.h
${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h
${CEE_CURRENT_LIST_DIR}RicImportWellPathsSsihubFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h
${CEE_CURRENT_LIST_DIR}RicImportWellPathsFileFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h
${CEE_CURRENT_LIST_DIR}RicImportWellPathsDeleteAllFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.h
# General delete of any object in a child array field # General delete of any object in a child array field
${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.h ${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.h
@@ -85,9 +85,9 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.cpp
${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputProperty.cpp
${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
${CEE_CURRENT_LIST_DIR}RicImportWellPathsSsihubFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp
${CEE_CURRENT_LIST_DIR}RicImportWellPathsFileFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp
${CEE_CURRENT_LIST_DIR}RicImportWellPathsDeleteAllFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathsDeleteAllFeature.cpp
# General delete of any object in a child array field # General delete of any object in a child array field
${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.cpp ${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.cpp

2
ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.cpp → ApplicationCode/Commands/RicWellPathsDeleteAllFeature.cpp
View File

@@ -34,7 +34,7 @@
// //
//################################################################################################## //##################################################################################################
#include "RicImportWellPathsDeleteAllFeature.h" #include "RicWellPathsDeleteAllFeature.h"
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"

0
ApplicationCode/Commands/RicImportWellPathsDeleteAllFeature.h → ApplicationCode/Commands/RicWellPathsDeleteAllFeature.h
View File

10
ApplicationCode/Commands/RicImportWellPathsFileFeature.cpp → ApplicationCode/Commands/RicWellPathsImportFileFeature.cpp
View File

@@ -34,7 +34,7 @@
// //
//################################################################################################## //##################################################################################################
#include "RicImportWellPathsFileFeature.h" #include "RicWellPathsImportFileFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RimProject.h" #include "RimProject.h"
@@ -45,13 +45,13 @@
namespace caf namespace caf
{ {
CAF_CMD_SOURCE_INIT(RicImportWellPathsFileFeature, "RicImportWellPathsFileFeature"); CAF_CMD_SOURCE_INIT(RicWellPathsImportFileFeature, "RicWellPathsImportFileFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicImportWellPathsFileFeature::isCommandEnabled() bool RicWellPathsImportFileFeature::isCommandEnabled()
{ {
return true; return true;
} }
@@ -59,7 +59,7 @@ bool RicImportWellPathsFileFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicImportWellPathsFileFeature::onActionTriggered(bool isChecked) void RicWellPathsImportFileFeature::onActionTriggered(bool isChecked)
{ {
// Open dialog box to select well path files // Open dialog box to select well path files
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
@@ -81,7 +81,7 @@ void RicImportWellPathsFileFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicImportWellPathsFileFeature::setupActionLook(QAction* actionToSetup) void RicWellPathsImportFileFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Import &Well Paths from File"); actionToSetup->setText("Import &Well Paths from File");
actionToSetup->setIcon(QIcon(":/Well.png")); actionToSetup->setIcon(QIcon(":/Well.png"));

2
ApplicationCode/Commands/RicImportWellPathsFileFeature.h → ApplicationCode/Commands/RicWellPathsImportFileFeature.h
View File

@@ -45,7 +45,7 @@ namespace caf
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicImportWellPathsFileFeature : public CmdFeature class RicWellPathsImportFileFeature : public CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:

10
ApplicationCode/Commands/RicImportWellPathsSsihubFeature.cpp → ApplicationCode/Commands/RicWellPathsImportSsihubFeature.cpp
View File

@@ -34,7 +34,7 @@
// //
//################################################################################################## //##################################################################################################
#include "RicImportWellPathsSsihubFeature.h" #include "RicWellPathsImportSsihubFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
@@ -50,13 +50,13 @@
namespace caf namespace caf
{ {
CAF_CMD_SOURCE_INIT(RicImportWellPathsSsihubFeature, "RicImportWellPathsSsihubFeature"); CAF_CMD_SOURCE_INIT(RicWellPathsImportSsihubFeature, "RicWellPathsImportSsihubFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicImportWellPathsSsihubFeature::isCommandEnabled() bool RicWellPathsImportSsihubFeature::isCommandEnabled()
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
if (!app->project()) if (!app->project())
@@ -75,7 +75,7 @@ bool RicImportWellPathsSsihubFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicImportWellPathsSsihubFeature::onActionTriggered(bool isChecked) void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
if (!app->project()) if (!app->project())
@@ -137,7 +137,7 @@ void RicImportWellPathsSsihubFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicImportWellPathsSsihubFeature::setupActionLook(QAction* actionToSetup) void RicWellPathsImportSsihubFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Import Well Paths from &SSI-hub"); actionToSetup->setText("Import Well Paths from &SSI-hub");
actionToSetup->setIcon(QIcon(":/WellCollection.png")); actionToSetup->setIcon(QIcon(":/WellCollection.png"));

2
ApplicationCode/Commands/RicImportWellPathsSsihubFeature.h → ApplicationCode/Commands/RicWellPathsImportSsihubFeature.h
View File

@@ -45,7 +45,7 @@ namespace caf
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicImportWellPathsSsihubFeature : public CmdFeature class RicWellPathsImportSsihubFeature : public CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -602,8 +602,8 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
} }
else if (dynamic_cast<RimWellPathCollection*>(uiItem)) else if (dynamic_cast<RimWellPathCollection*>(uiItem))
{ {
actions.push_back(commandManager->action("RicImportWellPathsSsihubFeature")); actions.push_back(commandManager->action("RicWellPathsImportSsihubFeature"));
actions.push_back(commandManager->action("RicImportWellPathsFileFeature")); actions.push_back(commandManager->action("RicWellPathsImportFileFeature"));
actions.push_back(commandManager->action("RicWellPathsDeleteAllFeature")); actions.push_back(commandManager->action("RicWellPathsDeleteAllFeature"));
} }
else if (dynamic_cast<RimWellPath*>(uiItem)) else if (dynamic_cast<RimWellPath*>(uiItem))

4
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -1002,7 +1002,7 @@ void RiuMainWindow::slotImportWellPathsFromFile()
{ {
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
commandManager->action("RicImportWellPathsFileFeature")->trigger(); commandManager->action("RicWellPathsImportFileFeature")->trigger();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -1958,7 +1958,7 @@ void RiuMainWindow::slotImportWellPathsFromSSIHub()
{ {
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
commandManager->action("RicImportWellPathsSsihubFeature")->trigger(); commandManager->action("RicWellPathsImportSsihubFeature")->trigger();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------