OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12593 Simplify object methods exposed to Python

Browse Source
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-06-16 11:05:00 +02:00
1 parent b99a213ae7
commit 309c4af07e
63 files changed
+357 -1050
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimCommandRouter.cpp
+1 -25
View File
@@ -45,30 +45,6 @@ RimCommandRouter::RimCommandRouter()
///
//--------------------------------------------------------------------------------------------------
RimCommandRouterMethod::RimCommandRouterMethod( PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_VALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimCommandRouterMethod::isNullptrValidResult() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimCommandRouterMethod::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimCommandRouterMethod::defaultResult() const
{
return nullptr;
}
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimCommandRouter.h
-4
View File
@@ -29,10 +29,6 @@ class RimCommandRouterMethod : public caf::PdmObjectMethod
{
public:
RimCommandRouterMethod( PdmObjectHandle* self );
bool isNullptrValidResult() const override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
};
//==================================================================================================
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimCommandRouter, RimcCommandRouter_extractSu
///
//--------------------------------------------------------------------------------------------------
RimcCommandRouter_extractSurfaces::RimcCommandRouter_extractSurfaces( caf::PdmObjectHandle* self )
: RimCommandRouterMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Extract Layer Surface", "", "", "Extract Layer Surface" );
ApplicationLibCode/ProjectDataModelCommands/CommandRouter/RimcExtractSurfaces.h
+1 -1
View File
@@ -30,7 +30,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcCommandRouter_extractSurfaces : public RimCommandRouterMethod
class RimcCommandRouter_extractSurfaces : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
ApplicationLibCode/ProjectDataModelCommands/RimcEclipseCase.cpp
+2 -25
View File
@@ -44,9 +44,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseCase, RimcEclipseCase_importPropert
///
//--------------------------------------------------------------------------------------------------
RimcEclipseCase_importProperties::RimcEclipseCase_importProperties( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Import Properties", "", "", "Import Properties" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileNames, "FileNames", "" );
}
@@ -74,27 +75,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcEclipseCase_importProperties::
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseCase_importProperties::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcEclipseCase_importProperties::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseCase_importProperties::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcEclipseCase.h
+1 -4
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcEclipseCase_importProperties : public caf::PdmObjectMethod
class RimcEclipseCase_importProperties : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,9 +37,6 @@ public:
RimcEclipseCase_importProperties( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<std::vector<QString>> m_fileNames;
ApplicationLibCode/ProjectDataModelCommands/RimcEclipseStatisticsCase.cpp
+4 -75
View File
@@ -34,9 +34,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseStatisticsCase, RimcEclipseStatisti
///
//--------------------------------------------------------------------------------------------------
RimcEclipseStatisticsCase_setSourceProperties::RimcEclipseStatisticsCase_setSourceProperties( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Define Source Properties" );
CAF_PDM_InitScriptableFieldNoDefault( &m_propertyType, "PropertyType", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_propertyNames, "PropertyNames", "" );
}
@@ -61,37 +62,13 @@ std::expected<caf::PdmObjectHandle*, QString> RimcEclipseStatisticsCase_setSourc
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_setSourceProperties::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcEclipseStatisticsCase_setSourceProperties::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_setSourceProperties::isNullptrValidResult() const
{
return true;
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseStatisticsCase, RimcEclipseStatisticsCase_computeStatistics, "compute_statistics" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcEclipseStatisticsCase_computeStatistics::RimcEclipseStatisticsCase_computeStatistics( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
}
@@ -106,37 +83,13 @@ std::expected<caf::PdmObjectHandle*, QString> RimcEclipseStatisticsCase_computeS
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_computeStatistics::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcEclipseStatisticsCase_computeStatistics::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_computeStatistics::isNullptrValidResult() const
{
return true;
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimEclipseStatisticsCase, RimcEclipseStatisticsCase_clearSourceProperties, "clear_source_properties" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcEclipseStatisticsCase_clearSourceProperties::RimcEclipseStatisticsCase_clearSourceProperties( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
}
@@ -159,27 +112,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcEclipseStatisticsCase_clearSou
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_clearSourceProperties::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcEclipseStatisticsCase_clearSourceProperties::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcEclipseStatisticsCase_clearSourceProperties::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcEclipseStatisticsCase.h
+3 -12
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcEclipseStatisticsCase_setSourceProperties : public caf::PdmObjectMethod
class RimcEclipseStatisticsCase_setSourceProperties : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,9 +37,6 @@ public:
RimcEclipseStatisticsCase_setSourceProperties( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_propertyType;
@@ -49,7 +46,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcEclipseStatisticsCase_computeStatistics : public caf::PdmObjectMethod
class RimcEclipseStatisticsCase_computeStatistics : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -57,15 +54,12 @@ public:
RimcEclipseStatisticsCase_computeStatistics( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
};
//==================================================================================================
///
//==================================================================================================
class RimcEclipseStatisticsCase_clearSourceProperties : public caf::PdmObjectMethod
class RimcEclipseStatisticsCase_clearSourceProperties : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -73,7 +67,4 @@ public:
RimcEclipseStatisticsCase_clearSourceProperties( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
};
ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.cpp
+3 -11
View File
@@ -30,7 +30,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimElasticProperties, RimcElasticProperties_a
///
//--------------------------------------------------------------------------------------------------
RimcElasticProperties_addPropertyScaling::RimcElasticProperties_addPropertyScaling( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Add Elastic Propery Scaling", "", "", "Add Elastic Property Scaling" );
@@ -68,15 +68,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcElasticProperties_addPropertyS
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcElasticProperties_addPropertyScaling::resultIsPersistent() const
QString RimcElasticProperties_addPropertyScaling::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcElasticProperties_addPropertyScaling::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimElasticPropertyScaling );
return RimElasticPropertyScaling::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.h
+2 -3
View File
@@ -34,7 +34,7 @@ class RimWellPath;
//==================================================================================================
///
//==================================================================================================
class RimcElasticProperties_addPropertyScaling : public caf::PdmObjectMethod
class RimcElasticProperties_addPropertyScaling : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -42,8 +42,7 @@ public:
RimcElasticProperties_addPropertyScaling( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_formation;
ApplicationLibCode/ProjectDataModelCommands/RimcFishbonesCollection.cpp
+5 -61
View File
@@ -33,7 +33,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFishbonesCollection, RimcFishbonesCollecti
///
//--------------------------------------------------------------------------------------------------
RimcFishbonesCollection_appendFishbones::RimcFishbonesCollection_appendFishbones( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Append Fishbones", "", "", "Append Fishbones" );
@@ -68,17 +68,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFishbonesCollection_appendFish
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFishbonesCollection_appendFishbones::resultIsPersistent() const
QString RimcFishbonesCollection_appendFishbones::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFishbonesCollection_appendFishbones::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimFishbones );
return RimFishbones::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFishbonesCollection, RimcFishbonesCollection_setFixedStartLocation, "SetFixedStartLocation" );
@@ -87,7 +79,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFishbonesCollection, RimcFishbonesCollecti
///
//--------------------------------------------------------------------------------------------------
RimcFishbonesCollection_setFixedStartLocation::RimcFishbonesCollection_setFixedStartLocation( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set Fixed Start Location", "", "", "" );
@@ -108,37 +100,13 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFishbonesCollection_setFixedSt
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFishbonesCollection_setFixedStartLocation::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFishbonesCollection_setFixedStartLocation::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFishbonesCollection_setFixedStartLocation::isNullptrValidResult() const
{
return true;
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFishbonesCollection, RimcFishbonesCollection_setFixedEndLocation, "SetFixedEndLocation" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcFishbonesCollection_setFixedEndLocation::RimcFishbonesCollection_setFixedEndLocation( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set Fixed End Location", "", "", "" );
@@ -158,27 +126,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFishbonesCollection_setFixedEn
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFishbonesCollection_setFixedEndLocation::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFishbonesCollection_setFixedEndLocation::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFishbonesCollection_setFixedEndLocation::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcFishbonesCollection.h
+4 -13
View File
@@ -27,7 +27,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcFishbonesCollection_appendFishbones : public caf::PdmObjectMethod
class RimcFishbonesCollection_appendFishbones : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -35,8 +35,7 @@ public:
RimcFishbonesCollection_appendFishbones( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<std::vector<double>> m_subLocations;
@@ -46,7 +45,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcFishbonesCollection_setFixedStartLocation : public caf::PdmObjectMethod
class RimcFishbonesCollection_setFixedStartLocation : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -54,10 +53,6 @@ public:
RimcFishbonesCollection_setFixedStartLocation( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<double> m_location;
@@ -66,7 +61,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcFishbonesCollection_setFixedEndLocation : public caf::PdmObjectMethod
class RimcFishbonesCollection_setFixedEndLocation : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -74,10 +69,6 @@ public:
RimcFishbonesCollection_setFixedEndLocation( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<double> m_location;
ApplicationLibCode/ProjectDataModelCommands/RimcFractureTemplate.cpp
+2 -25
View File
@@ -30,9 +30,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureTemplate, RimcFractureTemplate_set
///
//--------------------------------------------------------------------------------------------------
RimcFractureTemplate_setScaleFactors::RimcFractureTemplate_setScaleFactors( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set Fracture Template Scale Factors", "", "", "Set Fracture Template Scale Factors." );
CAF_PDM_InitScriptableField( &m_halfLength, "HalfLength", 1.0, "Half Length" );
CAF_PDM_InitScriptableField( &m_height, "Height", 1.0, "Height" );
CAF_PDM_InitScriptableField( &m_dFactor, "DFactor", 1.0, "D Factor" );
@@ -58,27 +59,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFractureTemplate_setScaleFacto
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFractureTemplate_setScaleFactors::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFractureTemplate_setScaleFactors::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFractureTemplate_setScaleFactors::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcFractureTemplate.h
+1 -4
View File
@@ -29,7 +29,7 @@ class RimFractureTemplate;
//==================================================================================================
///
//==================================================================================================
class RimcFractureTemplate_setScaleFactors : public caf::PdmObjectMethod
class RimcFractureTemplate_setScaleFactors : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,9 +37,6 @@ public:
RimcFractureTemplate_setScaleFactors( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<double> m_halfLength;
ApplicationLibCode/ProjectDataModelCommands/RimcFractureTemplateCollection.cpp
+8 -22
View File
@@ -39,9 +39,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureTemplateCollection,
///
//--------------------------------------------------------------------------------------------------
RimcFractureTemplateCollection_appendFractureTemplate::RimcFractureTemplateCollection_appendFractureTemplate( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Fracture Template", "", "", "Create a new StimPlan Fracture Template" );
CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "", "", "", "File Path to StimPlan Countour File" );
}
@@ -65,17 +66,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFractureTemplateCollection_app
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFractureTemplateCollection_appendFractureTemplate::resultIsPersistent() const
QString RimcFractureTemplateCollection_appendFractureTemplate::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFractureTemplateCollection_appendFractureTemplate::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimStimPlanFractureTemplate );
return RimStimPlanFractureTemplate::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureTemplateCollection,
@@ -86,9 +79,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureTemplateCollection,
///
//--------------------------------------------------------------------------------------------------
RimcFractureTemplateCollection_appendThermalFractureTemplate::RimcFractureTemplateCollection_appendThermalFractureTemplate( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Fracture Template", "", "", "Create a new Thermal Fracture Template" );
CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "", "", "", "File Path to Thermal Fracture CSV File" );
}
@@ -112,15 +106,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcFractureTemplateCollection_app
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcFractureTemplateCollection_appendThermalFractureTemplate::resultIsPersistent() const
QString RimcFractureTemplateCollection_appendThermalFractureTemplate::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcFractureTemplateCollection_appendThermalFractureTemplate::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimThermalFractureTemplate );
return RimThermalFractureTemplate::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcFractureTemplateCollection.h
+4 -6
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcFractureTemplateCollection_appendFractureTemplate : public caf::PdmObjectMethod
class RimcFractureTemplateCollection_appendFractureTemplate : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,8 +37,7 @@ public:
RimcFractureTemplateCollection_appendFractureTemplate( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_filePath;
@@ -47,7 +46,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcFractureTemplateCollection_appendThermalFractureTemplate : public caf::PdmObjectMethod
class RimcFractureTemplateCollection_appendThermalFractureTemplate : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -55,8 +54,7 @@ public:
RimcFractureTemplateCollection_appendThermalFractureTemplate( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_filePath;
ApplicationLibCode/ProjectDataModelCommands/RimcIdenticalGridCaseGroup.cpp
+4 -11
View File
@@ -29,7 +29,8 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimIdenticalGridCaseGroup, RimcIdenticalGridC
///
//--------------------------------------------------------------------------------------------------
RimcIdenticalGridCaseGroup_createStatisticsCase::RimcIdenticalGridCaseGroup_createStatisticsCase( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
}
@@ -49,15 +50,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcIdenticalGridCaseGroup_createS
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcIdenticalGridCaseGroup_createStatisticsCase::resultIsPersistent() const
QString RimcIdenticalGridCaseGroup_createStatisticsCase::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcIdenticalGridCaseGroup_createStatisticsCase::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimEclipseStatisticsCase );
return RimEclipseStatisticsCase::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcIdenticalGridCaseGroup.h
+2 -3
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcIdenticalGridCaseGroup_createStatisticsCase : public caf::PdmObjectMethod
class RimcIdenticalGridCaseGroup_createStatisticsCase : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,6 +37,5 @@ public:
RimcIdenticalGridCaseGroup_createStatisticsCase( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
};
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.cpp
+8 -22
View File
@@ -179,9 +179,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimExtrudedCurveIntersection, RimcExtrudedCur
///
//--------------------------------------------------------------------------------------------------
RimcExtrudedCurveIntersection_geometry::RimcExtrudedCurveIntersection_geometry( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Intersection Geometry" );
CAF_PDM_InitScriptableFieldNoDefault( &m_geometryType, "GeometryType", "Geometry Type" );
}
@@ -238,17 +239,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcExtrudedCurveIntersection_geom
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcExtrudedCurveIntersection_geometry::resultIsPersistent() const
QString RimcExtrudedCurveIntersection_geometry::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcExtrudedCurveIntersection_geometry::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcTriangleGeometry );
return RimcTriangleGeometry::classKeywordStatic();
}
//--------------------------------------------------------------------------------------------------
@@ -288,9 +281,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimExtrudedCurveIntersection, RimcExtrudedCur
///
//--------------------------------------------------------------------------------------------------
RimcExtrudedCurveIntersection_geometryResult::RimcExtrudedCurveIntersection_geometryResult( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Geometry Result" );
CAF_PDM_InitScriptableFieldNoDefault( &m_geometryType, "GeometryType", "Geometry Type" );
}
@@ -341,15 +335,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcExtrudedCurveIntersection_geom
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcExtrudedCurveIntersection_geometryResult::resultIsPersistent() const
QString RimcExtrudedCurveIntersection_geometryResult::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcExtrudedCurveIntersection_geometryResult::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerDouble );
return RimcDataContainerDouble::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcIntersection.h
+2 -4
View File
@@ -87,8 +87,7 @@ public:
RimcExtrudedCurveIntersection_geometry( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
static std::unique_ptr<RivIntersectionGeometryGeneratorInterface>
createGeometryGenerator( RimExtrudedCurveIntersection* intersection, RimcTriangleGeometry::GeometryType geometryType );
@@ -108,8 +107,7 @@ public:
RimcExtrudedCurveIntersection_geometryResult( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<caf::AppEnum<RimcTriangleGeometry::GeometryType>> m_geometryType;
ApplicationLibCode/ProjectDataModelCommands/RimcModeledWellPath.cpp
+4 -11
View File
@@ -34,9 +34,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimModeledWellPath, RimcModeledWellPath_appen
///
//--------------------------------------------------------------------------------------------------
RimcModeledWellPath_appendLateral::RimcModeledWellPath_appendLateral( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Append Well Path Lateral", "", "", "Append Well Path Lateral" );
CAF_PDM_InitScriptableField( &m_tieInDepth, "TieInDepth", 0.0, "", "", "", "Measured Depth on the Parent Well Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_lateralName, "LateralName", "", "", "", "Lateral Name" );
}
@@ -61,15 +62,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcModeledWellPath_appendLateral:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcModeledWellPath_appendLateral::resultIsPersistent() const
QString RimcModeledWellPath_appendLateral::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcModeledWellPath_appendLateral::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimModeledWellPath );
return RimModeledWellPath::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcModeledWellPath.h
+2 -3
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcModeledWellPath_appendLateral : public caf::PdmObjectMethod
class RimcModeledWellPath_appendLateral : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,8 +37,7 @@ public:
RimcModeledWellPath_appendLateral( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<double> m_tieInDepth;
ApplicationLibCode/ProjectDataModelCommands/RimcPolygonCollection.cpp
+4 -11
View File
@@ -31,9 +31,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimPolygonCollection, RimcPolygonCollection_c
///
//--------------------------------------------------------------------------------------------------
RimcPolygonCollection_createPolygon::RimcPolygonCollection_createPolygon( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create and Add New Polygon", "", "", "Create and Add New Polygon" );
CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "Name" );
CAF_PDM_InitScriptableFieldNoDefault( &m_coordinates, "Coordinates", "Coordinates" );
}
@@ -65,15 +66,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcPolygonCollection_createPolygo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcPolygonCollection_createPolygon::resultIsPersistent() const
QString RimcPolygonCollection_createPolygon::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcPolygonCollection_createPolygon::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimPolygon );
return RimPolygon::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcPolygonCollection.h
+2 -3
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcPolygonCollection_createPolygon : public caf::PdmObjectMethod
class RimcPolygonCollection_createPolygon : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,8 +37,7 @@ public:
RimcPolygonCollection_createPolygon( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_name;
ApplicationLibCode/ProjectDataModelCommands/RimcPressureTable.cpp
+3 -11
View File
@@ -29,7 +29,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimPressureTable, RimcPressureTable_addPressu
///
//--------------------------------------------------------------------------------------------------
RimcPressureTable_addPressure::RimcPressureTable_addPressure( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Add pressure data", "", "", "Add pressure data to pressure table." );
@@ -56,15 +56,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcPressureTable_addPressure::exe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcPressureTable_addPressure::resultIsPersistent() const
QString RimcPressureTable_addPressure::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcPressureTable_addPressure::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimPressureTableItem );
return RimPressureTableItem::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcPressureTable.h
+2 -3
View File
@@ -27,7 +27,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcPressureTable_addPressure : public caf::PdmObjectMethod
class RimcPressureTable_addPressure : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -35,8 +35,7 @@ public:
RimcPressureTable_addPressure( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<double> m_depth;
ApplicationLibCode/ProjectDataModelCommands/RimcProject.cpp
+18 -78
View File
@@ -53,9 +53,11 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_importSummaryCase, "im
///
//--------------------------------------------------------------------------------------------------
RimProject_importSummaryCase::RimProject_importSummaryCase( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Import Summary Case", "", "", "Import Summary Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "" );
}
@@ -101,25 +103,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimProject_importSummaryCase::exec
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_importSummaryCase::resultIsPersistent() const
QString RimProject_importSummaryCase::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimProject_importSummaryCase::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimFileSummaryCase );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_importSummaryCase::isNullptrValidResult() const
{
return true;
return RimFileSummaryCase::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_summaryCase, "summaryCase" );
@@ -128,9 +114,11 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_summaryCase, "summaryC
///
//--------------------------------------------------------------------------------------------------
RimProject_summaryCase::RimProject_summaryCase( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_VALID, PdmObjectMethod::ResultType::PERSISTENT_TRUE )
{
CAF_PDM_InitObject( "Find Summary Case", "", "", "Find Summary Case" );
CAF_PDM_InitScriptableField( &m_caseId, "CaseId", -1, "" );
}
@@ -153,25 +141,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimProject_summaryCase::execute()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_summaryCase::resultIsPersistent() const
QString RimProject_summaryCase::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimProject_summaryCase::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimFileSummaryCase );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_summaryCase::isNullptrValidResult() const
{
return true;
return RimFileSummaryCase::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_surfaceFolder, "surfaceFolder" );
@@ -180,9 +152,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_surfaceFolder, "surfac
///
//--------------------------------------------------------------------------------------------------
RimProject_surfaceFolder::RimProject_surfaceFolder( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Get Surface Folder", "", "", "Get Surface Folder" );
CAF_PDM_InitScriptableFieldNoDefault( &m_folderName, "FolderName", "" );
}
@@ -194,7 +167,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimProject_surfaceFolder::execute(
auto proj = RimProject::current();
RimSurfaceCollection* surfcoll = proj->activeOilField()->surfaceCollection();
// Blank foldername parameter should return the topmost folder
// Blank folder name parameter should return the topmost folder
if ( m_folderName().isEmpty() ) return surfcoll;
for ( auto s : surfcoll->subCollections() )
@@ -208,25 +181,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimProject_surfaceFolder::execute(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_surfaceFolder::resultIsPersistent() const
QString RimProject_surfaceFolder::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimProject_surfaceFolder::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimSurfaceCollection );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_surfaceFolder::isNullptrValidResult() const
{
return true;
return RimSurfaceCollection::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_createGridFromKeyValues, "createGridFromKeyValues" );
@@ -235,7 +192,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimProject, RimProject_createGridFromKeyValue
///
//--------------------------------------------------------------------------------------------------
RimProject_createGridFromKeyValues::RimProject_createGridFromKeyValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create grid from key values", "", "", "Create Grid From Key Values" );
@@ -320,27 +277,10 @@ std::expected<caf::PdmObjectHandle*, QString> RimProject_createGridFromKeyValues
return grid;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_createGridFromKeyValues::resultIsPersistent() const
QString RimProject_createGridFromKeyValues::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimProject_createGridFromKeyValues::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimCornerPointCase );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject_createGridFromKeyValues::isNullptrValidResult() const
{
return true;
return RimCornerPointCase::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcProject.h
+7 -15
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimProject_importSummaryCase : public caf::PdmObjectMethod
class RimProject_importSummaryCase : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,9 +37,7 @@ public:
RimProject_importSummaryCase( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_fileName;
@@ -56,9 +54,7 @@ public:
RimProject_summaryCase( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<int> m_caseId;
@@ -67,7 +63,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimProject_surfaceFolder : public caf::PdmObjectMethod
class RimProject_surfaceFolder : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -75,9 +71,7 @@ public:
RimProject_surfaceFolder( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_folderName;
@@ -86,7 +80,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimProject_createGridFromKeyValues : public caf::PdmObjectMethod
class RimProject_createGridFromKeyValues : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -94,9 +88,7 @@ public:
RimProject_createGridFromKeyValues( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_name;
ApplicationLibCode/ProjectDataModelCommands/RimcRegularSurface.cpp
+4 -50
View File
@@ -34,9 +34,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimRegularSurface, RimcRegularSurface_setProp
///
//--------------------------------------------------------------------------------------------------
RimcRegularSurface_setPropertyFromKey::RimcRegularSurface_setPropertyFromKey( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set property from key", "", "", "Set property from key." );
CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "", "", "", "Name" );
CAF_PDM_InitScriptableFieldNoDefault( &m_valueKey, "ValueKey", "", "", "", "Key Value" );
}
@@ -72,39 +73,16 @@ std::expected<caf::PdmObjectHandle*, QString> RimcRegularSurface_setPropertyFrom
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcRegularSurface_setPropertyFromKey::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcRegularSurface_setPropertyFromKey::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( nullptr );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcRegularSurface_setPropertyFromKey::isNullptrValidResult() const
{
return true;
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimRegularSurface, RimcRegularSurface_setPropertyAsDepth, "SetPropertyAsDepth" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcRegularSurface_setPropertyAsDepth::RimcRegularSurface_setPropertyAsDepth( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set property as depth", "", "", "Set property as depth." );
CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "", "", "", "Name" );
}
@@ -130,27 +108,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcRegularSurface_setPropertyAsDe
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcRegularSurface_setPropertyAsDepth::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcRegularSurface_setPropertyAsDepth::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( nullptr );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcRegularSurface_setPropertyAsDepth::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcRegularSurface.h
+2 -8
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcRegularSurface_setPropertyFromKey : public caf::PdmObjectMethod
class RimcRegularSurface_setPropertyFromKey : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,9 +37,6 @@ public:
RimcRegularSurface_setPropertyFromKey( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_name;
@@ -49,7 +46,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcRegularSurface_setPropertyAsDepth : public caf::PdmObjectMethod
class RimcRegularSurface_setPropertyAsDepth : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -57,9 +54,6 @@ public:
RimcRegularSurface_setPropertyAsDepth( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_name;
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.cpp
+2 -25
View File
@@ -30,9 +30,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModel, RimcStimPlanModel_exportToF
///
//--------------------------------------------------------------------------------------------------
RimcStimPlanModel_exportToFile::RimcStimPlanModel_exportToFile( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Export StimPlan Model Plot", "", "", "Export StimPlan Model Plot to File" );
CAF_PDM_InitScriptableFieldNoDefault( &m_directoryPath, "DirectoryPath", "", "", "", "Directory Path" );
}
@@ -48,27 +49,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimcStimPlanModel_exportToFile::ex
else
return std::unexpected( "Unable to write model to directory" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcStimPlanModel_exportToFile::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcStimPlanModel_exportToFile::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimStimPlanModel );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcStimPlanModel_exportToFile::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.h
+1 -4
View File
@@ -30,7 +30,7 @@ class RimStimPlanModel;
//==================================================================================================
///
//==================================================================================================
class RimcStimPlanModel_exportToFile : public caf::PdmObjectMethod
class RimcStimPlanModel_exportToFile : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -38,9 +38,6 @@ public:
RimcStimPlanModel_exportToFile( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_directoryPath;
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp
+4 -11
View File
@@ -37,9 +37,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelCollection, RimcStimPlanModel
///
//--------------------------------------------------------------------------------------------------
RimcStimPlanModelCollection_appendStimPlanModel::RimcStimPlanModelCollection_appendStimPlanModel( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableField( &m_md, "MeasuredDepth", 0.0, "Measured Depth" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "", "", "", "StimPlan Model Template" );
@@ -75,15 +76,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcStimPlanModelCollection_append
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcStimPlanModelCollection_appendStimPlanModel::resultIsPersistent() const
QString RimcStimPlanModelCollection_appendStimPlanModel::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcStimPlanModelCollection_appendStimPlanModel::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimStimPlanModel );
return RimStimPlanModel::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h
+2 -3
View File
@@ -35,7 +35,7 @@ class RimEclipseCase;
//==================================================================================================
///
//==================================================================================================
class RimcStimPlanModelCollection_appendStimPlanModel : public caf::PdmObjectMethod
class RimcStimPlanModelCollection_appendStimPlanModel : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -43,8 +43,7 @@ public:
RimcStimPlanModelCollection_appendStimPlanModel( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmPtrField<RimWellPath*> m_wellPath;
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.cpp
+4 -11
View File
@@ -35,9 +35,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelPlotCollection,
///
//--------------------------------------------------------------------------------------------------
RimcStimPlanModelPlotCollection_appendStimPlanModelPlot::RimcStimPlanModelPlotCollection_appendStimPlanModelPlot( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModel, "StimPlanModel", "", "", "", "StimPlan Model" );
}
@@ -60,15 +61,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcStimPlanModelPlotCollection_ap
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcStimPlanModelPlotCollection_appendStimPlanModelPlot::resultIsPersistent() const
QString RimcStimPlanModelPlotCollection_appendStimPlanModelPlot::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcStimPlanModelPlotCollection_appendStimPlanModelPlot::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimStimPlanModelPlot );
return RimStimPlanModelPlot::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h
+2 -3
View File
@@ -30,7 +30,7 @@ class RimStimPlanModel;
//==================================================================================================
///
//==================================================================================================
class RimcStimPlanModelPlotCollection_appendStimPlanModelPlot : public caf::PdmObjectMethod
class RimcStimPlanModelPlotCollection_appendStimPlanModelPlot : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -38,8 +38,7 @@ public:
RimcStimPlanModelPlotCollection_appendStimPlanModelPlot( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmPtrField<RimStimPlanModel*> m_stimPlanModel;
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.cpp
+4 -11
View File
@@ -39,9 +39,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimStimPlanModelTemplateCollection,
//--------------------------------------------------------------------------------------------------
RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate::RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate(
caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create StimPlan Model Template", "", "", "Create a new StimPlan Model Template" );
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "", "", "", "Time Step" );
@@ -76,15 +77,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcStimPlanModelTemplateCollectio
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate::resultIsPersistent() const
QString RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimStimPlanModelTemplate );
return RimStimPlanModelTemplate::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h
+2 -3
View File
@@ -33,7 +33,7 @@ class RimEclipseCase;
//==================================================================================================
///
//==================================================================================================
class RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate : public caf::PdmObjectMethod
class RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -41,8 +41,7 @@ public:
RimcStimPlanModelTemplateCollection_appendStimPlanModelTemplate( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp
+15 -69
View File
@@ -38,9 +38,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_summaryVectorV
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase_summaryVectorValues::RimSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Summary Vector Values", "", "", "Get all values for a summary vector" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address specifying the summary vector" );
}
@@ -69,17 +70,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimSummaryCase_summaryVectorValues
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_summaryVectorValues::resultIsPersistent() const
QString RimSummaryCase_summaryVectorValues::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_summaryVectorValues::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerDouble );
return RimcDataContainerDouble::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableAddresses, "availableAddresses" );
@@ -88,7 +81,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableAddre
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase_availableAddresses::RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Available Addresses" );
}
@@ -121,17 +114,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimSummaryCase_availableAddresses:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_availableAddresses::resultIsPersistent() const
QString RimSummaryCase_availableAddresses::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_availableAddresses::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerString );
return RimcDataContainerString::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableTimeSteps, "availableTimeSteps" );
@@ -140,7 +125,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableTimeS
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase_availableTimeSteps::RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Available TimeSteps" );
}
@@ -166,17 +151,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimSummaryCase_availableTimeSteps:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_availableTimeSteps::resultIsPersistent() const
QString RimSummaryCase_availableTimeSteps::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_availableTimeSteps::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerTime );
return RimcDataContainerTime::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_resampleValues, "resampleValues" );
@@ -185,9 +162,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_resampleValues
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase_resampleValues::RimSummaryCase_resampleValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Resample Values" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address specifying the summary vector" );
CAF_PDM_InitScriptableFieldNoDefault( &m_resamplingPeriod, "ResamplingPeriod", "", "", "", "Resampling Period" );
@@ -239,17 +217,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimSummaryCase_resampleValues::exe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_resampleValues::resultIsPersistent() const
QString RimSummaryCase_resampleValues::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_resampleValues::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcSummaryResampleData );
return RimcSummaryResampleData::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_setSummaryVectorValues, "setSummaryValues" );
@@ -258,7 +228,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_setSummaryVect
///
//--------------------------------------------------------------------------------------------------
RimSummaryCase_setSummaryVectorValues::RimSummaryCase_setSummaryVectorValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Set Summary Values" );
@@ -301,27 +271,3 @@ std::expected<caf::PdmObjectHandle*, QString> RimSummaryCase_setSummaryVectorVal
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_setSummaryVectorValues::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_setSummaryVectorValues::defaultResult() const
{
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryCase_setSummaryVectorValues::isNullptrValidResult() const
{
return true;
}
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.h
+5 -12
View File
@@ -37,8 +37,7 @@ public:
RimSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_addressString;
@@ -55,8 +54,7 @@ public:
RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
};
//==================================================================================================
@@ -70,8 +68,7 @@ public:
RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
};
//==================================================================================================
@@ -85,8 +82,7 @@ public:
RimSummaryCase_resampleValues( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_addressString;
@@ -96,7 +92,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimSummaryCase_setSummaryVectorValues : public caf::PdmObjectMethod
class RimSummaryCase_setSummaryVectorValues : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -104,9 +100,6 @@ public:
RimSummaryCase_setSummaryVectorValues( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_addressString;
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
+4 -11
View File
@@ -41,9 +41,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryPlotCollection, RimcSummaryPlotColl
///
//--------------------------------------------------------------------------------------------------
RimcSummaryPlotCollection_newSummaryPlot::RimcSummaryPlotCollection_newSummaryPlot( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Summary Plot", "", "", "Create a new Summary Plot" );
CAF_PDM_InitScriptableFieldNoDefault( &m_summaryCases, "SummaryCases", "", "", "", "Summary Cases" );
CAF_PDM_InitScriptableFieldNoDefault( &m_ensemble, "Ensemble", "", "", "", "Ensemble" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address string specifying the plot options" );
@@ -93,15 +94,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSummaryPlotCollection_newSumma
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSummaryPlotCollection_newSummaryPlot::resultIsPersistent() const
QString RimcSummaryPlotCollection_newSummaryPlot::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSummaryPlotCollection_newSummaryPlot::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimSummaryPlot );
return RimSummaryPlot::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.h
+2 -3
View File
@@ -35,7 +35,7 @@ class RimSummaryEnsemble;
//==================================================================================================
///
//==================================================================================================
class RimcSummaryPlotCollection_newSummaryPlot : public caf::PdmObjectMethod
class RimcSummaryPlotCollection_newSummaryPlot : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -43,8 +43,7 @@ public:
RimcSummaryPlotCollection_newSummaryPlot( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_addressString;
ApplicationLibCode/ProjectDataModelCommands/RimcSurface.cpp
+8 -29
View File
@@ -15,11 +15,11 @@
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimcSurface.h"
#include "RimCase.h"
#include "RimSurface.h"
#include "RimcDataContainerString.h"
#include "Surface/RigSurface.h"
@@ -36,9 +36,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSurface, RimcSurface_exportToFile, "Export
///
//--------------------------------------------------------------------------------------------------
RimcSurface_exportToFile::RimcSurface_exportToFile( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Export Surface To file", "", "", "Export a surface to file" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "", "", "", "Filename to export surface to" );
}
@@ -54,6 +55,10 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurface_exportToFile::execute(
}
RigSurface* surfaceData = surface->surfaceData();
if ( !surfaceData )
{
return std::unexpected( "No surface data found" );
}
if ( !RifSurfaceExporter::writeGocadTSurfFile( m_fileName(),
surface->userDescription(),
@@ -63,31 +68,5 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurface_exportToFile::execute(
return std::unexpected( QString( "Failed to write surface to file: '%1'" ).arg( m_fileName() ) );
}
auto dataObject = new RimcDataContainerString();
dataObject->m_stringValues = { m_fileName() };
return dataObject;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurface_exportToFile::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSurface_exportToFile::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerString() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurface_exportToFile::isNullptrValidResult() const
{
return true;
return nullptr;
}
ApplicationLibCode/ProjectDataModelCommands/RimcSurface.h
+1 -4
View File
@@ -31,7 +31,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcSurface_exportToFile : public caf::PdmObjectMethod
class RimcSurface_exportToFile : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -39,9 +39,6 @@ public:
RimcSurface_exportToFile( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_fileName;
ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.cpp
+16 -76
View File
@@ -40,9 +40,11 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSurfaceCollection, RimcSurfaceCollection_n
///
//--------------------------------------------------------------------------------------------------
RimcSurfaceCollection_importSurface::RimcSurfaceCollection_importSurface( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Import Surface", "", "", "Import a new surface from file" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "", "", "", "Filename to import surface from" );
}
@@ -64,34 +66,19 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurfaceCollection_importSurfac
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_importSurface::resultIsPersistent() const
QString RimcSurfaceCollection_importSurface::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSurfaceCollection_importSurface::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimFileSurface );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_importSurface::isNullptrValidResult() const
{
return true;
return RimFileSurface::classKeywordStatic();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSurfaceCollection_addFolder::RimcSurfaceCollection_addFolder( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Add Folder", "", "", "Add a new surface folder" );
CAF_PDM_InitScriptableField( &m_folderName, "FolderName", QString( "Surfaces" ), "", "", "", "New surface folder name" );
}
@@ -115,34 +102,19 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurfaceCollection_addFolder::e
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_addFolder::resultIsPersistent() const
QString RimcSurfaceCollection_addFolder::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSurfaceCollection_addFolder::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimSurfaceCollection );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_addFolder::isNullptrValidResult() const
{
return true;
return RimSurfaceCollection::classKeywordStatic();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSurfaceCollection_newSurface::RimcSurfaceCollection_newSurface( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "New Surface", "", "", "Create a new surface" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "" );
CAF_PDM_InitScriptableField( &m_kIndex, "KIndex", 0, "" );
}
@@ -164,32 +136,16 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurfaceCollection_newSurface::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_newSurface::resultIsPersistent() const
QString RimcSurfaceCollection_newSurface::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSurfaceCollection_newSurface::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimGridCaseSurface );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_newSurface::isNullptrValidResult() const
{
return true;
return RimGridCaseSurface::classKeywordStatic();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSurfaceCollection_newRegularSurface::RimcSurfaceCollection_newRegularSurface( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "New Regular Surface", "", "", "Create a new regular surface" );
@@ -246,23 +202,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcSurfaceCollection_newRegularSu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_newRegularSurface::resultIsPersistent() const
QString RimcSurfaceCollection_newRegularSurface::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSurfaceCollection_newRegularSurface::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimRegularSurface );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSurfaceCollection_newRegularSurface::isNullptrValidResult() const
{
return true;
return RimRegularSurface::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.h
+8 -16
View File
@@ -36,7 +36,7 @@ class RimCase;
//==================================================================================================
///
//==================================================================================================
class RimcSurfaceCollection_importSurface : public caf::PdmObjectMethod
class RimcSurfaceCollection_importSurface : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -44,9 +44,7 @@ public:
RimcSurfaceCollection_importSurface( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_fileName;
@@ -55,7 +53,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcSurfaceCollection_addFolder : public caf::PdmObjectMethod
class RimcSurfaceCollection_addFolder : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -63,9 +61,7 @@ public:
RimcSurfaceCollection_addFolder( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_folderName;
@@ -74,7 +70,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcSurfaceCollection_newSurface : public caf::PdmObjectMethod
class RimcSurfaceCollection_newSurface : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -82,9 +78,7 @@ public:
RimcSurfaceCollection_newSurface( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmPtrField<RimCase*> m_case;
@@ -94,7 +88,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcSurfaceCollection_newRegularSurface : public caf::PdmObjectMethod
class RimcSurfaceCollection_newRegularSurface : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -102,9 +96,7 @@ public:
RimcSurfaceCollection_newRegularSurface( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<QString> m_name;
ApplicationLibCode/ProjectDataModelCommands/RimcThermalFractureTemplate.cpp
+5 -44
View File
@@ -32,9 +32,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimThermalFractureTemplate, RimcThermalFractu
///
//--------------------------------------------------------------------------------------------------
RimcThermalFractureTemplate_exportToFile::RimcThermalFractureTemplate_exportToFile( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmVoidObjectMethod( self )
{
CAF_PDM_InitObject( "Export Thermal Fracture Template", "", "", "Export Thermal Fracture Template to File" );
CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "", "", "", "File Path" );
CAF_PDM_InitScriptableField( &m_timeStep, "TimeStep", 0, "Time Step" );
}
@@ -50,37 +51,13 @@ std::expected<caf::PdmObjectHandle*, QString> RimcThermalFractureTemplate_export
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcThermalFractureTemplate_exportToFile::resultIsPersistent() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcThermalFractureTemplate_exportToFile::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimThermalFractureTemplate );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcThermalFractureTemplate_exportToFile::isNullptrValidResult() const
{
return true;
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimThermalFractureTemplate, RimcThermalFractureTemplate_timeSteps, "TimeSteps" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcThermalFractureTemplate_timeSteps::RimcThermalFractureTemplate_timeSteps( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_INVALID, PdmObjectMethod::ResultType::PERSISTENT_FALSE )
{
CAF_PDM_InitObject( "Get Thermal Fracture Template Time Steps", "", "", "Get Thermal Fracture Template Time Steps" );
}
@@ -102,23 +79,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcThermalFractureTemplate_timeSt
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcThermalFractureTemplate_timeSteps::resultIsPersistent() const
QString RimcThermalFractureTemplate_timeSteps::classKeywordReturnedType() const
{
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcThermalFractureTemplate_timeSteps::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerString );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcThermalFractureTemplate_timeSteps::isNullptrValidResult() const
{
return true;
return RimcDataContainerString::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcThermalFractureTemplate.h
+2 -7
View File
@@ -30,7 +30,7 @@ class RimThermalFractureTemplate;
//==================================================================================================
///
//==================================================================================================
class RimcThermalFractureTemplate_exportToFile : public caf::PdmObjectMethod
class RimcThermalFractureTemplate_exportToFile : public caf::PdmVoidObjectMethod
{
CAF_PDM_HEADER_INIT;
@@ -38,9 +38,6 @@ public:
RimcThermalFractureTemplate_exportToFile( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
private:
caf::PdmField<QString> m_filePath;
@@ -58,7 +55,5 @@ public:
RimcThermalFractureTemplate_timeSteps( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
bool isNullptrValidResult() const override;
QString classKeywordReturnedType() const override;
};
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.cpp
+4 -11
View File
@@ -39,9 +39,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellLogPlot, RimcWellLogPlot_newWellLogTra
///
//--------------------------------------------------------------------------------------------------
RimcWellLogPlot_newWellLogTrack::RimcWellLogPlot_newWellLogTrack( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Well Log Track", "", "", "Create a new well log track" );
CAF_PDM_InitScriptableFieldNoDefault( &m_title, "Title", "", "", "", "Title" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "", "", "", "Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
@@ -90,15 +91,7 @@ RimWellLogTrack* RimcWellLogPlot_newWellLogTrack::createWellLogTrack( RimWellLog
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellLogPlot_newWellLogTrack::resultIsPersistent() const
QString RimcWellLogPlot_newWellLogTrack::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellLogPlot_newWellLogTrack::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellLogTrack );
return RimWellLogTrack::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.h
+2 -3
View File
@@ -32,7 +32,7 @@ class RimWellLogTrack;
//==================================================================================================
///
//==================================================================================================
class RimcWellLogPlot_newWellLogTrack : public caf::PdmObjectMethod
class RimcWellLogPlot_newWellLogTrack : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -40,8 +40,7 @@ public:
RimcWellLogPlot_newWellLogTrack( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
static RimWellLogTrack*
createWellLogTrack( RimWellLogPlot* wellLogPlot, RimEclipseCase* eclipseCase, RimWellPath* wellPath, const QString& title );
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.cpp
+4 -11
View File
@@ -40,9 +40,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellLogPlotCollection, RimcWellLogPlotColl
///
//--------------------------------------------------------------------------------------------------
RimcWellLogPlotCollection_newWellLogPlot::RimcWellLogPlotCollection_newWellLogPlot( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Well Log Plot", "", "", "Create a new well log plot" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "", "", "", "Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
@@ -89,15 +90,7 @@ RimWellLogPlot* RimcWellLogPlotCollection_newWellLogPlot::createWellLogPlot( Rim
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellLogPlotCollection_newWellLogPlot::resultIsPersistent() const
QString RimcWellLogPlotCollection_newWellLogPlot::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellLogPlotCollection_newWellLogPlot::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellLogPlot );
return RimWellLogPlot::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.h
+2 -3
View File
@@ -30,7 +30,7 @@ class RimStimPlanModel;
//==================================================================================================
///
//==================================================================================================
class RimcWellLogPlotCollection_newWellLogPlot : public caf::PdmObjectMethod
class RimcWellLogPlotCollection_newWellLogPlot : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -38,8 +38,7 @@ public:
RimcWellLogPlotCollection_newWellLogPlot( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
static RimWellLogPlot*
createWellLogPlot( RimWellLogPlotCollection* wellLogPlotCollection, RimWellPath* wellPath, RimEclipseCase* eclipseCase );
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.cpp
+4 -11
View File
@@ -40,9 +40,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellLogTrack, RimcWellLogTrack_addExtracti
///
//--------------------------------------------------------------------------------------------------
RimcWellLogTrack_addExtractionCurve::RimcWellLogTrack_addExtractionCurve( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create Well Log Extraction Curve", "", "", "Create a well log extraction curve" );
CAF_PDM_InitScriptableFieldNoDefault( &m_case, "Case", "", "", "", "Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_propertyType, "PropertyType", "", "", "", "Property Type" );
@@ -114,15 +115,7 @@ RimWellLogExtractionCurve* RimcWellLogTrack_addExtractionCurve::addExtractionCur
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellLogTrack_addExtractionCurve::resultIsPersistent() const
QString RimcWellLogTrack_addExtractionCurve::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellLogTrack_addExtractionCurve::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellLogExtractionCurve );
return RimWellLogExtractionCurve::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.h
+2 -3
View File
@@ -33,7 +33,7 @@ class RimWellLogExtractionCurve;
//==================================================================================================
///
//==================================================================================================
class RimcWellLogTrack_addExtractionCurve : public caf::PdmObjectMethod
class RimcWellLogTrack_addExtractionCurve : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -41,8 +41,7 @@ public:
RimcWellLogTrack_addExtractionCurve( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
static RimWellLogExtractionCurve* addExtractionCurve( RimWellLogTrack* wellLogTrack,
RimEclipseCase* eclipseCase,
ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.cpp
+16 -71
View File
@@ -51,7 +51,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_addFracture, "AddFr
///
//--------------------------------------------------------------------------------------------------
RimcWellPath_addFracture::RimcWellPath_addFracture( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Add StimPlan Fracture", "", "", "Add StimPlan Fracture" );
@@ -110,17 +110,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcWellPath_addFracture::execute(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_addFracture::resultIsPersistent() const
QString RimcWellPath_addFracture::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellPath_addFracture::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellPathFracture );
return RimWellPathFracture::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_addThermalFracture, "AddThermalFracture" );
@@ -129,7 +121,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_addThermalFracture,
///
//--------------------------------------------------------------------------------------------------
RimcWellPath_addThermalFracture::RimcWellPath_addThermalFracture( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Add Thermal Fracture", "", "", "Add Thermal Fracture" );
@@ -163,17 +155,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcWellPath_addThermalFracture::e
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_addThermalFracture::resultIsPersistent() const
QString RimcWellPath_addThermalFracture::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellPath_addThermalFracture::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellPathFracture );
return RimWellPathFracture::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_appendPerforationInterval, "AppendPerforationInterval" );
@@ -182,9 +166,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_appendPerforationIn
///
//--------------------------------------------------------------------------------------------------
RimcWellPath_appendPerforationInterval::RimcWellPath_appendPerforationInterval( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Append Perforation Interval", "", "", "Append Perforation Interval" );
CAF_PDM_InitScriptableField( &m_startMD, "StartMd", 0.0, "", "", "", "Start Measured Depth" );
CAF_PDM_InitScriptableField( &m_endMD, "EndMd", 0.0, "", "", "", "End Measured Depth" );
CAF_PDM_InitScriptableField( &m_diameter, "Diameter", 0.0, "", "", "", "Diameter" );
@@ -216,17 +201,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcWellPath_appendPerforationInte
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_appendPerforationInterval::resultIsPersistent() const
QString RimcWellPath_appendPerforationInterval::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellPath_appendPerforationInterval::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimPerforationInterval );
return RimPerforationInterval::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_multiSegmentWellSettings, "MswSettings" );
@@ -235,7 +212,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_multiSegmentWellSet
///
//--------------------------------------------------------------------------------------------------
RimcWellPath_multiSegmentWellSettings::RimcWellPath_multiSegmentWellSettings( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_VALID, PdmObjectMethod::ResultType::PERSISTENT_TRUE )
{
CAF_PDM_InitObject( "MSW Settings", "", "", "Multi Segment Well Settings" );
}
@@ -264,25 +241,9 @@ std::expected<caf::PdmObjectHandle*, QString> RimcWellPath_multiSegmentWellSetti
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_multiSegmentWellSettings::resultIsPersistent() const
QString RimcWellPath_multiSegmentWellSettings::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_multiSegmentWellSettings::isNullptrValidResult() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellPath_multiSegmentWellSettings::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimMswCompletionParameters );
return RimMswCompletionParameters::classKeywordStatic();
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_appendFishbones, "AppendFishbones" );
@@ -291,7 +252,7 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPath, RimcWellPath_appendFishbones, "A
///
//--------------------------------------------------------------------------------------------------
RimcWellPath_appendFishbones::RimcWellPath_appendFishbones( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: PdmObjectMethod( self, PdmObjectMethod::NullPointerType::NULL_IS_VALID, PdmObjectMethod::ResultType::PERSISTENT_TRUE )
{
CAF_PDM_InitObject( "Append Fishbones", "", "", "Append Fishbones" );
@@ -331,23 +292,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcWellPath_appendFishbones::exec
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_appendFishbones::resultIsPersistent() const
QString RimcWellPath_appendFishbones::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcWellPath_appendFishbones::isNullptrValidResult() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcWellPath_appendFishbones::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimFishbones );
return RimFishbones::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcWellPath.h
+8 -15
View File
@@ -34,7 +34,7 @@ class RimEclipseCase;
//==================================================================================================
///
//==================================================================================================
class RimcWellPath_addFracture : public caf::PdmObjectMethod
class RimcWellPath_addFracture : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -42,8 +42,7 @@ public:
RimcWellPath_addFracture( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<double> m_md;
@@ -55,7 +54,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcWellPath_addThermalFracture : public caf::PdmObjectMethod
class RimcWellPath_addThermalFracture : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -63,8 +62,7 @@ public:
RimcWellPath_addThermalFracture( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmPtrField<RimThermalFractureTemplate*> m_fractureTemplate;
@@ -75,7 +73,7 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcWellPath_appendPerforationInterval : public caf::PdmObjectMethod
class RimcWellPath_appendPerforationInterval : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -83,8 +81,7 @@ public:
RimcWellPath_appendPerforationInterval( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<double> m_startMD;
@@ -104,9 +101,7 @@ public:
RimcWellPath_multiSegmentWellSettings( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
bool isNullptrValidResult() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
};
//==================================================================================================
@@ -120,9 +115,7 @@ public:
RimcWellPath_appendFishbones( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
bool isNullptrValidResult() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<std::vector<double>> m_subLocations;
ApplicationLibCode/ProjectDataModelCommands/RimcWellPathGeometryDef.cpp
+4 -11
View File
@@ -33,9 +33,10 @@ CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimWellPathGeometryDef, RimcRimWellPathGeomet
///
//--------------------------------------------------------------------------------------------------
RimcRimWellPathGeometryDef_appendNewWellTarget::RimcRimWellPathGeometryDef_appendNewWellTarget( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
: caf::PdmObjectCreationMethod( self )
{
CAF_PDM_InitObject( "Create and Add New Well Target", "", "", "Create and Add New Well Target" );
CAF_PDM_InitScriptableFieldNoDefault( &m_coordinate, "Coordinate", "", "", "", "Coordinate" );
CAF_PDM_InitScriptableField( &m_isAbsolute, "Absolute", false, "", "", "", "Relative or Absolute Coordinate" );
@@ -84,15 +85,7 @@ std::expected<caf::PdmObjectHandle*, QString> RimcRimWellPathGeometryDef_appendN
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcRimWellPathGeometryDef_appendNewWellTarget::resultIsPersistent() const
QString RimcRimWellPathGeometryDef_appendNewWellTarget::classKeywordReturnedType() const
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcRimWellPathGeometryDef_appendNewWellTarget::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimWellPathTarget );
return RimWellPathTarget::classKeywordStatic();
}
ApplicationLibCode/ProjectDataModelCommands/RimcWellPathGeometryDef.h
+2 -3
View File
@@ -29,7 +29,7 @@
//==================================================================================================
///
//==================================================================================================
class RimcRimWellPathGeometryDef_appendNewWellTarget : public caf::PdmObjectMethod
class RimcRimWellPathGeometryDef_appendNewWellTarget : public caf::PdmObjectCreationMethod
{
CAF_PDM_HEADER_INIT;
@@ -37,8 +37,7 @@ public:
RimcRimWellPathGeometryDef_appendNewWellTarget( caf::PdmObjectHandle* self );
std::expected<caf::PdmObjectHandle*, QString> execute() override;
bool resultIsPersistent() const override;
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
QString classKeywordReturnedType() const override;
private:
caf::PdmField<cvf::Vec3d> m_coordinate;