Files
ResInsight/ApplicationLibCode/ProjectDataModelCommands/RimcEclipseCase.h
T
Kristian Bendiksen e21a32a180 #14001 Python: Use AppEnum fields for property_data_type arguments
Replace QString + setFromText parsing with typed
caf::PdmField<caf::AppEnum<...>> for m_propertyType and m_porosityModel
on RimcEclipseCase_propertyDataType. The script keywords stay
"PropertyType" / "PorosityModel" so the Python parameter names are
unchanged (property_type, porosity_model), and the auto-generated
StrEnum classes are now PropertyType and PorosityModelType (typed
annotations on the call site).

Register caf::AppEnum<RiaDefines::PorosityModelType> -> "PorosityModelType"
alongside the existing ResultCatType override so PorosityModelType's
auto-generated class name is stable regardless of which field the
generator visits first.

executeEnum() drops the setFromText parsing and the "Invalid property
type / porosity model" branches — the values now flow through typed
already, so an invalid enum text cannot reach the method body.
2026-05-26 08:23:28 +02:00

164 lines
5.9 KiB
C++

/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2020- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RiaDefines.h"
#include "RiaPorosityModel.h"
#include "cafAppEnum.h"
#include "cafPdmField.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmObjectMethod.h"
#include "cafPdmPtrField.h"
#include <QString>
class RimCellFilter;
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_importProperties : public caf::PdmObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_importProperties( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<std::vector<QString>> m_fileNames;
};
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_exportValuesInternal : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_exportValuesInternal( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
private:
caf::PdmField<QString> m_coordinateX;
caf::PdmField<QString> m_coordinateY;
caf::PdmField<QString> m_coordinateZ;
caf::PdmField<QString> m_propertyType;
caf::PdmField<QString> m_propertyName;
caf::PdmField<int> m_timeStep;
caf::PdmField<QString> m_porosityModel;
caf::PdmField<QString> m_resultKey;
};
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_exportCornerPointGridInternal : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_exportCornerPointGridInternal( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
private:
caf::PdmField<QString> m_zcornKey;
caf::PdmField<QString> m_coordKey;
caf::PdmField<QString> m_actnumKey;
};
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_addResultAlias : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_addResultAlias( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
private:
caf::PdmField<QString> m_resultName;
caf::PdmField<QString> m_aliasName;
};
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_clearResultAliases : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_clearResultAliases( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
};
//==================================================================================================
/// Return the data type (one of caf::AppEnum<RiaDefines::ResultDataType>) of a grid property.
/// Inverse of the data_type flag passed to set_active_cell_property / set_grid_property.
//==================================================================================================
class RimcEclipseCase_propertyDataType : public caf::PdmEnumObjectMethod<RiaDefines::ResultDataType>
{
CAF_PDM_HEADER_INIT;
public:
explicit RimcEclipseCase_propertyDataType( caf::PdmObjectHandle* self );
std::expected<RiaDefines::ResultDataType, QString> executeEnum() override;
QString returnEnumScriptName() const override { return "PropertyDataType"; }
private:
caf::PdmField<caf::AppEnum<RiaDefines::ResultCatType>> m_propertyType;
caf::PdmField<QString> m_propertyName;
caf::PdmField<caf::AppEnum<RiaDefines::PorosityModelType>> m_porosityModel;
};
//==================================================================================================
/// Apply a cell filter to this case for a given grid + time step and write a per-cell 0/1 mask
/// (1 = passes the filter, 0 = filtered out) to the key-value store under m_maskKey. The vector
/// length and ordering match case.grid_property(..., grid_index) so the two can be combined
/// element-wise.
//==================================================================================================
class RimcEclipseCase_filteredCellsInternal : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcEclipseCase_filteredCellsInternal( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
private:
caf::PdmPtrField<RimCellFilter*> m_filter;
caf::PdmField<QString> m_maskKey;
caf::PdmField<int> m_timeStep;
caf::PdmField<int> m_gridIndex;
};