OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename ExportEclipseInputGrid to ExportEclipseSectorModel in code

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-29 13:37:25 +01:00
parent 59229b89b7
commit 0df03e4886
7 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp
View File

@ -21,8 +21,8 @@
#include "RiaFilePathTools.h"
#include "RiaViewRedrawScheduler.h"
#include "ExportCommands/RicExportEclipseInputGridFeature.h"
#include "ExportCommands/RicExportEclipseInputGridUi.h"
#include "ExportCommands/RicExportEclipseSectorModelFeature.h"
#include "ExportCommands/RicExportEclipseSectorModelUi.h"
#include "RicfApplicationTools.h"
#include "RicfCommandFileExecutor.h"
@ -98,15 +98,15 @@ void RicfExportVisibleCells::execute()
RiaViewRedrawScheduler::instance()->clearViewsScheduledForUpdate();
RicExportEclipseInputGridUi exportSettings(eclipseView->eclipseCase()->eclipseCaseData());
RicExportEclipseSectorModelUi exportSettings(eclipseView->eclipseCase()->eclipseCaseData());
buildExportSettings(exportFolder, &exportSettings);
RicExportEclipseInputGridFeature::executeCommand(eclipseView, exportSettings, "exportVisibleCells");
RicExportEclipseSectorModelFeature::executeCommand(eclipseView, exportSettings, "exportVisibleCells");
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicfExportVisibleCells::buildExportSettings(const QString& exportFolder, RicExportEclipseInputGridUi* exportSettings)
void RicfExportVisibleCells::buildExportSettings(const QString& exportFolder, RicExportEclipseSectorModelUi* exportSettings)
{
QDir baseDir(exportFolder);
exportSettings->exportResultsFilename = baseDir.absoluteFilePath(QString("%1.grdecl").arg(m_exportKeyword().text()));

4
ApplicationCode/CommandFileInterface/RicfExportVisibleCells.h
View File

@ -25,7 +25,7 @@
#include "cafPdmField.h"
class RimEclipseView;
class RicExportEclipseInputGridUi;
class RicExportEclipseSectorModelUi;
//==================================================================================================
//
@ -48,7 +48,7 @@ public:
void execute() override;
private:
void buildExportSettings(const QString& exportFolder, RicExportEclipseInputGridUi* exportSettings);
void buildExportSettings(const QString& exportFolder, RicExportEclipseSectorModelUi* exportSettings);
caf::PdmField<int> m_caseId;
caf::PdmField<QString> m_viewName;

8
ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake
View File

@ -11,8 +11,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyExec.h
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseInputGridFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseInputGridUi.h
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseSectorModelFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseSectorModelUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllPlotsToFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllViewsToFileFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSnapshotFilenameGenerator.h
@ -38,8 +38,8 @@ ${CMAKE_CURRENT_LIST_DIR}/RicExportToLasFileResampleUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputPropertyFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseInputGridFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseInputGridUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseSectorModelFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicExportEclipseSectorModelUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyExec.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllPlotsToFileFeature.cpp

38
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridFeature.cpp → ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
View File

@ -16,13 +16,13 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicExportEclipseInputGridFeature.h"
#include "RicExportEclipseSectorModelFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicExportFeatureImpl.h"
#include "RicExportEclipseInputGridUi.h"
#include "RicExportEclipseSectorModelUi.h"
#include "RifEclipseInputFileTools.h"
#include "RifReaderEclipseOutput.h"
@ -47,18 +47,18 @@
#include <QFileInfo>
#include <QDir>
CAF_CMD_SOURCE_INIT(RicExportEclipseInputGridFeature, "RicExportEclipseInputGridFeature");
CAF_CMD_SOURCE_INIT(RicExportEclipseSectorModelFeature, "RicExportEclipseInputGridFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridFeature::openDialogAndExecuteCommand(RimEclipseView* view)
void RicExportEclipseSectorModelFeature::openDialogAndExecuteCommand(RimEclipseView* view)
{
if (!view) return;
RigEclipseCaseData* caseData = view->eclipseCase()->eclipseCaseData();
RicExportEclipseInputGridUi exportSettings(caseData);
RicExportEclipseSectorModelUi exportSettings(caseData);
caf::PdmUiPropertyViewDialog propertyDialog(Riu3DMainWindowTools::mainWindowWidget(), &exportSettings, "Export Eclipse Sector Model", "");
RicExportFeatureImpl::configureForExport(&propertyDialog);
@ -71,8 +71,8 @@ void RicExportEclipseInputGridFeature::openDialogAndExecuteCommand(RimEclipseVie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
const RicExportEclipseInputGridUi& exportSettings,
void RicExportEclipseSectorModelFeature::executeCommand(RimEclipseView* view,
const RicExportEclipseSectorModelUi& exportSettings,
const QString& logPrefix)
{
int resultProgressPercentage = exportSettings.exportResults() ?
@ -111,12 +111,12 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
}
}
if (exportSettings.exportResults() != RicExportEclipseInputGridUi::EXPORT_NO_RESULTS)
if (exportSettings.exportResults() != RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS)
{
auto task = progress.task("Export Properties", resultProgressPercentage);
std::vector<QString> keywords = exportSettings.allSelectedKeywords();
if (exportSettings.exportResults == RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
if (exportSettings.exportResults == RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
{
QFileInfo info(exportSettings.exportGridFilename());
QDir dirPath = info.absoluteDir();
@ -141,7 +141,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
{
QString fileWriteMode = "w";
QString fileName = exportSettings.exportResultsFilename();
if (exportSettings.exportResults() == RicExportEclipseInputGridUi::EXPORT_TO_GRID_FILE)
if (exportSettings.exportResults() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
{
fileWriteMode = "a";
fileName = exportSettings.exportGridFilename();
@ -162,10 +162,10 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
}
}
if (exportSettings.exportFaults() != RicExportEclipseInputGridUi::EXPORT_NO_RESULTS)
if (exportSettings.exportFaults() != RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS)
{
auto task = progress.task("Export Faults", faultsProgressPercentage);
if (exportSettings.exportFaults == RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
if (exportSettings.exportFaults == RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
{
QFileInfo info(exportSettings.exportGridFilename());
QDir dirPath = info.absoluteDir();
@ -182,7 +182,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
{
QString fileName = exportSettings.exportFaultsFilename();
QIODevice::OpenMode openFlag = QIODevice::Truncate;
if (exportSettings.exportResults() == RicExportEclipseInputGridUi::EXPORT_TO_GRID_FILE)
if (exportSettings.exportResults() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
{
openFlag = QIODevice::Append;
fileName = exportSettings.exportGridFilename();
@ -203,7 +203,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<cvf::Vec3st, cvf::Vec3st> RicExportEclipseInputGridFeature::getVisibleCellRange(RimEclipseView* view)
std::pair<cvf::Vec3st, cvf::Vec3st> RicExportEclipseSectorModelFeature::getVisibleCellRange(RimEclipseView* view)
{
cvf::UByteArray visibleCells;
view->calculateCurrentTotalCellVisibility(&visibleCells, view->currentTimeStep());
@ -234,7 +234,7 @@ std::pair<cvf::Vec3st, cvf::Vec3st> RicExportEclipseInputGridFeature::getVisible
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportEclipseInputGridFeature::isCommandEnabled()
bool RicExportEclipseSectorModelFeature::isCommandEnabled()
{
return selectedView() != nullptr;
}
@ -242,16 +242,16 @@ bool RicExportEclipseInputGridFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridFeature::onActionTriggered(bool isChecked)
void RicExportEclipseSectorModelFeature::onActionTriggered(bool isChecked)
{
RimEclipseView* view = RicExportEclipseInputGridFeature::selectedView();
RimEclipseView* view = RicExportEclipseSectorModelFeature::selectedView();
openDialogAndExecuteCommand(view);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridFeature::setupActionLook(QAction* actionToSetup)
void RicExportEclipseSectorModelFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Export Visible Cells as Eclipse Sector Model");
}
@ -259,7 +259,7 @@ void RicExportEclipseInputGridFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicExportEclipseInputGridFeature::selectedView() const
RimEclipseView* RicExportEclipseSectorModelFeature::selectedView() const
{
RimEclipseView* view = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseView>();
if (view)

6
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridFeature.h → ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h
View File

@ -24,19 +24,19 @@
#include "cvfVector3.h"
class RimEclipseView;
class RicExportEclipseInputGridUi;
class RicExportEclipseSectorModelUi;
//==================================================================================================
///
//==================================================================================================
class RicExportEclipseInputGridFeature : public caf::CmdFeature
class RicExportEclipseSectorModelFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
public :
static void openDialogAndExecuteCommand(RimEclipseView* view);
static void executeCommand(RimEclipseView* view,
const RicExportEclipseInputGridUi& exportSettings,
const RicExportEclipseSectorModelUi& exportSettings,
const QString& logPrefix);
static std::pair<cvf::Vec3st, cvf::Vec3st> getVisibleCellRange(RimEclipseView* view);

40
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridUi.cpp → ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicExportEclipseInputGridUi.h"
#include "RicExportEclipseSectorModelUi.h"
#include "RiaApplication.h"
#include "RigCaseCellResultsData.h"
@ -36,26 +36,26 @@
#include <set>
CAF_PDM_SOURCE_INIT(RicExportEclipseInputGridUi, "RicExportEclipseInputGridUi");
CAF_PDM_SOURCE_INIT(RicExportEclipseSectorModelUi, "RicExportEclipseInputGridUi");
namespace caf
{
template<>
void RicExportEclipseInputGridUi::ResultExportOptionsEnum::setUp()
void RicExportEclipseSectorModelUi::ResultExportOptionsEnum::setUp()
{
addItem(RicExportEclipseInputGridUi::EXPORT_NO_RESULTS, "NO_RESULTS", "Do not export");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_GRID_FILE, "TO_GRID_FILE", "Append to grid file");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_SINGLE_SEPARATE_FILE, "TO_SINGLE_RESULT_FILE", "Export to single file");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT, "TO_SEPARATE_RESULT_FILES", "Export to a separate file per property");
addItem(RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS, "NO_RESULTS", "Do not export");
addItem(RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE, "TO_GRID_FILE", "Append to grid file");
addItem(RicExportEclipseSectorModelUi::EXPORT_TO_SINGLE_SEPARATE_FILE, "TO_SINGLE_RESULT_FILE", "Export to single file");
addItem(RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT, "TO_SEPARATE_RESULT_FILES", "Export to a separate file per property");
setDefault(RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT);
setDefault(RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT);
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportEclipseInputGridUi::RicExportEclipseInputGridUi(RigEclipseCaseData* caseData)
RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi(RigEclipseCaseData* caseData)
: m_caseData(caseData)
{
CAF_PDM_InitObject("Export Visible Cells as Eclipse Input Grid", "", "", "");
@ -95,14 +95,14 @@ RicExportEclipseInputGridUi::RicExportEclipseInputGridUi(RigEclipseCaseData* cas
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportEclipseInputGridUi::~RicExportEclipseInputGridUi()
RicExportEclipseSectorModelUi::~RicExportEclipseSectorModelUi()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<QString> RicExportEclipseInputGridUi::allSelectedKeywords() const
std::vector<QString> RicExportEclipseSectorModelUi::allSelectedKeywords() const
{
std::vector<QString> additionalResults = exportAdditionalKeywords();
std::vector<QString> allRes = exportMainKeywords();
@ -113,7 +113,7 @@ std::vector<QString> RicExportEclipseInputGridUi::allSelectedKeywords() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridUi::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
void RicExportEclipseSectorModelUi::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
{
if (field == &exportResultsFilename || field == &exportGridFilename || field == &exportFaultsFilename)
{
@ -145,7 +145,7 @@ void RicExportEclipseInputGridUi::defineEditorAttribute(const caf::PdmFieldHandl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RicExportEclipseSectorModelUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Grid Export");
gridGroup->add(&exportGrid);
@ -190,7 +190,7 @@ void RicExportEclipseInputGridUi::defineUiOrdering(QString uiConfigName, caf::Pd
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RicExportEclipseSectorModelUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &exportGridFilename)
{
@ -241,7 +241,7 @@ void RicExportEclipseInputGridUi::fieldChangedByUi(const caf::PdmFieldHandle* ch
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RicExportEclipseInputGridUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
RicExportEclipseSectorModelUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &exportMainKeywords)
@ -295,7 +295,7 @@ QList<caf::PdmOptionItemInfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QString> RicExportEclipseInputGridUi::mainKeywords()
std::set<QString> RicExportEclipseSectorModelUi::mainKeywords()
{
return { RiaDefines::eqlnumResultName(), "FIPNUM", "NTG", "PERMX", "PERMY", "PERMZ", "PORO", "PVTNUM", "SATNUM", "SWATINIT" };
}
@ -303,7 +303,7 @@ std::set<QString> RicExportEclipseInputGridUi::mainKeywords()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportEclipseInputGridUi::defaultFolder() const
QString RicExportEclipseSectorModelUi::defaultFolder() const
{
QString projectDirectory = RiaApplication::instance()->currentProjectPath();
QString fallbackDirectory = projectDirectory;
@ -319,7 +319,7 @@ QString RicExportEclipseInputGridUi::defaultFolder() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportEclipseInputGridUi::defaultGridFileName() const
QString RicExportEclipseSectorModelUi::defaultGridFileName() const
{
QDir baseDir(defaultFolder());
@ -329,7 +329,7 @@ QString RicExportEclipseInputGridUi::defaultGridFileName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportEclipseInputGridUi::defaultResultsFileName() const
QString RicExportEclipseSectorModelUi::defaultResultsFileName() const
{
QDir baseDir(defaultFolder());
return baseDir.absoluteFilePath("RESULTS.GRDECL");
@ -338,7 +338,7 @@ QString RicExportEclipseInputGridUi::defaultResultsFileName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RicExportEclipseInputGridUi::defaultFaultsFileName() const
QString RicExportEclipseSectorModelUi::defaultFaultsFileName() const
{
QDir baseDir(defaultFolder());
return baseDir.absoluteFilePath("FAULTS.GRDECL");

6
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridUi.h → ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h
View File

@ -34,7 +34,7 @@ class RigEclipseCaseData;
//==================================================================================================
///
//==================================================================================================
class RicExportEclipseInputGridUi : public caf::PdmObject
class RicExportEclipseSectorModelUi : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
@ -49,8 +49,8 @@ class RicExportEclipseInputGridUi : public caf::PdmObject
typedef caf::AppEnum<ResultExportOptions> ResultExportOptionsEnum;
public:
RicExportEclipseInputGridUi(RigEclipseCaseData* caseData = nullptr);
~RicExportEclipseInputGridUi() override;
RicExportEclipseSectorModelUi(RigEclipseCaseData* caseData = nullptr);
~RicExportEclipseSectorModelUi() override;
std::vector<QString> allSelectedKeywords() const;