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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-11 14:07:42 +01:00
parent a103e22e0a
commit c5fc0d34e4
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp
View File

@ -21,20 +21,20 @@
#include "RiaFilePathTools.h"
#include "RiaViewRedrawScheduler.h"
#include "RicfApplicationTools.h"
#include "RicfCommandFileExecutor.h"
#include "ExportCommands/RicSaveEclipseInputVisibleCellsFeature.h"
#include "ExportCommands/RicSaveEclipseInputVisibleCellsUi.h"
#include "RicfApplicationTools.h"
#include "RicfCommandFileExecutor.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RimProject.h"
#include "RimOilField.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RifEclipseInputFileTools.h"
@ -48,15 +48,15 @@ CAF_PDM_SOURCE_INIT(RicfExportVisibleCells, "exportVisibleCells");
namespace caf
{
template<>
void AppEnum< RicfExportVisibleCells::ExportKeyword >::setUp()
{
addItem(RicfExportVisibleCells::FLUXNUM, "FLUXNUM", "FLUXNUM");
addItem(RicfExportVisibleCells::MULTNUM, "MULTNUM", "MULTNUM");
template<>
void AppEnum<RicfExportVisibleCells::ExportKeyword>::setUp()
{
addItem(RicfExportVisibleCells::FLUXNUM, "FLUXNUM", "FLUXNUM");
addItem(RicfExportVisibleCells::MULTNUM, "MULTNUM", "MULTNUM");
setDefault(RicfExportVisibleCells::FLUXNUM);
}
setDefault(RicfExportVisibleCells::FLUXNUM);
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
@ -65,7 +65,8 @@ RicfExportVisibleCells::RicfExportVisibleCells()
{
RICF_InitField(&m_caseId, "caseId", -1, "Case ID", "", "", "");
RICF_InitField(&m_viewName, "viewName", QString(), "View Name", "", "", "");
RICF_InitField(&m_exportKeyword, "exportKeyword", caf::AppEnum<RicfExportVisibleCells::ExportKeyword>(), "Export Keyword", "", "", "");
RICF_InitField(
&m_exportKeyword, "exportKeyword", caf::AppEnum<RicfExportVisibleCells::ExportKeyword>(), "Export Keyword", "", "", "");
RICF_InitField(&m_visibleActiveCellsValue, "visibleActiveCellsValue", 1, "Visible Active Cells Value", "", "", "");
RICF_InitField(&m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "");
RICF_InitField(&m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value", "", "", "");
@ -110,10 +111,12 @@ void RicfExportVisibleCells::buildExportSettings(const QString& exportFolder, Ri
QDir baseDir(exportFolder);
exportSettings->exportFilename = baseDir.absoluteFilePath(QString("%1.grdecl").arg(m_exportKeyword().text()));
if (m_exportKeyword == ExportKeyword::FLUXNUM) exportSettings->exportKeyword = RicSaveEclipseInputVisibleCellsUi::FLUXNUM;
else if (m_exportKeyword == ExportKeyword::MULTNUM) exportSettings->exportKeyword = RicSaveEclipseInputVisibleCellsUi::MULTNUM;
if (m_exportKeyword == ExportKeyword::FLUXNUM)
exportSettings->exportKeyword = RicSaveEclipseInputVisibleCellsUi::FLUXNUM;
else if (m_exportKeyword == ExportKeyword::MULTNUM)
exportSettings->exportKeyword = RicSaveEclipseInputVisibleCellsUi::MULTNUM;
exportSettings->visibleActiveCellsValue = m_visibleActiveCellsValue;
exportSettings->hiddenActiveCellsValue = m_hiddenActiveCellsValue;
exportSettings->inactiveCellsValue = m_inactiveCellsValue;
exportSettings->hiddenActiveCellsValue = m_hiddenActiveCellsValue;
exportSettings->inactiveCellsValue = m_inactiveCellsValue;
}

18
ApplicationCode/CommandFileInterface/RicfExportVisibleCells.h
View File

@ -36,7 +36,11 @@ class RicfExportVisibleCells : public RicfCommandObject
{
CAF_PDM_HEADER_INIT;
enum ExportKeyword {FLUXNUM, MULTNUM};
enum ExportKeyword
{
FLUXNUM,
MULTNUM
};
public:
RicfExportVisibleCells();
@ -46,10 +50,10 @@ public:
private:
void buildExportSettings(const QString& exportFolder, RicSaveEclipseInputVisibleCellsUi* exportSettings);
caf::PdmField<int> m_caseId;
caf::PdmField<QString> m_viewName;
caf::PdmField<caf::AppEnum<ExportKeyword>> m_exportKeyword;
caf::PdmField<int> m_visibleActiveCellsValue;
caf::PdmField<int> m_hiddenActiveCellsValue;
caf::PdmField<int> m_inactiveCellsValue;
caf::PdmField<int> m_caseId;
caf::PdmField<QString> m_viewName;
caf::PdmField<caf::AppEnum<ExportKeyword>> m_exportKeyword;
caf::PdmField<int> m_visibleActiveCellsValue;
caf::PdmField<int> m_hiddenActiveCellsValue;
caf::PdmField<int> m_inactiveCellsValue;
};