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

Add property type to exportProperty command in command file interface

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-30 15:29:01 +02:00
parent 3a44cbb986
commit 373de4935a
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/CommandFileInterface/RicfExportProperty.cpp
View File

@@ -43,12 +43,13 @@ CAF_PDM_SOURCE_INIT(RicfExportProperty, "exportProperty");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicfExportProperty::RicfExportProperty() RicfExportProperty::RicfExportProperty()
{ {
RICF_InitField(&m_caseId, "caseId", -1, "Case ID", "", "", ""); RICF_InitField(&m_caseId, "caseId", -1, "Case ID", "", "", "");
RICF_InitField(&m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", ""); RICF_InitField(&m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "");
RICF_InitField(&m_propertyName, "property", QString(), "Property Name", "", "", ""); RICF_InitField(&m_propertyName, "property", QString(), "Property Name", "", "", "");
RICF_InitField(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword", "", "", ""); RICF_InitField(&m_type, "type", caf::AppEnum<RiaDefines::ResultCatType>(RiaDefines::DYNAMIC_NATIVE), "Property type", "", "", "");
RICF_InitField(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", ""); RICF_InitField(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword", "", "", "");
RICF_InitField(&m_path, "exportFile", QString(), "Export File", "", "", ""); RICF_InitField(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "");
RICF_InitField(&m_path, "exportFile", QString(), "Export File", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -103,7 +104,8 @@ void RicfExportProperty::execute()
m_eclipseKeyword = m_propertyName; m_eclipseKeyword = m_propertyName;
} }
view->cellResult->setResultVariable(m_propertyName); view->cellResult->setResultType(m_type());
view->cellResult->setResultVariable(m_propertyName());
view->loadDataAndUpdate(); view->loadDataAndUpdate();
RifEclipseInputFileTools::writeBinaryResultToTextFile(filePath, eclipseCase->eclipseCaseData(), m_timeStepIndex, view->cellResult, m_eclipseKeyword, m_undefinedValue); RifEclipseInputFileTools::writeBinaryResultToTextFile(filePath, eclipseCase->eclipseCaseData(), m_timeStepIndex, view->cellResult, m_eclipseKeyword, m_undefinedValue);

15
ApplicationCode/CommandFileInterface/RicfExportProperty.h
View File

@@ -18,6 +18,8 @@
#pragma once #pragma once
#include "RiaDefines.h"
#include "RicfCommandObject.h" #include "RicfCommandObject.h"
#include "cafPdmField.h" #include "cafPdmField.h"
@@ -37,10 +39,11 @@ public:
virtual void execute() override; virtual void execute() override;
private: private:
caf::PdmField<int> m_caseId; caf::PdmField<int> m_caseId;
caf::PdmField<int> m_timeStepIndex; caf::PdmField<int> m_timeStepIndex;
caf::PdmField<QString> m_propertyName; caf::PdmField<QString> m_propertyName;
caf::PdmField<QString> m_eclipseKeyword; caf::PdmField< caf::AppEnum<RiaDefines::ResultCatType> > m_type;
caf::PdmField<double> m_undefinedValue; caf::PdmField<QString> m_eclipseKeyword;
caf::PdmField<QString> m_path; caf::PdmField<double> m_undefinedValue;
caf::PdmField<QString> m_path;
}; };