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 RicWellPathsImportFileFeature to RicImportWellPaths

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-10-09 09:27:26 +02:00
parent 2961782be1
commit 32817d2cc6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/CommandFileInterface/RicfImportWellPaths.cpp
View File

@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicfImportWellPaths.h" #include "RicfImportWellPaths.h"
#include "WellPathCommands/RicWellPathsImportFileFeature.h" #include "WellPathCommands/RicImportWellPaths.h"
#include "RimFileWellPath.h" #include "RimFileWellPath.h"
@ -57,7 +57,7 @@ RicfCommandResponse RicfImportWellPaths::execute()
if ( wellPathFolder.exists() ) if ( wellPathFolder.exists() )
{ {
QStringList nameFilters; QStringList nameFilters;
nameFilters << RicWellPathsImportFileFeature::wellPathNameFilters(); nameFilters << RicImportWellPaths::wellPathNameFilters();
QStringList relativePaths = wellPathFolder.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot ); QStringList relativePaths = wellPathFolder.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
for ( QString relativePath : relativePaths ) for ( QString relativePath : relativePaths )
{ {
@ -84,8 +84,8 @@ RicfCommandResponse RicfImportWellPaths::execute()
RicfCommandResponse response; RicfCommandResponse response;
if ( !wellPathFiles.empty() ) if ( !wellPathFiles.empty() )
{ {
std::vector<RimFileWellPath*> importedWellPaths = RicWellPathsImportFileFeature::importWellPaths( wellPathFiles, std::vector<RimFileWellPath*> importedWellPaths = RicImportWellPaths::importWellPaths( wellPathFiles,
&warningMessages ); &warningMessages );
if ( !importedWellPaths.empty() ) if ( !importedWellPaths.empty() )
{ {
RicfImportWellPathsResult* wellPathsResult = new RicfImportWellPathsResult; RicfImportWellPathsResult* wellPathsResult = new RicfImportWellPathsResult;

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

@ -13,7 +13,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathPickEventHandler.h ${CMAKE_CURRENT_LIST_DIR}/RicWellPathPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateWellTargetsPickEventHandler.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateWellTargetsPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicIntersectionPickEventHandler.h ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicImportWellPaths.h
${CMAKE_CURRENT_LIST_DIR}/RicPolylineTargetsPickEventHandler.h ${CMAKE_CURRENT_LIST_DIR}/RicPolylineTargetsPickEventHandler.h
${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineTargetFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineTargetFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicDeletePolylineTargetFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicDeletePolylineTargetFeature.h
@ -27,7 +27,7 @@ ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.h
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicWellPathDeleteFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicWellPathDeleteFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportFileFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicImportWellPaths.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewEditableWellPathFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewEditableWellPathFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicShowWellPlanFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicShowWellPlanFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathListTargetFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathListTargetFeature.cpp

16
ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp → ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicWellPathsImportFileFeature.h" #include "RicImportWellPaths.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
@ -34,13 +34,13 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicWellPathsImportFileFeature, "RicWellPathsImportFileFeature" ); CAF_CMD_SOURCE_INIT( RicImportWellPaths, "RicWellPathsImportFileFeature" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimFileWellPath*> RicWellPathsImportFileFeature::importWellPaths( const QStringList& wellPathFilePaths, std::vector<RimFileWellPath*> RicImportWellPaths::importWellPaths( const QStringList& wellPathFilePaths,
QStringList* errorMessages ) QStringList* errorMessages )
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
@ -71,7 +71,7 @@ std::vector<RimFileWellPath*> RicWellPathsImportFileFeature::importWellPaths( co
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RicWellPathsImportFileFeature::wellPathNameFilters() QStringList RicImportWellPaths::wellPathNameFilters()
{ {
QStringList nameFilters; QStringList nameFilters;
nameFilters << "*.json" nameFilters << "*.json"
@ -85,7 +85,7 @@ QStringList RicWellPathsImportFileFeature::wellPathNameFilters()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicWellPathsImportFileFeature::isCommandEnabled() bool RicImportWellPaths::isCommandEnabled()
{ {
return true; return true;
} }
@ -93,7 +93,7 @@ bool RicWellPathsImportFileFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellPathsImportFileFeature::onActionTriggered( bool isChecked ) void RicImportWellPaths::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();
@ -128,7 +128,7 @@ void RicWellPathsImportFileFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellPathsImportFileFeature::setupActionLook( QAction* actionToSetup ) void RicImportWellPaths::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/WellPathCommands/RicWellPathsImportFileFeature.h → ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.h
View File

@ -28,7 +28,7 @@ class RimFileWellPath;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicWellPathsImportFileFeature : public caf::CmdFeature class RicImportWellPaths : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;