OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-03 04:00:57 -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
Show Stats 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}/RicImportGridModelFromSummaryCaseFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesUi.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceUi.h
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.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}/RicImportGridModelFromSummaryCaseFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicImportGridModelFromSummaryCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicGenerateMultipleSurfacesUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleSurfaceUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateEnsembleWellLogUi.cpp
)

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

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

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

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicGenerateMultipleSurfacesUi.h"
#include "RicCreateEnsembleSurfaceUi.h"
#include "RiaApplication.h"
@ -25,12 +25,12 @@
#include "cafPdmUiListEditor.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", "", "", "" );
@ -53,14 +53,14 @@ RicGenerateMultipleSurfacesUi::RicGenerateMultipleSurfacesUi()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicGenerateMultipleSurfacesUi::~RicGenerateMultipleSurfacesUi()
RicCreateEnsembleSurfaceUi::~RicCreateEnsembleSurfaceUi()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QStringList& RicGenerateMultipleSurfacesUi::tabNames() const
const QStringList& RicCreateEnsembleSurfaceUi::tabNames() const
{
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_maxLayer = maxLayer;
@ -77,9 +77,9 @@ void RicGenerateMultipleSurfacesUi::setLayersMinMax( int minLayer, int maxLayer
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicGenerateMultipleSurfacesUi::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
void RicCreateEnsembleSurfaceUi::defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_layers )
{
@ -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] )
{
@ -108,8 +108,7 @@ void RicGenerateMultipleSurfacesUi::defineUiOrdering( QString uiConfigName, caf:
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RicGenerateMultipleSurfacesUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RicCreateEnsembleSurfaceUi::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
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();
}
@ -133,7 +132,7 @@ std::vector<int> RicGenerateMultipleSurfacesUi::layers() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicGenerateMultipleSurfacesUi::autoCreateEnsembleSurfaces() const
bool RicCreateEnsembleSurfaceUi::autoCreateEnsembleSurfaces() const
{
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;
public:
RicGenerateMultipleSurfacesUi();
~RicGenerateMultipleSurfacesUi() override;
RicCreateEnsembleSurfaceUi();
~RicCreateEnsembleSurfaceUi() override;
const QStringList& tabNames() const;
void setLayersMinMax( int minLayer, int maxLayer );

2
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

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

15
ApplicationLibCode/ProjectDataModel/RimDialogData.cpp
View File

@ -27,8 +27,8 @@
#include "ExportCommands/RicExportWellPathsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "RicCreateEnsembleSurfaceUi.h"
#include "RicCreateEnsembleWellLogUi.h"
#include "RicGenerateMultipleSurfacesUi.h"
CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" );
@ -68,13 +68,8 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" );
m_mockModelSettings = new RimMockModelSettings();
CAF_PDM_InitFieldNoDefault( &m_generateEnsembleSurfacesUi,
"GenerateMultipleSurfacesUi",
"Generate Ensmeble Surfaces Ui",
"",
"",
"" );
m_generateEnsembleSurfacesUi = new RicGenerateMultipleSurfacesUi();
CAF_PDM_InitFieldNoDefault( &m_createEnsembleSurfaceUi, "CreateEnsembleSurfaceUi", "Create Ensmeble Surface Ui", "", "", "" );
m_createEnsembleSurfaceUi = new RicCreateEnsembleSurfaceUi();
CAF_PDM_InitFieldNoDefault( &m_createEnsembleWellLogUi, "CreateEnsembleWellLogUi", "Create Ensemble Well Log Ui", "", "", "" );
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 RicExportLgrUi;
class RimMockModelSettings;
class RicGenerateMultipleSurfacesUi;
class RicCreateEnsembleSurfaceUi;
class RicCreateEnsembleWellLogUi;
//==================================================================================================
@ -63,7 +63,7 @@ public:
RicExportLgrUi* exportLgrData() const;
RicExportEclipseSectorModelUi* exportSectorModelUi() const;
RimMockModelSettings* mockModelSettings() const;
RicGenerateMultipleSurfacesUi* generateEnsembleSurfacesUi() const;
RicCreateEnsembleSurfaceUi* createEnsembleSurfaceUi() const;
RicCreateEnsembleWellLogUi* createEnsembleWellLogUi() const;
private:
@ -75,6 +75,6 @@ private:
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
caf::PdmChildField<RicExportEclipseSectorModelUi*> m_exportSectorModelData;
caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings;
caf::PdmChildField<RicGenerateMultipleSurfacesUi*> m_generateEnsembleSurfacesUi;
caf::PdmChildField<RicCreateEnsembleSurfaceUi*> m_createEnsembleSurfaceUi;
caf::PdmChildField<RicCreateEnsembleWellLogUi*> m_createEnsembleWellLogUi;
};