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

Adjustments after review

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-07 10:01:03 +02:00
parent 4967a8c9b2
commit f16185a652
7 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp
View File

@ -22,13 +22,13 @@
#include "cafPdmObjectScriptability.h"
CAF_PDM_SOURCE_INIT( RimcDataContainerDouble, "DataContainerDouble" );
CAF_PDM_SOURCE_INIT( RimcDataContainerDouble, "DataContainerFloat" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcDataContainerDouble::RimcDataContainerDouble()
{
CAF_PDM_InitScriptableObject( "Data Container Double", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "DoubleValues", "Data Double Values", "", "", "" );
CAF_PDM_InitScriptableObject( "Data Container Float", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "values", "Float Values", "", "", "" );
}

2
ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp
View File

@ -30,5 +30,5 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerString, "DataContainerString" );
RimcDataContainerString::RimcDataContainerString()
{
CAF_PDM_InitScriptableObject( "Data Container String", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_stringValues, "StringValues", "String Values", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_stringValues, "values", "String Values", "", "", "" );
}

2
ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp
View File

@ -30,5 +30,5 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerTime, "DataContainerTime" );
RimcDataContainerTime::RimcDataContainerTime()
{
CAF_PDM_InitScriptableObject( "Data Container Time", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "TimeValues", "Data Time Values", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "values", "Time Values", "", "", "" );
}

40
ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp
View File

