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

#7969 Rename command to "Create Ensemble Surface"

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-09-08 20:02:40 +02:00
parent d9a35e5282
commit 6173b4f421
8 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/Commands/CMakeLists_files.cmake
View File

@@ -73,8 +73,8 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesUi.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceUi.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogUi.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogUi.h
) )
@@ -153,8 +153,8 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicDeletePressureTableItemFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCaseFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesUi.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogUi.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogUi.cpp
) )

24
ApplicationLibCode/Commands/RicGenerateMultipleSurfacesFeature.cpp → ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp
View File

@@ -16,13 +16,13 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicGenerateMultipleSurfacesFeature.h" #include "RicCreateEnsembleSurfaceFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "CommandRouter/RimcExtractSurfaces.h" #include "CommandRouter/RimcExtractSurfaces.h"
#include "RicGenerateMultipleSurfacesUi.h" #include "RicCreateEnsembleSurfaceUi.h"
#include "RicImportEnsembleSurfaceFeature.h" #include "RicImportEnsembleSurfaceFeature.h"
#include "RicRecursiveFileSearchDialog.h" #include "RicRecursiveFileSearchDialog.h"
#include "RimDialogData.h" #include "RimDialogData.h"
@@ -41,12 +41,12 @@
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicGenerateMultipleSurfacesFeature, "RicGenerateMultipleSurfacesFeature" ); CAF_CMD_SOURCE_INIT( RicCreateEnsembleSurfaceFeature, "RicCreateEnsembleSurfaceFeature" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesFeature::openDialogAndExecuteCommand() void RicCreateEnsembleSurfaceFeature::openDialogAndExecuteCommand()
{ {
// Get the list of egrid files // Get the list of egrid files
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
@@ -74,12 +74,12 @@ void RicGenerateMultipleSurfacesFeature::openDialogAndExecuteCommand()
if ( !RimcCommandRouter_extractSurfaces::readMinMaxLayerFromGridFile( result.files[0], minLayerK, maxLayerK ) ) if ( !RimcCommandRouter_extractSurfaces::readMinMaxLayerFromGridFile( result.files[0], minLayerK, maxLayerK ) )
return; return;
RicGenerateMultipleSurfacesUi* ui = RimProject::current()->dialogData()->generateEnsembleSurfacesUi(); RicCreateEnsembleSurfaceUi* ui = RimProject::current()->dialogData()->createEnsembleSurfaceUi();
ui->setLayersMinMax( minLayerK, maxLayerK ); ui->setLayersMinMax( minLayerK, maxLayerK );
RiuPropertyViewTabWidget propertyDialog( Riu3DMainWindowTools::mainWindowWidget(), RiuPropertyViewTabWidget propertyDialog( Riu3DMainWindowTools::mainWindowWidget(),
ui, ui,
"Export Multiple Surfaces", "Create Ensemble Surface",
ui->tabNames() ); ui->tabNames() );
if ( propertyDialog.exec() == QDialog::Accepted ) if ( propertyDialog.exec() == QDialog::Accepted )
@@ -91,12 +91,12 @@ void RicGenerateMultipleSurfacesFeature::openDialogAndExecuteCommand()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesFeature::executeCommand( const RicGenerateMultipleSurfacesUi& ui, void RicCreateEnsembleSurfaceFeature::executeCommand( const RicCreateEnsembleSurfaceUi& ui,
const std::list<QString>& fileNames ) const std::list<QString>& fileNames )
{ {
std::vector layers = ui.layers(); std::vector layers = ui.layers();
caf::ProgressInfo progress( fileNames.size(), "Generating ensemble surfaces" ); caf::ProgressInfo progress( fileNames.size(), "Generating ensemble surface" );
QStringList allSurfaceFileNames; QStringList allSurfaceFileNames;
for ( auto fileName : fileNames ) for ( auto fileName : fileNames )
@@ -113,7 +113,7 @@ void RicGenerateMultipleSurfacesFeature::executeCommand( const RicGenerateMultip
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicGenerateMultipleSurfacesFeature::isCommandEnabled() bool RicCreateEnsembleSurfaceFeature::isCommandEnabled()
{ {
return true; return true;
} }
@@ -121,7 +121,7 @@ bool RicGenerateMultipleSurfacesFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesFeature::onActionTriggered( bool isChecked ) void RicCreateEnsembleSurfaceFeature::onActionTriggered( bool isChecked )
{ {
openDialogAndExecuteCommand(); openDialogAndExecuteCommand();
} }
@@ -129,7 +129,7 @@ void RicGenerateMultipleSurfacesFeature::onActionTriggered( bool isChecked )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesFeature::setupActionLook( QAction* actionToSetup ) void RicCreateEnsembleSurfaceFeature::setupActionLook( QAction* actionToSetup )
{ {
actionToSetup->setText( "Generate Multiple Surfaces..." ); actionToSetup->setText( "Create Ensemble Surface..." );
} }

6
ApplicationLibCode/Commands/RicGenerateMultipleSurfacesFeature.h → ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.h
View File

@@ -22,18 +22,18 @@
#include <list> #include <list>
class RicGenerateMultipleSurfacesUi; class RicCreateEnsembleSurfaceUi;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicGenerateMultipleSurfacesFeature : public caf::CmdFeature class RicCreateEnsembleSurfaceFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
public: public:
static void openDialogAndExecuteCommand(); static void openDialogAndExecuteCommand();
static void executeCommand( const RicGenerateMultipleSurfacesUi& ui, const std::list<QString>& fileNames ); static void executeCommand( const RicCreateEnsembleSurfaceUi& ui, const std::list<QString>& fileNames );
protected: protected:
bool isCommandEnabled() override; bool isCommandEnabled() override;

23
ApplicationLibCode/Commands/RicGenerateMultipleSurfacesUi.cpp → ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.cpp
View File

@@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicGenerateMultipleSurfacesUi.h" #include "RicCreateEnsembleSurfaceUi.h"
#include "RiaApplication.h" #include "RiaApplication.h"
@@ -25,12 +25,12 @@
#include "cafPdmUiListEditor.h" #include "cafPdmUiListEditor.h"
#include "cafPdmUiOrdering.h" #include "cafPdmUiOrdering.h"
CAF_PDM_SOURCE_INIT( RicGenerateMultipleSurfacesUi, "RicGenerateMultipleSurfacesUi" ); CAF_PDM_SOURCE_INIT( RicCreateEnsembleSurfaceUi, "RicCreateEnsembleSurfaceUi" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicGenerateMultipleSurfacesUi::RicGenerateMultipleSurfacesUi() RicCreateEnsembleSurfaceUi::RicCreateEnsembleSurfaceUi()
{ {
CAF_PDM_InitObject( "Export Multiple Surfaces", "", "", "" ); CAF_PDM_InitObject( "Export Multiple Surfaces", "", "", "" );
@@ -53,14 +53,14 @@ RicGenerateMultipleSurfacesUi::RicGenerateMultipleSurfacesUi()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicGenerateMultipleSurfacesUi::~RicGenerateMultipleSurfacesUi() RicCreateEnsembleSurfaceUi::~RicCreateEnsembleSurfaceUi()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const QStringList& RicGenerateMultipleSurfacesUi::tabNames() const const QStringList& RicCreateEnsembleSurfaceUi::tabNames() const
{ {
return m_tabNames; return m_tabNames;
} }
@@ -68,7 +68,7 @@ const QStringList& RicGenerateMultipleSurfacesUi::tabNames() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesUi::setLayersMinMax( int minLayer, int maxLayer ) void RicCreateEnsembleSurfaceUi::setLayersMinMax( int minLayer, int maxLayer )
{ {
m_minLayer = minLayer; m_minLayer = minLayer;
m_maxLayer = maxLayer; m_maxLayer = maxLayer;
@@ -77,7 +77,7 @@ void RicGenerateMultipleSurfacesUi::setLayersMinMax( int minLayer, int maxLayer
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesUi::defineEditorAttribute( const caf::PdmFieldHandle* field, void RicCreateEnsembleSurfaceUi::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) caf::PdmUiEditorAttribute* attribute )
{ {
@@ -94,7 +94,7 @@ void RicGenerateMultipleSurfacesUi::defineEditorAttribute( const caf::PdmFieldHa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesUi::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) void RicCreateEnsembleSurfaceUi::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{ {
if ( uiConfigName == m_tabNames[0] ) if ( uiConfigName == m_tabNames[0] )
{ {
@@ -108,8 +108,7 @@ void RicGenerateMultipleSurfacesUi::defineUiOrdering( QString uiConfigName, caf:
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> QList<caf::PdmOptionItemInfo>
RicGenerateMultipleSurfacesUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, RicCreateEnsembleSurfaceUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
bool* useOptionsOnly )
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_layers ) if ( fieldNeedingOptions == &m_layers )
@@ -125,7 +124,7 @@ QList<caf::PdmOptionItemInfo>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<int> RicGenerateMultipleSurfacesUi::layers() const std::vector<int> RicCreateEnsembleSurfaceUi::layers() const
{ {
return m_layers(); return m_layers();
} }
@@ -133,7 +132,7 @@ std::vector<int> RicGenerateMultipleSurfacesUi::layers() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicGenerateMultipleSurfacesUi::autoCreateEnsembleSurfaces() const bool RicCreateEnsembleSurfaceUi::autoCreateEnsembleSurfaces() const
{ {
return m_autoCreateEnsembleSurfaces; return m_autoCreateEnsembleSurfaces;
} }

6
ApplicationLibCode/Commands/RicGenerateMultipleSurfacesUi.h → ApplicationLibCode/Commands/RicCreateEnsembleSurfaceUi.h
View File

@@ -29,13 +29,13 @@ class RigEclipseCaseData;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicGenerateMultipleSurfacesUi : public caf::PdmObject class RicCreateEnsembleSurfaceUi : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RicGenerateMultipleSurfacesUi(); RicCreateEnsembleSurfaceUi();
~RicGenerateMultipleSurfacesUi() override; ~RicCreateEnsembleSurfaceUi() override;
const QStringList& tabNames() const; const QStringList& tabNames() const;
void setLayersMinMax( int minLayer, int maxLayer ); void setLayersMinMax( int minLayer, int maxLayer );

2
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -971,7 +971,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicImportSurfacesFeature"; menuBuilder << "RicImportSurfacesFeature";
menuBuilder << "RicNewGridSurfaceFeature"; menuBuilder << "RicNewGridSurfaceFeature";
menuBuilder << "RicImportEnsembleSurfaceFeature"; menuBuilder << "RicImportEnsembleSurfaceFeature";
menuBuilder << "RicGenerateMultipleSurfacesFeature"; menuBuilder << "RicCreateEnsembleSurfaceFeature";
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder << "RicNewSurfaceCollectionFeature"; menuBuilder << "RicNewSurfaceCollectionFeature";
} }

15
ApplicationLibCode/ProjectDataModel/RimDialogData.cpp
View File

@@ -27,8 +27,8 @@
#include "ExportCommands/RicExportWellPathsUi.h" #include "ExportCommands/RicExportWellPathsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h" #include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h" #include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "RicCreateEnsembleSurfaceUi.h"
#include "RicCreateEnsembleWellLogUi.h" #include "RicCreateEnsembleWellLogUi.h"
#include "RicGenerateMultipleSurfacesUi.h"
CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" ); CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" );
@@ -68,13 +68,8 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" );
m_mockModelSettings = new RimMockModelSettings(); m_mockModelSettings = new RimMockModelSettings();
CAF_PDM_InitFieldNoDefault( &m_generateEnsembleSurfacesUi, CAF_PDM_InitFieldNoDefault( &m_createEnsembleSurfaceUi, "CreateEnsembleSurfaceUi", "Create Ensmeble Surface Ui", "", "", "" );
"GenerateMultipleSurfacesUi", m_createEnsembleSurfaceUi = new RicCreateEnsembleSurfaceUi();
"Generate Ensmeble Surfaces Ui",
"",
"",
"" );
m_generateEnsembleSurfacesUi = new RicGenerateMultipleSurfacesUi();
CAF_PDM_InitFieldNoDefault( &m_createEnsembleWellLogUi, "CreateEnsembleWellLogUi", "Create Ensemble Well Log Ui", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_createEnsembleWellLogUi, "CreateEnsembleWellLogUi", "Create Ensemble Well Log Ui", "", "", "" );
m_createEnsembleWellLogUi = new RicCreateEnsembleWellLogUi(); m_createEnsembleWellLogUi = new RicCreateEnsembleWellLogUi();
@@ -172,9 +167,9 @@ RimMockModelSettings* RimDialogData::mockModelSettings() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicGenerateMultipleSurfacesUi* RimDialogData::generateEnsembleSurfacesUi() const RicCreateEnsembleSurfaceUi* RimDialogData::createEnsembleSurfaceUi() const
{ {
return m_generateEnsembleSurfacesUi; return m_createEnsembleSurfaceUi;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/ProjectDataModel/RimDialogData.h
View File

@@ -29,7 +29,7 @@ class RicHoloLensExportToFolderUi;
class RicExportWellPathsUi; class RicExportWellPathsUi;
class RicExportLgrUi; class RicExportLgrUi;
class RimMockModelSettings; class RimMockModelSettings;
class RicGenerateMultipleSurfacesUi; class RicCreateEnsembleSurfaceUi;
class RicCreateEnsembleWellLogUi; class RicCreateEnsembleWellLogUi;
//================================================================================================== //==================================================================================================
@@ -63,7 +63,7 @@ public:
RicExportLgrUi* exportLgrData() const; RicExportLgrUi* exportLgrData() const;
RicExportEclipseSectorModelUi* exportSectorModelUi() const; RicExportEclipseSectorModelUi* exportSectorModelUi() const;
RimMockModelSettings* mockModelSettings() const; RimMockModelSettings* mockModelSettings() const;
RicGenerateMultipleSurfacesUi* generateEnsembleSurfacesUi() const; RicCreateEnsembleSurfaceUi* createEnsembleSurfaceUi() const;
RicCreateEnsembleWellLogUi* createEnsembleWellLogUi() const; RicCreateEnsembleWellLogUi* createEnsembleWellLogUi() const;
private: private:
@@ -75,6 +75,6 @@ private:
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData; caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
caf::PdmChildField<RicExportEclipseSectorModelUi*> m_exportSectorModelData; caf::PdmChildField<RicExportEclipseSectorModelUi*> m_exportSectorModelData;
caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings; caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings;
caf::PdmChildField<RicGenerateMultipleSurfacesUi*> m_generateEnsembleSurfacesUi; caf::PdmChildField<RicCreateEnsembleSurfaceUi*> m_createEnsembleSurfaceUi;
caf::PdmChildField<RicCreateEnsembleWellLogUi*> m_createEnsembleWellLogUi; caf::PdmChildField<RicCreateEnsembleWellLogUi*> m_createEnsembleWellLogUi;
}; };