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

#6320 Refactor of PdmScripting

Browse Source 
* Make base class abstract
* Implement support for IOHandling for PdmChild and PdmChildArray fields
This commit is contained in:
Gaute Lindkvist committed 2020-08-25 08:33:47 +02:00
1 parent 2ec5f83dad
commit f82b2f73ec
107 files changed
+1492 -1113
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
#include "RimcDataContainerDouble.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptability.h"
#include "cafPdmObjectScriptingCapability.h"
CAF_PDM_SOURCE_INIT( RimcDataContainerDouble, "DataContainerFloat" );
@@ -30,5 +30,5 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerDouble, "DataContainerFloat" );
RimcDataContainerDouble::RimcDataContainerDouble()
{
CAF_PDM_InitScriptableObject( "Data Container Float", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "values", "Float Values", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "values", "Float Values", "", "", "" );
}
ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
#include "RimcDataContainerString.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptability.h"
#include "cafPdmObjectScriptingCapability.h"
CAF_PDM_SOURCE_INIT( RimcDataContainerString, "DataContainerString" );
@@ -30,5 +30,5 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerString, "DataContainerString" );
RimcDataContainerString::RimcDataContainerString()
{
CAF_PDM_InitScriptableObject( "Data Container String", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_stringValues, "values", "String Values", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stringValues, "values", "String Values", "", "", "" );
}
ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp
+3 -3
View File
@@ -18,9 +18,9 @@
#include "RimcDataContainerTime.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptability.h"
#include "cafPdmObjectScriptingCapability.h"
CAF_PDM_SOURCE_INIT( RimcDataContainerTime, "DataContainerTime" );
@@ -30,5 +30,5 @@ CAF_PDM_SOURCE_INIT( RimcDataContainerTime, "DataContainerTime" );
RimcDataContainerTime::RimcDataContainerTime()
{
CAF_PDM_InitScriptableObject( "Data Container Time", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "values", "Time Values", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "values", "Time Values", "", "", "" );
}
ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp
+10 -10
View File
@@ -26,8 +26,8 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptability.h"
#include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmFieldScriptingCapability.h"
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelCollection,
RimcFractureModelCollection_newFractureModel,
@@ -40,14 +40,14 @@ RimcFractureModelCollection_newFractureModel::RimcFractureModelCollection_newFra
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create Fracture Model", "", "", "Create a new Fracture Model" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_md, "MeasuredDepth", "", "", "", "Measured Depth" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_elasticPropertiesFilePath,
"ElasticPropertiesFilePath",
"",
"",
"",
"Elastic Properties File Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_md, "MeasuredDepth", "", "", "", "Measured Depth" );
CAF_PDM_InitScriptableFieldNoDefault( &m_elasticPropertiesFilePath,
"ElasticPropertiesFilePath",
"",
"",
"",
"Elastic Properties File Path" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp
+3 -3
View File
@@ -22,8 +22,8 @@
#include "RimFractureModel.h"
#include "RimFractureModelPlot.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptability.h"
#include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmFieldScriptingCapability.h"
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelPlot, RimcFractureModelPlot_exportToFile, "ExportToFile" );
@@ -34,7 +34,7 @@ RimcFractureModelPlot_exportToFile::RimcFractureModelPlot_exportToFile( caf::Pdm
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Export Fracture Model Plot", "", "", "Export Fracture Model Plot to File" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_filePath, "FilePath", "", "", "", "File Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "FilePath", "", "", "", "File Path" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp
+5 -5
View File
@@ -24,8 +24,8 @@
#include "RimFractureModelPlot.h"
#include "RimFractureModelPlotCollection.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptability.h"
#include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmFieldScriptingCapability.h"
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimFractureModelPlotCollection,
RimcFractureModelPlotCollection_newFractureModelPlot,
@@ -39,9 +39,9 @@ RimcFractureModelPlotCollection_newFractureModelPlot::RimcFractureModelPlotColle
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create Fracture Model", "", "", "Create a new Fracture Model" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_fractureModel, "FractureModel", "", "", "", "Fracture Model" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" );
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fractureModel, "FractureModel", "", "", "", "Fracture Model" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcProject.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
#include "RimSummaryCase.h"
#include "RiuPlotMainWindow.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
#include <memory>
@@ -38,7 +38,7 @@ RimProject_importSummaryCase::RimProject_importSummaryCase( caf::PdmObjectHandle
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Import Summary Case", "", "", "Import Summary Case" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_fileName, "FileName", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_fileName, "FileName", "", "", "", "" );
}
//--------------------------------------------------------------------------------------------------
@@ -96,7 +96,7 @@ RimProject_summaryCase::RimProject_summaryCase( caf::PdmObjectHandle* self )
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Find Summary Case", "", "", "Find Summary Case" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_caseId, "CaseId", "", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_caseId, "CaseId", "", "", "", "" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp
+4 -14
View File
@@ -30,7 +30,7 @@
#include "RimcDataContainerTime.h"
#include "RimcSummaryResampleData.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
CAF_PDM_OBJECT_METHOD_SOURCE_INIT( RimSummaryCase, RimSummaryCase_summaryVectorValues, "summaryVectorValues" );
@@ -41,12 +41,7 @@ RimSummaryCase_summaryVectorValues::RimSummaryCase_summaryVectorValues( caf::Pdm
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create Summary Plot", "", "", "Create a new Summary Plot" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_addressString,
"Address",
"",
"",
"",
"Formatted address specifying the summary vector" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address specifying the summary vector" );
}
//--------------------------------------------------------------------------------------------------
@@ -193,14 +188,9 @@ RimSummaryCase_resampleValues::RimSummaryCase_resampleValues( caf::PdmObjectHand
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Resample Values", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_addressString,
"Address",
"",
"",
"",
"Formatted address specifying the summary vector" );
CAF_PDM_InitScriptableFieldNoDefault( &m_addressString, "Address", "", "", "", "Formatted address specifying the summary vector" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_resamplingPeriod, "ResamplingPeriod", "", "", "", "Resampling Period" );
CAF_PDM_InitScriptableFieldNoDefault( &m_resamplingPeriod, "ResamplingPeriod", "", "", "", "Resampling Period" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
+10 -10
View File
@@ -25,8 +25,8 @@
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptability.h"
#include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmFieldScriptingCapability.h"
#include <QStringList>
@@ -39,14 +39,14 @@ RimcSummaryPlotCollection_newSummaryPlot::RimcSummaryPlotCollection_newSummaryPl
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create Summary Plot", "", "", "Create a new Summary Plot" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_summaryCases, "SummaryCases", "", "", "", "Summary Cases" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_ensemble, "Ensemble", "", "", "", "Ensemble" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_addressString,
"Address",
"",
"",
"",
"Formatted address string specifying the plot options" );
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" );
}
//--------------------------------------------------------------------------------------------------
ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp
+4 -4
View File
@@ -18,9 +18,9 @@
#include "RimcSummaryResampleData.h"
#include "cafPdmFieldIOScriptability.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptability.h"
#include "cafPdmObjectScriptingCapability.h"
CAF_PDM_SOURCE_INIT( RimcSummaryResampleData, "ResampleData" );
@@ -30,6 +30,6 @@ CAF_PDM_SOURCE_INIT( RimcSummaryResampleData, "ResampleData" );
RimcSummaryResampleData::RimcSummaryResampleData()
{
CAF_PDM_InitScriptableObject( "Resample Data", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_timeValues, "TimeSteps", "Time Steps", "", "", "" );
CAF_PDM_InitScriptableFieldWithIONoDefault( &m_doubleValues, "Values", "Values", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeValues, "TimeSteps", "Time Steps", "", "", "" );
CAF_PDM_InitScriptableFieldNoDefault( &m_doubleValues, "Values", "Values", "", "", "" );
}