@ -32,12 +32,12 @@
#include "cafPdmFieldIOScriptability.h"
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimcSummaryCase_summaryVectorValues, "SummaryVectorValues" );
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_summaryVectorValues, "summaryVectorValues" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSummaryCase_summaryVectorValues::RimcSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self )
RimSummaryCase_summaryVectorValues::RimSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create Summary Plot", "", "", "Create a new Summary Plot" );
@ -52,7 +52,7 @@ RimcSummaryCase_summaryVectorValues::RimcSummaryCase_summaryVectorValues( caf::P
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcSummaryCase_summaryVectorValues::execute()
caf::PdmObjectHandle* RimSummaryCase_summaryVectorValues::execute()
{
QStringList addressStrings = m_addressString().split( ";", QString::SkipEmptyParts );
@ -78,7 +78,7 @@ caf::PdmObjectHandle* RimcSummaryCase_summaryVectorValues::execute()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSummaryCase_summaryVectorValues::resultIsPersistent() const
bool RimSummaryCase_summaryVectorValues::resultIsPersistent() const
{
return false;
}
@ -86,17 +86,17 @@ bool RimcSummaryCase_summaryVectorValues::resultIsPersistent() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSummaryCase_summaryVectorValues::defaultResult() const
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_summaryVectorValues::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerDouble );
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimcSummaryCase_AvailableAddresses, "AvailableAddresses" );
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableAddresses, "availableAddresses" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSummaryCase_AvailableAddresses::RimcSummaryCase_AvailableAddresses( caf::PdmObjectHandle* self )
RimSummaryCase_availableAddresses::RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Available Addresses", "", "", "" );
@ -105,7 +105,7 @@ RimcSummaryCase_AvailableAddresses::RimcSummaryCase_AvailableAddresses( caf::Pdm
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcSummaryCase_AvailableAddresses::execute()
caf::PdmObjectHandle* RimSummaryCase_availableAddresses::execute()
{
auto* summaryCase = self<RimSummaryCase>();
RifSummaryReaderInterface* sumReader = summaryCase->summaryReader();
@ -127,7 +127,7 @@ caf::PdmObjectHandle* RimcSummaryCase_AvailableAddresses::execute()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSummaryCase_AvailableAddresses::resultIsPersistent() const
bool RimSummaryCase_availableAddresses::resultIsPersistent() const
{
return false;
}
@ -135,17 +135,17 @@ bool RimcSummaryCase_AvailableAddresses::resultIsPersistent() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSummaryCase_AvailableAddresses::defaultResult() const
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_availableAddresses::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerString );
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimcSummaryCase_TimeSteps, "AvailableTimeSteps" );
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_availableTimeSteps, "availableTimeSteps" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSummaryCase_TimeSteps::RimcSummaryCase_TimeSteps( caf::PdmObjectHandle* self )
RimSummaryCase_availableTimeSteps::RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Available TimeSteps", "", "", "" );
@ -154,7 +154,7 @@ RimcSummaryCase_TimeSteps::RimcSummaryCase_TimeSteps( caf::PdmObjectHandle* self
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcSummaryCase_TimeSteps::execute()
caf::PdmObjectHandle* RimSummaryCase_availableTimeSteps::execute()
{
auto* summaryCase = self<RimSummaryCase>();
RifSummaryReaderInterface* sumReader = summaryCase->summaryReader();
@ -171,7 +171,7 @@ caf::PdmObjectHandle* RimcSummaryCase_TimeSteps::execute()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSummaryCase_TimeSteps::resultIsPersistent() const
bool RimSummaryCase_availableTimeSteps::resultIsPersistent() const
{
return false;
}
@ -179,17 +179,17 @@ bool RimcSummaryCase_TimeSteps::resultIsPersistent() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSummaryCase_TimeSteps::defaultResult() const
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_availableTimeSteps::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcDataContainerTime );
}
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimcSummaryCase_ResampleValues, "ResampleValues" );
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_resampleValues, "resampleValues" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimcSummaryCase_ResampleValues::RimcSummaryCase_ResampleValues( caf::PdmObjectHandle* self )
RimSummaryCase_resampleValues::RimSummaryCase_resampleValues( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Resample Values", "", "", "" );
@ -206,7 +206,7 @@ RimcSummaryCase_ResampleValues::RimcSummaryCase_ResampleValues( caf::PdmObjectHa
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcSummaryCase_ResampleValues::execute()
caf::PdmObjectHandle* RimSummaryCase_resampleValues::execute()
{
QStringList addressStrings = m_addressString().split( ";", QString::SkipEmptyParts );
@ -247,7 +247,7 @@ caf::PdmObjectHandle* RimcSummaryCase_ResampleValues::execute()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimcSummaryCase_ResampleValues::resultIsPersistent() const
bool RimSummaryCase_resampleValues::resultIsPersistent() const
{
return false;
}
@ -255,7 +255,7 @@ bool RimcSummaryCase_ResampleValues::resultIsPersistent() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::unique_ptr<caf::PdmObjectHandle> RimcSummaryCase_ResampleValues::defaultResult() const
std::unique_ptr<caf::PdmObjectHandle> RimSummaryCase_resampleValues::defaultResult() const
{
return std::unique_ptr<caf::PdmObjectHandle>( new RimcSummaryResampleData );
}

16
ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.h
View File

@ -29,12 +29,12 @@
//==================================================================================================
///
//==================================================================================================
class RimcSummaryCase_summaryVectorValues : public caf::PdmObjectMethod
class RimSummaryCase_summaryVectorValues : public caf::PdmObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self );
RimSummaryCase_summaryVectorValues( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
bool resultIsPersistent() const override;
@ -47,12 +47,12 @@ private:
//==================================================================================================
///
//==================================================================================================
class RimcSummaryCase_AvailableAddresses : public caf::PdmObjectMethod
class RimSummaryCase_availableAddresses : public caf::PdmObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcSummaryCase_AvailableAddresses( caf::PdmObjectHandle* self );
RimSummaryCase_availableAddresses( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
bool resultIsPersistent() const override;
@ -62,12 +62,12 @@ public:
//==================================================================================================
///
//==================================================================================================
class RimcSummaryCase_TimeSteps : public caf::PdmObjectMethod
class RimSummaryCase_availableTimeSteps : public caf::PdmObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcSummaryCase_TimeSteps( caf::PdmObjectHandle* self );
RimSummaryCase_availableTimeSteps( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
bool resultIsPersistent() const override;
@ -77,12 +77,12 @@ public:
//==================================================================================================
///
//==================================================================================================
class RimcSummaryCase_ResampleValues : public caf::PdmObjectMethod
class RimSummaryCase_resampleValues : public caf::PdmObjectMethod
{
CAF_PDM_HEADER_INIT;
public:
RimcSummaryCase_ResampleValues( caf::PdmObjectHandle* self );
RimSummaryCase_resampleValues( caf::PdmObjectHandle* self );
caf::PdmObjectHandle* execute();
bool resultIsPersistent() const override;

4
ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp
View File

@ -30,6 +30,6 @@ CAF_PDM_SOURCE_INIT( RimcSummaryResampleData, "ResampleData" );
RimcSummaryResampleData::RimcSummaryResampleData()
{
CAF_PDM_InitScriptableObject( "Resample Data", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "TimeValues", "Data Time Values", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "DoubleValues", "Data Double Values", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "TimeSteps", "Time Steps", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "Values", "Values", "", "", "" );
}

7
Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp
View File

@ -256,11 +256,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const
QStringList argumentComments;
outputArgumentStrings.push_back( QString( "\"%1\"" ).arg( methodName ) );
QString returnComment( "Data object" );
if ( method->resultIsPersistent() )
{
returnComment = method->defaultResult()->xmlCapability()->classKeyword();
}
QString returnComment = method->defaultResult()->xmlCapability()->classKeyword();
for ( auto field : arguments )
{
@ -414,6 +410,7 @@ QString PdmPythonGenerator::dataTypeString( const PdmFieldHandle* field, bool us
std::map<QString, QString> builtins = {{QString::fromStdString( typeid( double ).name() ), "float"},
{QString::fromStdString( typeid( float ).name() ), "float"},
{QString::fromStdString( typeid( int ).name() ), "int"},
{QString::fromStdString( typeid( time_t ).name() ), "time"},
{QString::fromStdString( typeid( QString ).name() ), "str"}};
bool foundBuiltin = false;