From f82b2f73ec4df33f1396da8866d42286d65d9165 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Fri, 21 Aug 2020 11:13:07 +0200 Subject: [PATCH] #6320 Refactor of PdmScripting * Make base class abstract * Implement support for IOHandling for PdmChild and PdmChildArray fields --- .../Core/RicfCommandObject.cpp | 2 +- .../Core/RicfCommandObject.h | 4 +- .../Core/RifcCommandFileReader.cpp | 6 +- .../CommandFileInterface/RicfCloneView.cpp | 4 +- .../RicfComputeCaseGroupStatistics.cpp | 6 +- .../RicfCreateGridCaseGroup.cpp | 4 +- .../RicfCreateLgrForCompletions.cpp | 16 +- .../RicfCreateMultipleFractures.cpp | 32 +- .../RicfCreateSaturationPressurePlots.cpp | 4 +- .../RicfCreateStatisticsCase.cpp | 4 +- .../CommandFileInterface/RicfCreateView.cpp | 4 +- ...RicfCreateWellBoreStabilityPlotFeature.cpp | 8 +- .../RicfExportFlowCharacteristics.cpp | 16 +- .../RicfExportLgrForCompletions.cpp | 16 +- .../CommandFileInterface/RicfExportMsw.cpp | 26 +- .../RicfExportMultiCaseSnapshots.cpp | 4 +- .../RicfExportProperty.cpp | 14 +- .../RicfExportPropertyInViews.cpp | 10 +- .../RicfExportSimWellFractureCompletions.cpp | 52 +-- .../RicfExportSnapshots.cpp | 14 +- .../RicfExportVisibleCells.cpp | 46 ++- .../RicfExportWellLogPlotData.cpp | 18 +- .../RicfExportWellPathCompletions.cpp | 128 ++++---- .../RicfExportWellPaths.cpp | 6 +- .../RicfImportFormationNames.cpp | 6 +- .../RicfImportWellLogFiles.cpp | 6 +- .../CommandFileInterface/RicfLoadCase.cpp | 4 +- .../CommandFileInterface/RicfOpenProject.cpp | 4 +- .../CommandFileInterface/RicfReplaceCase.cpp | 6 +- .../RicfReplaceSourceCases.cpp | 6 +- .../RicfRunOctaveScript.cpp | 6 +- .../RicfScaleFractureTemplate.cpp | 14 +- .../RicfSetExportFolder.cpp | 8 +- .../RicfSetFractureContainment.cpp | 8 +- .../RicfSetMainWindowSize.cpp | 6 +- .../RicfSetPlotWindowSize.cpp | 6 +- .../CommandFileInterface/RicfSetStartDir.cpp | 4 +- .../CommandFileInterface/RicfSetTimeStep.cpp | 8 +- .../RicSaveProjectAsFeature.cpp | 4 +- .../RicExportContourMapToTextFeature.cpp | 12 +- .../RicStackSelectedCurvesFeature.cpp | 4 +- .../RicUnstackSelectedCurvesFeature.cpp | 4 +- .../WellPathCommands/RicImportWellPaths.cpp | 6 +- .../GrpcInterface/RiaGrpcPdmObjectService.cpp | 20 +- .../GrpcInterface/RiaGrpcServiceInterface.cpp | 15 +- .../Completions/RimFractureModel.cpp | 135 ++++---- .../RimFractureModelCollection.cpp | 4 +- .../ProjectDataModel/Rim3dView.cpp | 46 +-- ApplicationCode/ProjectDataModel/RimCase.cpp | 12 +- .../ProjectDataModel/RimDepthTrackPlot.cpp | 25 +- .../ProjectDataModel/RimEclipseCase.cpp | 18 +- .../RimEclipseResultDefinition.cpp | 34 +- .../RimEclipseStatisticsCase.cpp | 110 +++---- .../ProjectDataModel/RimEclipseView.cpp | 18 +- .../ProjectDataModel/RimElasticProperties.cpp | 4 +- .../ProjectDataModel/RimFractureModelPlot.cpp | 2 +- .../RimFractureModelPlotCollection.cpp | 4 +- .../ProjectDataModel/RimGeoMechCase.cpp | 18 +- .../RimIdenticalGridCaseGroup.cpp | 10 +- .../RimMudWeightWindowParameters.cpp | 4 +- .../ProjectDataModel/RimPlotWindow.cpp | 6 +- .../ProjectDataModel/RimSimWellInView.cpp | 4 +- .../ProjectDataModel/RimWbsParameters.cpp | 168 +++++----- .../RimWellBoreStabilityPlot.cpp | 18 +- .../ProjectDataModel/RimWellLogPlot.cpp | 4 +- .../ProjectDataModel/RimWellPath.cpp | 4 +- .../Summary/RimFileSummaryCase.cpp | 6 +- .../Summary/RimGridSummaryCase.cpp | 2 +- .../Summary/RimSummaryCase.cpp | 17 +- .../Summary/RimSummaryCaseCollection.cpp | 12 +- .../Summary/RimSummaryPlot.cpp | 16 +- .../Summary/RimSummaryPlotCollection.cpp | 4 +- .../RimcDataContainerDouble.cpp | 6 +- .../RimcDataContainerString.cpp | 6 +- .../RimcDataContainerTime.cpp | 6 +- .../RimcFractureModelCollection.cpp | 20 +- .../RimcFractureModelPlot.cpp | 6 +- .../RimcFractureModelPlotCollection.cpp | 10 +- .../ProjectDataModelCommands/RimcProject.cpp | 6 +- .../RimcSummaryCase.cpp | 18 +- .../RimcSummaryPlotCollection.cpp | 20 +- .../RimcSummaryResampleData.cpp | 8 +- .../UnitTests/RifcCommandCore-Test.cpp | 18 +- Fwk/AppFwk/cafPdmCvf/CMakeLists.txt | 6 +- ...fPdmFieldScriptingCapabilityCvfColor3.cpp} | 28 +- ...cafPdmFieldScriptingCapabilityCvfColor3.h} | 4 +- ...cafPdmFieldScriptingCapabilityCvfVec3d.cpp | 82 +++++ .../cafPdmFieldScriptingCapabilityCvfVec3d.h | 54 +++ Fwk/AppFwk/cafPdmScripting/CMakeLists.txt | 20 +- ...afPdmAbstractFieldScriptingCapability.cpp} | 47 +-- .../cafPdmAbstractFieldScriptingCapability.h | 77 +++++ .../cafPdmFieldScriptability.h | 115 ------- ...cpp => cafPdmFieldScriptingCapability.cpp} | 34 +- ...ity.h => cafPdmFieldScriptingCapability.h} | 307 ++++++++++++------ .../cafPdmScripting/cafPdmMarkdownBuilder.cpp | 17 +- .../cafPdmMarkdownGenerator.cpp | 4 +- .../cafPdmScripting/cafPdmObjectMethod.h | 2 +- .../cafPdmObjectScriptability.cpp | 29 +- .../cafPdmObjectScriptingCapability.cpp | 243 ++++++++++++++ ...ty.h => cafPdmObjectScriptingCapability.h} | 20 +- ...fPdmObjectScriptingCapabilityRegister.cpp} | 22 +- ...cafPdmObjectScriptingCapabilityRegister.h} | 2 +- .../cafPdmScripting/cafPdmPythonGenerator.cpp | 19 +- .../cafPdmScriptingBasicTest.cpp | 8 +- .../cafPdmCore/cafPdmChildArrayField.h | 1 + .../cafPdmCore/cafPdmChildArrayField.inl | 13 + .../cafPdmCore/cafPdmChildField.inl | 21 +- 107 files changed, 1492 insertions(+), 1113 deletions(-) rename Fwk/AppFwk/cafPdmCvf/{cafPdmFieldIOScriptabilityCvfColor3.cpp => cafPdmFieldScriptingCapabilityCvfColor3.cpp} (74%) rename Fwk/AppFwk/cafPdmCvf/{cafPdmFieldIOScriptabilityCvfColor3.h => cafPdmFieldScriptingCapabilityCvfColor3.h} (95%) create mode 100644 Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp create mode 100644 Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h rename Fwk/AppFwk/cafPdmScripting/{cafPdmFieldScriptability.cpp => cafPdmAbstractFieldScriptingCapability.cpp} (61%) create mode 100644 Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.h delete mode 100644 Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.h rename Fwk/AppFwk/cafPdmScripting/{cafPdmFieldIOScriptability.cpp => cafPdmFieldScriptingCapability.cpp} (79%) rename Fwk/AppFwk/cafPdmScripting/{cafPdmFieldIOScriptability.h => cafPdmFieldScriptingCapability.h} (60%) create mode 100644 Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.cpp rename Fwk/AppFwk/cafPdmScripting/{cafPdmObjectScriptability.h => cafPdmObjectScriptingCapability.h} (74%) rename Fwk/AppFwk/cafPdmScripting/{cafPdmObjectScriptabilityRegister.cpp => cafPdmObjectScriptingCapabilityRegister.cpp} (80%) rename Fwk/AppFwk/cafPdmScripting/{cafPdmObjectScriptabilityRegister.h => cafPdmObjectScriptingCapabilityRegister.h} (98%) diff --git a/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.cpp b/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.cpp index ce4b6cf58b..a9e1aedb47 100644 --- a/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.cpp +++ b/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.cpp @@ -22,7 +22,7 @@ /// //-------------------------------------------------------------------------------------------------- RicfCommandObject::RicfCommandObject() - : PdmObjectScriptability( this, false ) + : PdmObjectScriptingCapability( this, false ) { } diff --git a/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.h b/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.h index 784bd106b2..23831e7d5e 100644 --- a/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.h +++ b/ApplicationCode/CommandFileInterface/Core/RicfCommandObject.h @@ -20,7 +20,7 @@ #include "cafCmdFeature.h" #include "cafPdmObject.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmScriptResponse.h" #define RICF_HEADER_INIT \ @@ -42,7 +42,7 @@ // // //================================================================================================== -class RicfCommandObject : public caf::PdmObject, public caf::PdmObjectScriptability +class RicfCommandObject : public caf::PdmObject, public caf::PdmObjectScriptingCapability { public: RicfCommandObject(); diff --git a/ApplicationCode/CommandFileInterface/Core/RifcCommandFileReader.cpp b/ApplicationCode/CommandFileInterface/Core/RifcCommandFileReader.cpp index 98dc4c1fd3..7861362707 100644 --- a/ApplicationCode/CommandFileInterface/Core/RifcCommandFileReader.cpp +++ b/ApplicationCode/CommandFileInterface/Core/RifcCommandFileReader.cpp @@ -21,7 +21,7 @@ #include "RicfCommandObject.h" #include "cafPdmObjectFactory.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmScriptIOMessages.h" #include @@ -127,7 +127,7 @@ std::vector RicfCommandFileReader::readCommands( QTextStream else { readCommands.push_back( cObj ); - auto rcfCap = cObj->capability(); + auto rcfCap = cObj->capability(); errorMessageContainer->currentCommand = commandName; rcfCap->readFields( inputStream, objectFactory, errorMessageContainer ); errorMessageContainer->currentCommand = ""; @@ -144,7 +144,7 @@ void RicfCommandFileReader::writeCommands( QTextStream& outputStream, const std: { for ( const auto& cmdObj : commandsToWrite ) { - auto rcfCap = cmdObj->capability(); + auto rcfCap = cmdObj->capability(); if ( !rcfCap ) continue; outputStream << cmdObj->classKeyword(); diff --git a/ApplicationCode/CommandFileInterface/RicfCloneView.cpp b/ApplicationCode/CommandFileInterface/RicfCloneView.cpp index 26df247f9e..71b4fe68b0 100644 --- a/ApplicationCode/CommandFileInterface/RicfCloneView.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCloneView.cpp @@ -13,7 +13,7 @@ #include "Riu3DMainWindowTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafSelectionManager.h" #include @@ -25,7 +25,7 @@ CAF_PDM_SOURCE_INIT( RicfCloneView, "cloneView" ); //-------------------------------------------------------------------------------------------------- RicfCloneView::RicfCloneView() { - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp b/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp index 306e2e74c5..39679c5387 100644 --- a/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp +++ b/ApplicationCode/CommandFileInterface/RicfComputeCaseGroupStatistics.cpp @@ -29,7 +29,7 @@ #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfComputeCaseGroupStatistics, "computeCaseGroupStatistics" ); @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfComputeCaseGroupStatistics, "computeCaseGroupStatistics //-------------------------------------------------------------------------------------------------- RicfComputeCaseGroupStatistics::RicfComputeCaseGroupStatistics() { - CAF_PDM_InitScriptableFieldWithIO( &m_groupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_groupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp b/ApplicationCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp index 13e528e674..3e8c21bcd0 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateGridCaseGroup.cpp @@ -23,7 +23,7 @@ #include "RimIdenticalGridCaseGroup.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateGridCaseGroup, "createGridCaseGroup" ); //-------------------------------------------------------------------------------------------------- RicfCreateGridCaseGroup::RicfCreateGridCaseGroup() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_casePaths, "casePaths", "List of Paths to Case Files", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp b/ApplicationCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp index e0419f98df..00a82cf6fa 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateLgrForCompletions.cpp @@ -37,7 +37,7 @@ #include "RiaWellNameComparer.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -48,13 +48,13 @@ CAF_PDM_SOURCE_INIT( RicfCreateLgrForCompletions, "createLgrForCompletions" ); //-------------------------------------------------------------------------------------------------- RicfCreateLgrForCompletions::RicfCreateLgrForCompletions() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStep, "timeStep", 0, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", 0, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); + CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateMultipleFractures.cpp b/ApplicationCode/CommandFileInterface/RicfCreateMultipleFractures.cpp index ce197bd4cc..45393babd7 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateMultipleFractures.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateMultipleFractures.cpp @@ -37,7 +37,7 @@ #include "RiaWellNameComparer.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfCreateMultipleFractures, "createMultipleFractures" ); @@ -58,21 +58,21 @@ void AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfCreateMultipleFractures::RicfCreateMultipleFractures() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_templateId, "templateId", -1, "Template ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_topLayer, "topLayer", -1, "Top Layer", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_baseLayer, "baseLayer", -1, "Base Layer", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_spacing, "spacing", 300.0, "Spacing", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_action, - "action", - caf::AppEnum( MultipleFractures::Action::APPEND_FRACTURES ), - "Action", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_minDistFromWellTd, "minDistFromWellTd", 100.0, "Min Distance From Well TD", "", "", "" ); + CAF_PDM_InitScriptableField( &m_maxFracturesPerWell, "maxFracturesPerWell", 100, "Max Fractures per Well", "", "", "" ); + CAF_PDM_InitScriptableField( &m_templateId, "templateId", -1, "Template ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "Top Layer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "Base Layer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_spacing, "spacing", 300.0, "Spacing", "", "", "" ); + CAF_PDM_InitScriptableField( &m_action, + "action", + caf::AppEnum( MultipleFractures::Action::APPEND_FRACTURES ), + "Action", + "", + "", + "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp b/ApplicationCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp index bd041e5024..1d000c51de 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateSaturationPressurePlots.cpp @@ -29,7 +29,7 @@ #include "RimProject.h" #include "RimSaturationPressurePlotCollection.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfCreateSaturationPressurePlots, "createSaturationPressurePlots" ); @@ -38,7 +38,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateSaturationPressurePlots, "createSaturationPressur //-------------------------------------------------------------------------------------------------- RicfCreateSaturationPressurePlots::RicfCreateSaturationPressurePlots() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateStatisticsCase.cpp b/ApplicationCode/CommandFileInterface/RicfCreateStatisticsCase.cpp index d8e716da35..750fb6ef6c 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateStatisticsCase.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateStatisticsCase.cpp @@ -26,7 +26,7 @@ #include "Riu3DMainWindowTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafSelectionManager.h" #include @@ -49,7 +49,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateStatisticsCase, "createStatisticsCase" ); //-------------------------------------------------------------------------------------------------- RicfCreateStatisticsCase::RicfCreateStatisticsCase() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseGroupId, "caseGroupId", -1, "Case Group Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group Id", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateView.cpp b/ApplicationCode/CommandFileInterface/RicfCreateView.cpp index 3e384c42ac..cb5825c415 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateView.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateView.cpp @@ -11,7 +11,7 @@ #include "Riu3DMainWindowTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafSelectionManager.h" #include @@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RicfCreateView, "createView" ); //-------------------------------------------------------------------------------------------------- RicfCreateView::RicfCreateView() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp b/ApplicationCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp index 01bf0ddb5d..758b9762b9 100644 --- a/ApplicationCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCreateWellBoreStabilityPlotFeature.cpp @@ -28,7 +28,7 @@ #include "RimWellBoreStabilityPlot.h" #include "RimWellPath.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -50,9 +50,9 @@ CAF_PDM_SOURCE_INIT( RicfCreateWellBoreStabilityPlotFeature, "createWellBoreStab //-------------------------------------------------------------------------------------------------- RicfCreateWellBoreStabilityPlotFeature::RicfCreateWellBoreStabilityPlotFeature() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "GeoMech Case Id", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPath, "wellPath", QString( "" ), "Well Path", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStep, "timeStep", -1, "Time Step", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "GeoMech Case Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPath, "wellPath", QString( "" ), "Well Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_wbsParameters, "wbsParameters", "WbsParameters", "", "", "" ); } diff --git a/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp b/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp index daf3d9e6ce..bdddec4424 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp @@ -29,7 +29,7 @@ #include "RimMainPlotCollection.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -42,13 +42,13 @@ CAF_PDM_SOURCE_INIT( RicfExportFlowCharacteristics, "exportFlowCharacteristics" //-------------------------------------------------------------------------------------------------- RicfExportFlowCharacteristics::RicfExportFlowCharacteristics() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_selectedTimeSteps, "timeSteps", std::vector(), "Selected Time Steps", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_injectors, "injectors", std::vector(), "Injectors", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_producers, "producers", std::vector(), "Producers", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_fileName, "fileName", QString(), "Export File Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_selectedTimeSteps, "timeSteps", std::vector(), "Selected Time Steps", "", "", "" ); + CAF_PDM_InitScriptableField( &m_injectors, "injectors", std::vector(), "Injectors", "", "", "" ); + CAF_PDM_InitScriptableField( &m_producers, "producers", std::vector(), "Producers", "", "", "" ); + CAF_PDM_InitScriptableField( &m_fileName, "fileName", QString(), "Export File Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_minCommunication, "minimumCommunication", 0.0, "Minimum Communication", "", "", "" ); + CAF_PDM_InitScriptableField( &m_maxPvFraction, "aquiferCellThreshold", 0.1, "Aquifer Cell Threshold", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportLgrForCompletions.cpp b/ApplicationCode/CommandFileInterface/RicfExportLgrForCompletions.cpp index f7e70fb3ab..7224d6cf5e 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportLgrForCompletions.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportLgrForCompletions.cpp @@ -36,7 +36,7 @@ #include "RiaWellNameComparer.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -47,13 +47,13 @@ CAF_PDM_SOURCE_INIT( RicfExportLgrForCompletions, "exportLgrForCompletions" ); //-------------------------------------------------------------------------------------------------- RicfExportLgrForCompletions::RicfExportLgrForCompletions() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementI, "refinementI", -1, "RefinementI", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "" ); + CAF_PDM_InitScriptableField( &m_refinementK, "refinementK", -1, "RefinementK", "", "", "" ); + CAF_PDM_InitScriptableField( &m_splitType, "splitType", Lgr::SplitTypeEnum(), "SplitType", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportMsw.cpp b/ApplicationCode/CommandFileInterface/RicfExportMsw.cpp index 8e8414f63e..abad1cde7d 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportMsw.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportMsw.cpp @@ -36,7 +36,7 @@ #include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h" #include "CompletionExportCommands/RicWellPathExportMswCompletionsImpl.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfExportMsw, "exportMsw" ); @@ -45,18 +45,18 @@ CAF_PDM_SOURCE_INIT( RicfExportMsw, "exportMsw" ); //-------------------------------------------------------------------------------------------------- RicfExportMsw::RicfExportMsw() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathName, "wellPath", QString(), "Well Path Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_fileSplit, - "fileSplit", - RicExportCompletionDataSettingsUi::ExportSplitType(), - "File Split", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathName, "wellPath", QString(), "Well Path Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" ); + CAF_PDM_InitScriptableField( &m_fileSplit, + "fileSplit", + RicExportCompletionDataSettingsUi::ExportSplitType(), + "File Split", + "", + "", + "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp b/ApplicationCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp index f545c0cfbc..febd909ccb 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportMultiCaseSnapshots.cpp @@ -24,7 +24,7 @@ #include "RiaLogging.h" #include "RiaProjectModifier.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfExportMultiCaseSnapshots, "exportMultiCaseSnapshots" ); @@ -33,7 +33,7 @@ CAF_PDM_SOURCE_INIT( RicfExportMultiCaseSnapshots, "exportMultiCaseSnapshots" ); //-------------------------------------------------------------------------------------------------- RicfExportMultiCaseSnapshots::RicfExportMultiCaseSnapshots() { - CAF_PDM_InitScriptableFieldWithIO( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportProperty.cpp b/ApplicationCode/CommandFileInterface/RicfExportProperty.cpp index 0ced1e50e3..1e3902c181 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportProperty.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportProperty.cpp @@ -34,7 +34,7 @@ #include "RimEclipseView.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafUtils.h" #include @@ -47,12 +47,12 @@ CAF_PDM_SOURCE_INIT( RicfExportProperty, "exportProperty" ); RicfExportProperty::RicfExportProperty() { // clang-format off - CAF_PDM_InitScriptableFieldWithIO(&m_caseId, "caseId", -1, "Case ID", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_propertyName, "property", QString(), "Property Name", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_exportFileName, "exportFile", QString(), "Export FileName", "", "", ""); + CAF_PDM_InitScriptableField(&m_caseId, "caseId", -1, "Case ID", "", "", ""); + CAF_PDM_InitScriptableField(&m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", ""); + CAF_PDM_InitScriptableField(&m_propertyName, "property", QString(), "Property Name", "", "", ""); + CAF_PDM_InitScriptableField(&m_eclipseKeyword, "eclipseKeyword", QString(), "Eclipse Keyword", "", "", ""); + CAF_PDM_InitScriptableField(&m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", ""); + CAF_PDM_InitScriptableField(&m_exportFileName, "exportFile", QString(), "Export FileName", "", "", ""); // clang-format on } diff --git a/ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp b/ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp index fbdd689f6f..4f02237214 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportPropertyInViews.cpp @@ -33,7 +33,7 @@ #include "RimEclipseView.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafUtils.h" #include @@ -47,10 +47,10 @@ CAF_PDM_SOURCE_INIT( RicfExportPropertyInViews, "exportPropertyInViews" ); //-------------------------------------------------------------------------------------------------- RicfExportPropertyInViews::RicfExportPropertyInViews() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewIds, "viewIds", std::vector(), "View IDs", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewNames, "viewNames", std::vector(), "View Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewIds, "viewIds", std::vector(), "View IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewNames, "viewNames", std::vector(), "View Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_undefinedValue, "undefinedValue", 0.0, "Undefined Value", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp b/ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp index 46c5f6f5d6..d0ca45a030 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportSimWellFractureCompletions.cpp @@ -37,7 +37,7 @@ #include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfExportSimWellFractureCompletions, "exportSimWellFractureCompletions" ); @@ -46,31 +46,31 @@ CAF_PDM_SOURCE_INIT( RicfExportSimWellFractureCompletions, "exportSimWellFractur //-------------------------------------------------------------------------------------------------- RicfExportSimWellFractureCompletions::RicfExportSimWellFractureCompletions() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewName, "viewName", QString( "" ), "View Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_simWellNames, - "simulationWellNames", - std::vector(), - "Simulation Well Names", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_fileSplit, - "fileSplit", - RicExportCompletionDataSettingsUi::ExportSplitType(), - "File Split", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_compdatExport, - "compdatExport", - RicExportCompletionDataSettingsUi::CompdatExportType(), - "Compdat Export", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString( "" ), "View Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_simWellNames, + "simulationWellNames", + std::vector(), + "Simulation Well Names", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_fileSplit, + "fileSplit", + RicExportCompletionDataSettingsUi::ExportSplitType(), + "File Split", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_compdatExport, + "compdatExport", + RicExportCompletionDataSettingsUi::CompdatExportType(), + "Compdat Export", + "", + "", + "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportSnapshots.cpp b/ApplicationCode/CommandFileInterface/RicfExportSnapshots.cpp index 3c74ae4011..1d671f8e1f 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportSnapshots.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportSnapshots.cpp @@ -29,7 +29,7 @@ #include "RiuMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -60,12 +60,12 @@ void RicfExportSnapshots::SnapshotsTypeEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfExportSnapshots::RicfExportSnapshots() { - CAF_PDM_InitScriptableFieldWithIO( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_prefix, "prefix", QString(), "Prefix", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View Id", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_exportFolder, "exportFolder", QString(), "Export Folder", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format", "", "", "" ); + CAF_PDM_InitScriptableField( &m_type, "type", RicfExportSnapshots::SnapshotsTypeEnum(), "Type", "", "", "" ); + CAF_PDM_InitScriptableField( &m_prefix, "prefix", QString(), "Prefix", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_exportFolder, "exportFolder", QString(), "Export Folder", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_plotOutputFormat, "plotOutputFormat", "Output Format", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp b/ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp index 237e4e0612..b1376974a9 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportVisibleCells.cpp @@ -38,7 +38,7 @@ #include "RifEclipseInputFileTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -62,31 +62,25 @@ void AppEnum::setUp() //-------------------------------------------------------------------------------------------------- RicfExportVisibleCells::RicfExportVisibleCells() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewName, "viewName", QString(), "View Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_exportKeyword, - "exportKeyword", - caf::AppEnum(), - "Export Keyword", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_visibleActiveCellsValue, - "visibleActiveCellsValue", - 1, - "Visible Active Cells Value", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_hiddenActiveCellsValue, - "hiddenActiveCellsValue", - 0, - "Hidden Active Cells Value", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewName, "viewName", QString(), "View Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_exportKeyword, + "exportKeyword", + caf::AppEnum(), + "Export Keyword", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_visibleActiveCellsValue, + "visibleActiveCellsValue", + 1, + "Visible Active Cells Value", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_hiddenActiveCellsValue, "hiddenActiveCellsValue", 0, "Hidden Active Cells Value", "", "", "" ); + CAF_PDM_InitScriptableField( &m_inactiveCellsValue, "inactiveCellsValue", 0, "Inactive Cells Value", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportWellLogPlotData.cpp b/ApplicationCode/CommandFileInterface/RicfExportWellLogPlotData.cpp index 8f39664a70..f6e0c2884e 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportWellLogPlotData.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportWellLogPlotData.cpp @@ -25,7 +25,7 @@ #include "RimProject.h" #include "RimWellLogPlot.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -60,14 +60,14 @@ CAF_PDM_SOURCE_INIT( RicfExportWellLogPlotData, "exportWellLogPlotData" ); //-------------------------------------------------------------------------------------------------- RicfExportWellLogPlotData::RicfExportWellLogPlotData() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_format, "exportFormat", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_folder, "exportFolder", QString(), "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_filePrefix, "filePrefix", QString(), "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_exportTvdRkb, "exportTvdRkb", false, "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_capitalizeFileNames, "capitalizeFileNames", false, "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_resampleInterval, "resampleInterval", 0.0, "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_convertCurveUnits, "convertCurveUnits", false, "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_format, "exportFormat", "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_folder, "exportFolder", QString(), "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_filePrefix, "filePrefix", QString(), "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_exportTvdRkb, "exportTvdRkb", false, "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_capitalizeFileNames, "capitalizeFileNames", false, "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_resampleInterval, "resampleInterval", 0.0, "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_convertCurveUnits, "convertCurveUnits", false, "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp b/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp index 26c474cac1..6e38889d62 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportWellPathCompletions.cpp @@ -34,7 +34,7 @@ #include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfExportWellPathCompletions, "exportWellPathCompletions" ); @@ -43,73 +43,73 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPathCompletions, "exportWellPathCompletions" //-------------------------------------------------------------------------------------------------- RicfExportWellPathCompletions::RicfExportWellPathCompletions() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStep, "timeStep", -1, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_fileSplit, - "fileSplit", - RicExportCompletionDataSettingsUi::ExportSplitType(), - "File Split", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_compdatExport, - "compdatExport", - RicExportCompletionDataSettingsUi::CompdatExportType(), - "Compdat Export", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_combinationMode, - "combinationMode", - RicExportCompletionDataSettingsUi::CombinationModeType(), - "Combination Mode", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_fileSplit, + "fileSplit", + RicExportCompletionDataSettingsUi::ExportSplitType(), + "File Split", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_compdatExport, + "compdatExport", + RicExportCompletionDataSettingsUi::CompdatExportType(), + "Compdat Export", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_combinationMode, + "combinationMode", + RicExportCompletionDataSettingsUi::CombinationModeType(), + "Combination Mode", + "", + "", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" ); + CAF_PDM_InitScriptableField( &m_useLateralNTG, "useNtgHorizontally", false, "Use NTG Horizontally", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includePerforations, "includePerforations", true, "Include Perforations", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeFishbones, "includeFishbones", true, "Include Fishbones", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeFractures, "includeFractures", true, "Include Fractures", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_excludeMainBoreForFishbones, - "excludeMainBoreForFishbones", - false, - "Exclude Main Bore for Fishbones", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_excludeMainBoreForFishbones, + "excludeMainBoreForFishbones", + false, + "Exclude Main Bore for Fishbones", + "", + "", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_performTransScaling, - "performTransScaling", - false, - "Perform Transmissibility Scaling", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_transScalingTimeStep, - "transScalingTimeStep", - 0, - "Transmissibility Scaling Pressure Time Step", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_transScalingInitialWBHP, - "transScalingWBHPFromSummary", - RicExportCompletionDataSettingsUi::TransScalingWBHPSource(), - "Transmissibility Scaling WBHP from summary", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_transScalingWBHP, - "transScalingWBHP", - 200.0, - "Transmissibility Scaling Constant WBHP Value", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_performTransScaling, + "performTransScaling", + false, + "Perform Transmissibility Scaling", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_transScalingTimeStep, + "transScalingTimeStep", + 0, + "Transmissibility Scaling Pressure Time Step", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_transScalingInitialWBHP, + "transScalingWBHPFromSummary", + RicExportCompletionDataSettingsUi::TransScalingWBHPSource(), + "Transmissibility Scaling WBHP from summary", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_transScalingWBHP, + "transScalingWBHP", + 200.0, + "Transmissibility Scaling Constant WBHP Value", + "", + "", + "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfExportWellPaths.cpp b/ApplicationCode/CommandFileInterface/RicfExportWellPaths.cpp index 83c8bcf48f..34feb950f0 100644 --- a/ApplicationCode/CommandFileInterface/RicfExportWellPaths.cpp +++ b/ApplicationCode/CommandFileInterface/RicfExportWellPaths.cpp @@ -36,7 +36,7 @@ #include "RiaWellNameComparer.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfExportWellPaths, "exportWellPaths" ); @@ -45,8 +45,8 @@ CAF_PDM_SOURCE_INIT( RicfExportWellPaths, "exportWellPaths" ); //-------------------------------------------------------------------------------------------------- RicfExportWellPaths::RicfExportWellPaths() { - CAF_PDM_InitScriptableFieldWithIO( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size", "", "", "" ); + CAF_PDM_InitScriptableField( &m_wellPathNames, "wellPathNames", std::vector(), "Well Path Names", "", "", "" ); + CAF_PDM_InitScriptableField( &m_mdStepSize, "mdStepSize", 5.0, "MD Step Size", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfImportFormationNames.cpp b/ApplicationCode/CommandFileInterface/RicfImportFormationNames.cpp index 04b0441e6b..7db0abdfa9 100644 --- a/ApplicationCode/CommandFileInterface/RicfImportFormationNames.cpp +++ b/ApplicationCode/CommandFileInterface/RicfImportFormationNames.cpp @@ -23,7 +23,7 @@ #include "RimFormationNames.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -34,8 +34,8 @@ CAF_PDM_SOURCE_INIT( RicfImportFormationNames, "importFormationNames" ); //-------------------------------------------------------------------------------------------------- RicfImportFormationNames::RicfImportFormationNames() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_formationFiles, "formationFiles", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_applyToCaseId, "applyToCaseId", -1, "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_formationFiles, "formationFiles", "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_applyToCaseId, "applyToCaseId", -1, "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfImportWellLogFiles.cpp b/ApplicationCode/CommandFileInterface/RicfImportWellLogFiles.cpp index 8fc49a23f0..6b92cfeff5 100644 --- a/ApplicationCode/CommandFileInterface/RicfImportWellLogFiles.cpp +++ b/ApplicationCode/CommandFileInterface/RicfImportWellLogFiles.cpp @@ -22,7 +22,7 @@ #include "RiaApplication.h" #include "RimWellLogFile.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -46,8 +46,8 @@ CAF_PDM_SOURCE_INIT( RicfImportWellLogFiles, "importWellLogFiles" ); //-------------------------------------------------------------------------------------------------- RicfImportWellLogFiles::RicfImportWellLogFiles() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_wellLogFileFolder, "wellLogFolder", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_wellLogFilePaths, "wellLogFiles", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFileFolder, "wellLogFolder", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellLogFilePaths, "wellLogFiles", "", "", "", "" ); } caf::PdmScriptResponse RicfImportWellLogFiles::execute() diff --git a/ApplicationCode/CommandFileInterface/RicfLoadCase.cpp b/ApplicationCode/CommandFileInterface/RicfLoadCase.cpp index 2122daf1e0..6522cea50d 100644 --- a/ApplicationCode/CommandFileInterface/RicfLoadCase.cpp +++ b/ApplicationCode/CommandFileInterface/RicfLoadCase.cpp @@ -23,7 +23,7 @@ #include "RiaImportEclipseCaseTools.h" #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -47,7 +47,7 @@ CAF_PDM_SOURCE_INIT( RicfLoadCase, "loadCase" ); //-------------------------------------------------------------------------------------------------- RicfLoadCase::RicfLoadCase() { - CAF_PDM_InitScriptableFieldWithIO( &m_path, "path", QString(), "Path to Case File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path to Case File", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp b/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp index 2afc2e14ec..53652df9a5 100644 --- a/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp +++ b/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp @@ -23,7 +23,7 @@ #include "RiaApplication.h" #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -35,7 +35,7 @@ CAF_PDM_SOURCE_INIT( RicfOpenProject, "openProject" ); //-------------------------------------------------------------------------------------------------- RicfOpenProject::RicfOpenProject() { - CAF_PDM_InitScriptableFieldWithIO( &m_path, "path", QString(), "Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp b/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp index 90fdd2968a..6caa5d11ee 100644 --- a/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp +++ b/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp @@ -26,7 +26,7 @@ #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -38,8 +38,8 @@ CAF_PDM_SOURCE_INIT( RicfSingleCaseReplace, "replaceCase" ); //-------------------------------------------------------------------------------------------------- RicfSingleCaseReplace::RicfSingleCaseReplace() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_newGridFile, "newGridFile", QString(), "New Grid File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_newGridFile, "newGridFile", QString(), "New Grid File", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfReplaceSourceCases.cpp b/ApplicationCode/CommandFileInterface/RicfReplaceSourceCases.cpp index 9be0e6e005..165b4214c1 100644 --- a/ApplicationCode/CommandFileInterface/RicfReplaceSourceCases.cpp +++ b/ApplicationCode/CommandFileInterface/RicfReplaceSourceCases.cpp @@ -24,7 +24,7 @@ #include "RiaLogging.h" #include "RiaProjectModifier.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfReplaceSourceCases, "replaceSourceCases" ); @@ -33,8 +33,8 @@ CAF_PDM_SOURCE_INIT( RicfReplaceSourceCases, "replaceSourceCases" ); //-------------------------------------------------------------------------------------------------- RicfReplaceSourceCases::RicfReplaceSourceCases() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseGroupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseGroupId, "caseGroupId", -1, "Case Group ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_gridListFile, "gridListFile", QString(), "Grid List File", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp b/ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp index e4b87a1eb4..8a11e7bde0 100644 --- a/ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp +++ b/ApplicationCode/CommandFileInterface/RicfRunOctaveScript.cpp @@ -26,7 +26,7 @@ #include "RimEclipseCase.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -37,8 +37,8 @@ CAF_PDM_SOURCE_INIT( RicfRunOctaveScript, "runOctaveScript" ); //-------------------------------------------------------------------------------------------------- RicfRunOctaveScript::RicfRunOctaveScript() { - CAF_PDM_InitScriptableFieldWithIO( &m_path, "path", QString(), "Path", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseIds, "caseIds", std::vector(), "Case IDs", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfScaleFractureTemplate.cpp b/ApplicationCode/CommandFileInterface/RicfScaleFractureTemplate.cpp index 3591b6b4fa..e130cea4e1 100644 --- a/ApplicationCode/CommandFileInterface/RicfScaleFractureTemplate.cpp +++ b/ApplicationCode/CommandFileInterface/RicfScaleFractureTemplate.cpp @@ -25,7 +25,7 @@ #include "RimFractureTemplateCollection.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfScaleFractureTemplate, "scaleFractureTemplate" ); @@ -36,13 +36,13 @@ RicfScaleFractureTemplate::RicfScaleFractureTemplate() { // clang-format off - CAF_PDM_InitScriptableFieldWithIO(&m_id, "id", -1, "Id", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_heightScaleFactor, "height", 1.0, "HeightScaleFactor", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor", "", "", ""); + CAF_PDM_InitScriptableField(&m_id, "id", -1, "Id", "", "", ""); + CAF_PDM_InitScriptableField(&m_halfLengthScaleFactor, "halfLength", 1.0, "HalfLengthScaleFactor", "", "", ""); + CAF_PDM_InitScriptableField(&m_heightScaleFactor, "height", 1.0, "HeightScaleFactor", "", "", ""); + CAF_PDM_InitScriptableField(&m_dFactorScaleFactor, "dFactor", 1.0, "DFactorScaleFactor", "", "", ""); + CAF_PDM_InitScriptableField(&m_conductivityScaleFactor, "conductivity", 1.0, "ConductivityScaleFactor", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor", "", "", ""); + CAF_PDM_InitScriptableField(&m_OBSOLETE_widthScaleFactor, "width", 1.0, "WidthScaleFactor", "", "", ""); // clang-format on } diff --git a/ApplicationCode/CommandFileInterface/RicfSetExportFolder.cpp b/ApplicationCode/CommandFileInterface/RicfSetExportFolder.cpp index fe15165d75..ae6c4bb72e 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetExportFolder.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetExportFolder.cpp @@ -20,7 +20,7 @@ #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -32,9 +32,9 @@ CAF_PDM_SOURCE_INIT( RicfSetExportFolder, "setExportFolder" ); RicfSetExportFolder::RicfSetExportFolder() { // clang-format off - CAF_PDM_InitScriptableFieldWithIO(&m_type, "type", RicfCommandFileExecutor::ExportTypeEnum(RicfCommandFileExecutor::ExportType::COMPLETIONS), "Type", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_path, "path", QString(), "Path", "", "", ""); - CAF_PDM_InitScriptableFieldWithIO(&m_createFolder, "createFolder", false, "Create Folder", "", "", ""); + CAF_PDM_InitScriptableField(&m_type, "type", RicfCommandFileExecutor::ExportTypeEnum(RicfCommandFileExecutor::ExportType::COMPLETIONS), "Type", "", "", ""); + CAF_PDM_InitScriptableField(&m_path, "path", QString(), "Path", "", "", ""); + CAF_PDM_InitScriptableField(&m_createFolder, "createFolder", false, "Create Folder", "", "", ""); // clang-format on } diff --git a/ApplicationCode/CommandFileInterface/RicfSetFractureContainment.cpp b/ApplicationCode/CommandFileInterface/RicfSetFractureContainment.cpp index d65e1de5ab..c54f369280 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetFractureContainment.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetFractureContainment.cpp @@ -25,7 +25,7 @@ #include "RimFractureTemplateCollection.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfSetFractureContainment, "setFractureContainment" ); @@ -34,9 +34,9 @@ CAF_PDM_SOURCE_INIT( RicfSetFractureContainment, "setFractureContainment" ); //-------------------------------------------------------------------------------------------------- RicfSetFractureContainment::RicfSetFractureContainment() { - CAF_PDM_InitScriptableFieldWithIO( &m_id, "id", -1, "Id", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_topLayer, "topLayer", -1, "TopLayer", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_baseLayer, "baseLayer", -1, "BaseLayer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "id", -1, "Id", "", "", "" ); + CAF_PDM_InitScriptableField( &m_topLayer, "topLayer", -1, "TopLayer", "", "", "" ); + CAF_PDM_InitScriptableField( &m_baseLayer, "baseLayer", -1, "BaseLayer", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfSetMainWindowSize.cpp b/ApplicationCode/CommandFileInterface/RicfSetMainWindowSize.cpp index 6646dc30ae..6b3f894056 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetMainWindowSize.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetMainWindowSize.cpp @@ -21,7 +21,7 @@ #include "RiuMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfSetMainWindowSize, "setMainWindowSize" ); @@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetMainWindowSize, "setMainWindowSize" ); //-------------------------------------------------------------------------------------------------- RicfSetMainWindowSize::RicfSetMainWindowSize() { - CAF_PDM_InitScriptableFieldWithIO( &m_height, "height", -1, "Height", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_width, "width", -1, "Width", "", "", "" ); + CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" ); + CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfSetPlotWindowSize.cpp b/ApplicationCode/CommandFileInterface/RicfSetPlotWindowSize.cpp index b0ee15a27b..0d8550dcf6 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetPlotWindowSize.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetPlotWindowSize.cpp @@ -21,7 +21,7 @@ #include "RiaGuiApplication.h" #include "RiuPlotMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfSetPlotWindowSize, "setPlotWindowSize" ); @@ -30,8 +30,8 @@ CAF_PDM_SOURCE_INIT( RicfSetPlotWindowSize, "setPlotWindowSize" ); //-------------------------------------------------------------------------------------------------- RicfSetPlotWindowSize::RicfSetPlotWindowSize() { - CAF_PDM_InitScriptableFieldWithIO( &m_height, "height", -1, "Height", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_width, "width", -1, "Width", "", "", "" ); + CAF_PDM_InitScriptableField( &m_height, "height", -1, "Height", "", "", "" ); + CAF_PDM_InitScriptableField( &m_width, "width", -1, "Width", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfSetStartDir.cpp b/ApplicationCode/CommandFileInterface/RicfSetStartDir.cpp index 776a686b88..7a2e9918ab 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetStartDir.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetStartDir.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT( RicfSetStartDir, "setStartDir" ); //-------------------------------------------------------------------------------------------------- RicfSetStartDir::RicfSetStartDir() { - CAF_PDM_InitScriptableFieldWithIO( &m_path, "path", QString(), "Path", "", "", "" ); + CAF_PDM_InitScriptableField( &m_path, "path", QString(), "Path", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp b/ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp index 0a053fff56..5ed9fae65f 100644 --- a/ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp +++ b/ApplicationCode/CommandFileInterface/RicfSetTimeStep.cpp @@ -26,7 +26,7 @@ #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RicfSetTimeStep, "setTimeStep" ); @@ -35,9 +35,9 @@ CAF_PDM_SOURCE_INIT( RicfSetTimeStep, "setTimeStep" ); //-------------------------------------------------------------------------------------------------- RicfSetTimeStep::RicfSetTimeStep() { - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View ID", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "caseId", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_timeStepIndex, "timeStep", -1, "Time Step Index", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp index fce15fa15c..b9a3dad2d4 100644 --- a/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp +++ b/ApplicationCode/Commands/ApplicationCommands/RicSaveProjectAsFeature.cpp @@ -23,7 +23,7 @@ #include "RicSaveProjectFeature.h" #include "Riu3DMainWindowTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -35,7 +35,7 @@ RICF_SOURCE_INIT( RicSaveProjectAsFeature, "RicSaveProjectAsFeature", "saveProje //-------------------------------------------------------------------------------------------------- RicSaveProjectAsFeature::RicSaveProjectAsFeature() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_filePath, "filePath", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_filePath, "filePath", "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp b/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp index f5c556d7f1..86f1d79113 100644 --- a/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp +++ b/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp @@ -36,7 +36,7 @@ #include "RiuViewer.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiPropertyViewDialog.h" #include "cafSelectionManager.h" #include "cafUtils.h" @@ -50,11 +50,11 @@ RICF_SOURCE_INIT( RicExportContourMapToTextFeature, "RicExportContourMapToTextFe RicExportContourMapToTextFeature::RicExportContourMapToTextFeature() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_exportFileName, "exportFileName", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_viewId, "viewId", -1, "View Id", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_exportFileName, "exportFileName", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_exportLocalCoordinates, "exportLocalCoordinates", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_undefinedValueLabel, "undefinedValueLabel", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_excludeUndefinedValues, "excludeUndefinedValues", "", "", "", "" ); + CAF_PDM_InitScriptableField( &m_viewId, "viewId", -1, "View Id", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicStackSelectedCurvesFeature.cpp b/ApplicationCode/Commands/RicStackSelectedCurvesFeature.cpp index 22ffb6f76a..4546d29507 100644 --- a/ApplicationCode/Commands/RicStackSelectedCurvesFeature.cpp +++ b/ApplicationCode/Commands/RicStackSelectedCurvesFeature.cpp @@ -21,7 +21,7 @@ #include "RiaGuiApplication.h" #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmScriptResponse.h" #include "cafPdmUiItem.h" @@ -37,7 +37,7 @@ RICF_SOURCE_INIT( RicStackSelectedCurvesFeature, "RicStackSelectedCurvesFeature" //-------------------------------------------------------------------------------------------------- RicStackSelectedCurvesFeature::RicStackSelectedCurvesFeature() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_curves, "curves", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicUnstackSelectedCurvesFeature.cpp b/ApplicationCode/Commands/RicUnstackSelectedCurvesFeature.cpp index baf025b4c8..f5126d3b30 100644 --- a/ApplicationCode/Commands/RicUnstackSelectedCurvesFeature.cpp +++ b/ApplicationCode/Commands/RicUnstackSelectedCurvesFeature.cpp @@ -21,7 +21,7 @@ #include "RiaGuiApplication.h" #include "RiaLogging.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmScriptResponse.h" #include "cafPdmUiItem.h" @@ -37,7 +37,7 @@ RICF_SOURCE_INIT( RicUnstackSelectedCurvesFeature, "RicUnstackSelectedCurvesFeat //-------------------------------------------------------------------------------------------------- RicUnstackSelectedCurvesFeature::RicUnstackSelectedCurvesFeature() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_curves, "curves", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_curves, "curves", "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp index 2fb92bae54..0a91c9fa28 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp @@ -32,7 +32,7 @@ #include "Riu3DMainWindowTools.h" #include "RiuFileDialogTools.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -65,8 +65,8 @@ RICF_SOURCE_INIT( RicImportWellPaths, "RicWellPathsImportFileFeature", "importWe //-------------------------------------------------------------------------------------------------- RicImportWellPaths::RicImportWellPaths() { - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_wellPathFolder, "wellPathFolder", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_wellPathFiles, "wellPathFiles", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFolder, "wellPathFolder", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_wellPathFiles, "wellPathFiles", "", "", "", "" ); } caf::PdmScriptResponse RicImportWellPaths::execute() diff --git a/ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp b/ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp index f7824c1a58..db45c0d091 100644 --- a/ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp +++ b/ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp @@ -22,11 +22,11 @@ #include "RimEclipseResultDefinition.h" #include "RimProject.h" -#include "cafPdmFieldScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmObjectMethod.h" -#include "cafPdmObjectScriptability.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapability.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" using namespace rips; @@ -172,7 +172,7 @@ Status RiaPdmObjectMethodStateHandler::init( const rips::PdmObjectGetterRequest* m_fieldOwner->fields( fields ); for ( auto field : fields ) { - auto scriptability = field->capability(); + auto scriptability = field->capability(); if ( scriptability && scriptability->scriptFieldName() == fieldName ) { caf::PdmProxyFieldHandle* proxyField = dynamic_cast( field ); @@ -226,7 +226,7 @@ Status RiaPdmObjectMethodStateHandler::init( const rips::PdmObjectSetterChunk* c m_fieldOwner->fields( fields ); for ( auto field : fields ) { - auto scriptability = field->capability(); + auto scriptability = field->capability(); if ( scriptability && scriptability->scriptFieldName() == fieldName ) { caf::PdmProxyFieldHandle* proxyField = dynamic_cast( field ); @@ -340,7 +340,7 @@ grpc::Status RiaGrpcPdmObjectService::GetAncestorPdmObject( grpc::ServerContext* std::vector objectsOfCurrentClass; QString scriptClassName = QString::fromStdString( request->object().class_keyword() ); - QString classKeyword = caf::PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( scriptClassName ); + QString classKeyword = caf::PdmObjectScriptingCapabilityRegister::classKeywordFromScriptClassName( scriptClassName ); project->descendantsIncludingThisFromClassKeyword( classKeyword, objectsOfCurrentClass ); @@ -358,7 +358,7 @@ grpc::Status RiaGrpcPdmObjectService::GetAncestorPdmObject( grpc::ServerContext* caf::PdmObject* parentObject = nullptr; QString ancestorScriptName = QString::fromStdString( request->parent_keyword() ); QString ancestorClassKeyword = - caf::PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( ancestorScriptName ); + caf::PdmObjectScriptingCapabilityRegister::classKeywordFromScriptClassName( ancestorScriptName ); matchingObject->firstAncestorOrThisFromClassKeyword( ancestorClassKeyword, parentObject ); if ( parentObject ) { @@ -381,7 +381,7 @@ grpc::Status RiaGrpcPdmObjectService::GetDescendantPdmObjects( grpc::ServerConte if ( matchingObject ) { std::vector childObjects; - QString childClassKeyword = caf::PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( + QString childClassKeyword = caf::PdmObjectScriptingCapabilityRegister::classKeywordFromScriptClassName( QString::fromStdString( request->child_keyword() ) ); matchingObject->descendantsIncludingThisFromClassKeyword( childClassKeyword, childObjects ); for ( auto pdmChild : childObjects ) @@ -409,7 +409,7 @@ grpc::Status RiaGrpcPdmObjectService::GetChildPdmObjects( grpc::ServerContext* matchingObject->fields( fields ); for ( auto field : fields ) { - auto scriptability = field->capability(); + auto scriptability = field->capability(); if ( scriptability && scriptability->scriptFieldName() == fieldName ) { std::vector childObjects; @@ -612,7 +612,7 @@ caf::PdmObject* RiaGrpcPdmObjectService::findCafObjectFromScriptNameAndAddress( RimProject* project = RimProject::current(); std::vector objectsOfCurrentClass; - QString classKeyword = caf::PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( scriptClassName ); + QString classKeyword = caf::PdmObjectScriptingCapabilityRegister::classKeywordFromScriptClassName( scriptClassName ); project->descendantsIncludingThisFromClassKeyword( classKeyword, objectsOfCurrentClass ); diff --git a/ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp b/ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp index 605d483848..8e49992828 100644 --- a/ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp +++ b/ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp @@ -20,17 +20,18 @@ #include "RimCase.h" #include "RimProject.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" #include "cafPdmDataValueField.h" -#include "cafPdmFieldScriptability.h" #include "cafPdmObject.h" -#include "cafPdmObjectScriptability.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapability.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" #include "cafPdmProxyValueField.h" #include "cafPdmScriptIOMessages.h" #include "cafPdmXmlFieldHandle.h" + #include #include @@ -71,7 +72,7 @@ void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHa CAF_ASSERT( source && destination && source->xmlCapability() ); QString classKeyword = source->xmlCapability()->classKeyword(); - QString scriptName = caf::PdmObjectScriptabilityRegister::scriptClassNameFromClassKeyword( classKeyword ); + QString scriptName = caf::PdmObjectScriptingCapabilityRegister::scriptClassNameFromClassKeyword( classKeyword ); destination->set_class_keyword( scriptName.toStdString() ); destination->set_address( reinterpret_cast( source ) ); @@ -97,7 +98,7 @@ void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHa if ( pdmValueField ) { QString keyword = pdmValueField->keyword(); - auto ricfHandle = field->template capability(); + auto ricfHandle = field->template capability(); if ( ricfHandle != nullptr ) { auto pdmProxyField = dynamic_cast( field ); @@ -139,7 +140,7 @@ void RiaGrpcServiceInterface::copyPdmObjectFromRipsToCaf( const rips::PdmObject* auto parametersMap = source->parameters(); for ( auto field : fields ) { - auto scriptability = field->template capability(); + auto scriptability = field->template capability(); if ( scriptability ) { QString keyword = scriptability->scriptFieldName(); @@ -164,7 +165,7 @@ bool RiaGrpcServiceInterface::assignFieldValue( const QString& stringValue { CAF_ASSERT( oldValue && newValue ); - auto scriptability = field->template capability(); + auto scriptability = field->template capability(); if ( field && scriptability != nullptr ) { caf::PdmValueField* valueField = dynamic_cast( field ); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp index 43e377d564..37f8f29524 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp @@ -51,8 +51,9 @@ #include "RimWellPathGeometryDef.h" #include "RimWellPathTarget.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmFieldScriptingCapabilityCvfVec3d.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiDoubleSliderEditor.h" #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiToolButtonEditor.h" @@ -87,15 +88,15 @@ RimFractureModel::RimFractureModel() { CAF_PDM_InitScriptableObject( "FractureModel", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_MD, "MD", 0.0, "MD", "", "", "" ); + CAF_PDM_InitScriptableField( &m_MD, "MD", 0.0, "MD", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_extractionType, - "ExtractionType", - caf::AppEnum( ExtractionType::TRUE_STRATIGRAPHIC_THICKNESS ), - "Extraction Type", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_extractionType, + "ExtractionType", + caf::AppEnum( ExtractionType::TRUE_STRATIGRAPHIC_THICKNESS ), + "Extraction Type", + "", + "", + "" ); CAF_PDM_InitScriptableFieldNoDefault( &m_anchorPosition, "AnchorPosition", "Anchor Position", "", "", "" ); m_anchorPosition.uiCapability()->setUiReadOnly( true ); @@ -110,78 +111,62 @@ RimFractureModel::RimFractureModel() "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_boundingBoxHorizontal, - "BoundingBoxHorizontal", - 50.0, - "Bounding Box Horizontal", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" ); + CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal", "", "", "" ); + CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_defaultPorosity, "DefaultPorosity", 0.0, "Default Porosity", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_defaultPermeability, "DefaultPermeability", 10.0e-6, "Default Permeability", "", "", "" ); + CAF_PDM_InitScriptableField( &m_defaultPorosity, "DefaultPorosity", 0.0, "Default Porosity", "", "", "" ); + CAF_PDM_InitScriptableField( &m_defaultPermeability, "DefaultPermeability", 10.0e-6, "Default Permeability", "", "", "" ); // Stress unit: bar // Stress gradient unit: bar/m // Depth is meter - CAF_PDM_InitScriptableFieldWithIO( &m_verticalStress, "VerticalStress", 879.0, "Vertical Stress", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_verticalStressGradient, - "VerticalStressGradient", - 0.238, - "Vertical Stress Gradient", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_stressDepth, "StressDepth", 1000.0, "Stress Depth", "", "", "" ); + CAF_PDM_InitScriptableField( &m_verticalStress, "VerticalStress", 879.0, "Vertical Stress", "", "", "" ); + CAF_PDM_InitScriptableField( &m_verticalStressGradient, + "VerticalStressGradient", + 0.238, + "Vertical Stress Gradient", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_stressDepth, "StressDepth", 1000.0, "Stress Depth", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_overburdenHeight, "OverburdenHeight", 50.0, "Overburden Height", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_overburdenFormation, - "OverburdenFormation", - "Overburden Formation", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_overburdenFacies, "OverburdenFacies", "Overburden Facies", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_overburdenPorosity, "OverburdenPorosity", 0.0, "Overburden Porosity", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_overburdenPermeability, - "OverburdenPermeability", - 10.0e-6, - "Overburden Permeability", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_overburdenFluidDensity, - "OverburdenFluidDensity", - 1.03, - "Overburden Fluid Density [g/cm^3]", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_overburdenHeight, "OverburdenHeight", 50.0, "Overburden Height", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFormation, "OverburdenFormation", "Overburden Formation", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_overburdenFacies, "OverburdenFacies", "Overburden Facies", "", "", "" ); + CAF_PDM_InitScriptableField( &m_overburdenPorosity, "OverburdenPorosity", 0.0, "Overburden Porosity", "", "", "" ); + CAF_PDM_InitScriptableField( &m_overburdenPermeability, + "OverburdenPermeability", + 10.0e-6, + "Overburden Permeability", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_overburdenFluidDensity, + "OverburdenFluidDensity", + 1.03, + "Overburden Fluid Density [g/cm^3]", + "", + "", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_underburdenHeight, "UnderburdenHeight", 50.0, "Underburden Height", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_underburdenFormation, - "UnderburdenFormation", - "Underburden Formation", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_underburdenFacies, "UnderburdenFacies", "Underburden Facies", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_underburdenPorosity, "UnderburdenPorosity", 0.0, "Underburden Porosity", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_underburdenPermeability, - "UnderburdenPermeability", - 10.0e-6, - "Underburden Permeability", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_underburdenFluidDensity, - "UnderburdenFluidDensity", - 1.03, - "Underburden Fluid Density [g/cm^3]", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_underburdenHeight, "UnderburdenHeight", 50.0, "Underburden Height", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFormation, "UnderburdenFormation", "Underburden Formation", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_underburdenFacies, "UnderburdenFacies", "Underburden Facies", "", "", "" ); + CAF_PDM_InitScriptableField( &m_underburdenPorosity, "UnderburdenPorosity", 0.0, "Underburden Porosity", "", "", "" ); + CAF_PDM_InitScriptableField( &m_underburdenPermeability, + "UnderburdenPermeability", + 10.0e-6, + "Underburden Permeability", + "", + "", + "" ); + CAF_PDM_InitScriptableField( &m_underburdenFluidDensity, + "UnderburdenFluidDensity", + 1.03, + "Underburden Fluid Density [g/cm^3]", + "", + "", + "" ); CAF_PDM_InitScriptableFieldNoDefault( &m_elasticProperties, "ElasticProperties", "Elastic Properties", "", "", "" ); m_elasticProperties.uiCapability()->setUiHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModelCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureModelCollection.cpp index b7d2739a76..fa6ab2b01d 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModelCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModelCollection.cpp @@ -21,9 +21,9 @@ #include "RimFractureModel.h" #include "RimProject.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" CAF_PDM_SOURCE_INIT( RimFractureModelCollection, "FractureModelCollection" ); diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp index 8b2befe258..6e28487a7a 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp @@ -51,8 +51,8 @@ #include "cafDisplayCoordTransform.h" #include "cafFrameAnimationControl.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmFieldIOScriptabilityCvfColor3.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmFieldScriptingCapabilityCvfColor3.h" #include "cvfCamera.h" #include "cvfModelBasicList.h" @@ -90,11 +90,11 @@ Rim3dView::Rim3dView( void ) CAF_PDM_InitObject( "3d View", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_id, "Id", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID", "", "", "" ); m_id.registerKeywordAlias( "ViewId" ); m_id.uiCapability()->setUiReadOnly( true ); m_id.uiCapability()->setUiHidden( true ); - m_id.capability()->setIOWriteable( false ); + m_id.capability()->setIOWriteable( false ); m_id.xmlCapability()->setCopyable( false ); CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); @@ -109,19 +109,19 @@ Rim3dView::Rim3dView( void ) CAF_PDM_InitField( &m_cameraPointOfInterest, "CameraPointOfInterest", cvf::Vec3d::ZERO, "", "", "", "" ); m_cameraPointOfInterest.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &isPerspectiveView, "PerspectiveProjection", true, "Perspective Projection", "", "", "" ); + CAF_PDM_InitScriptableField( &isPerspectiveView, "PerspectiveProjection", true, "Perspective Projection", "", "", "" ); double defaultScaleFactor = preferences->defaultScaleFactorZ(); - CAF_PDM_InitScriptableFieldWithIO( &scaleZ, - "GridZScale", - defaultScaleFactor, - "Z Scale", - "", - "Scales the scene in the Z direction", - "" ); + CAF_PDM_InitScriptableField( &scaleZ, + "GridZScale", + defaultScaleFactor, + "Z Scale", + "", + "Scales the scene in the Z direction", + "" ); cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor(); - CAF_PDM_InitScriptableFieldWithIO( &m_backgroundColor, "BackgroundColor", defBackgColor, "Background", "", "", "" ); + CAF_PDM_InitScriptableField( &m_backgroundColor, "BackgroundColor", defBackgColor, "Background", "", "", "" ); m_backgroundColor.registerKeywordAlias( "ViewBackgroundColor" ); CAF_PDM_InitField( &maximumFrameRate, "MaximumFrameRate", 10, "Maximum Frame Rate", "", "", "" ); @@ -129,24 +129,24 @@ Rim3dView::Rim3dView( void ) CAF_PDM_InitField( &hasUserRequestedAnimation, "AnimationMode", false, "Animation Mode", "", "", "" ); hasUserRequestedAnimation.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_currentTimeStep, "CurrentTimeStep", 0, "Current Time Step", "", "", "" ); + CAF_PDM_InitScriptableField( &m_currentTimeStep, "CurrentTimeStep", 0, "Current Time Step", "", "", "" ); m_currentTimeStep.uiCapability()->setUiHidden( true ); caf::AppEnum defaultMeshType = preferences->defaultMeshModeType(); CAF_PDM_InitField( &meshMode, "MeshMode", defaultMeshType, "Grid Lines", "", "", "" ); CAF_PDM_InitFieldNoDefault( &surfaceMode, "SurfaceMode", "Grid Surface", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_showGridBox, "ShowGridBox", true, "Show Grid Box", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showGridBox, "ShowGridBox", true, "Show Grid Box", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_disableLighting, - "DisableLighting", - false, - "Disable Results Lighting", - "", - "Disable light model for scalar result colors", - "" ); + CAF_PDM_InitScriptableField( &m_disableLighting, + "DisableLighting", + false, + "Disable Results Lighting", + "", + "Disable light model for scalar result colors", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_showZScaleLabel, "ShowZScale", true, "Show Z Scale Label", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showZScaleLabel, "ShowZScale", true, "Show Z Scale Label", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_comparisonView, "ComparisonView", "Comparison View", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp index 3918ddc203..932b5bc342 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimCase.cpp @@ -32,9 +32,9 @@ #include "RimExtrudedCurveIntersection.h" #include "RimGridView.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObjectFactory.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCase, "Case", "RimCase" ); @@ -46,15 +46,15 @@ RimCase::RimCase() { CAF_PDM_InitScriptableObjectWithNameAndComment( "Case", ":/Case48x48.png", "", "", "Case", "The ResInsight base class for Cases" ); - CAF_PDM_InitScriptableFieldWithIO( &caseUserDescription, "Name", QString(), "Case Name", "", "", "" ); + CAF_PDM_InitScriptableField( &caseUserDescription, "Name", QString(), "Case Name", "", "", "" ); caseUserDescription.registerKeywordAlias( "CaseUserDescription" ); - CAF_PDM_InitScriptableFieldWithIO( &caseId, "Id", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &caseId, "Id", -1, "Case ID", "", "", "" ); caseId.registerKeywordAlias( "CaseId" ); caseId.uiCapability()->setUiReadOnly( true ); - caseId.capability()->setIOWriteable( false ); + caseId.capability()->setIOWriteable( false ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_caseFileName, "FilePath", "Case File Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_caseFileName, "FilePath", "Case File Name", "", "", "" ); m_caseFileName.registerKeywordAlias( "CaseFileName" ); m_caseFileName.registerKeywordAlias( "GridFileName" ); diff --git a/ApplicationCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationCode/ProjectDataModel/RimDepthTrackPlot.cpp index c9d61ba09d..53938bca5c 100644 --- a/ApplicationCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -39,13 +39,14 @@ #include "RiuQwtPlotWidget.h" #include "RiuWellLogPlot.h" -#include "cafPdmFieldIOScriptability.h" #include "cafPdmFieldReorderCapability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiDoubleValueEditor.h" #include "cvfAssert.h" + #include #include @@ -86,29 +87,29 @@ RimDepthTrackPlot::RimDepthTrackPlot() m_commonDataSource.xmlCapability()->disableIO(); m_commonDataSource = new RimWellLogCurveCommonDataSource; - CAF_PDM_InitScriptableFieldWithIO( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title", "", "", "" ); CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" ); m_plotWindowTitle.xmlCapability()->setIOWritable( false ); caf::AppEnum depthType = RiaDefines::DepthTypeEnum::MEASURED_DEPTH; - CAF_PDM_InitScriptableFieldWithIO( &m_depthType, "DepthType", depthType, "Type", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depthType, "DepthType", depthType, "Type", "", "", "" ); caf::AppEnum depthUnit = RiaDefines::DepthUnitType::UNIT_METER; - CAF_PDM_InitScriptableFieldWithIO( &m_depthUnit, "DepthUnit", depthUnit, "Unit", "", "", "" ); + CAF_PDM_InitScriptableField( &m_depthUnit, "DepthUnit", depthUnit, "Unit", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_minVisibleDepth, "MinimumDepth", 0.0, "Min", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_maxVisibleDepth, "MaximumDepth", 1000.0, "Max", "", "", "" ); + CAF_PDM_InitScriptableField( &m_minVisibleDepth, "MinimumDepth", 0.0, "Min", "", "", "" ); + CAF_PDM_InitScriptableField( &m_maxVisibleDepth, "MaximumDepth", 1000.0, "Max", "", "", "" ); m_minVisibleDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); m_maxVisibleDepth.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_depthAxisGridVisibility, "ShowDepthGridLines", "Show Grid Lines", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_isAutoScaleDepthEnabled, "AutoScaleDepthEnabled", true, "Auto Scale", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_depthAxisGridVisibility, "ShowDepthGridLines", "Show Grid Lines", "", "", "" ); + CAF_PDM_InitScriptableField( &m_isAutoScaleDepthEnabled, "AutoScaleDepthEnabled", true, "Auto Scale", "", "", "" ); m_isAutoScaleDepthEnabled.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Track Title Font Size", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_subTitleFontSize, "SubTitleFontSize", "Track Title Font Size", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_axisTitleFontSize, "AxisTitleFontSize", "Axis Title Font Size", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_axisValueFontSize, "AxisValueFontSize", "Axis Value Font Size", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_nameConfig, "NameConfig", "", "", "", "" ); m_nameConfig.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index 3fbdd589ea..89eb75bc03 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -67,8 +67,8 @@ #include "RimWellPathCollection.h" #include "cafPdmDocument.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiTreeOrdering.h" #include "cafProgressInfo.h" @@ -89,13 +89,13 @@ RimEclipseCase::RimEclipseCase() "Reservoir", "Abtract base class for Eclipse Cases" ); - CAF_PDM_InitScriptableFieldWithKeywordNoDefault( &reservoirViews, - "ReservoirViews", - "Views", - "", - "", - "", - "All Eclipse Views in the case" ); + CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( &reservoirViews, + "ReservoirViews", + "Views", + "", + "", + "", + "All Eclipse Views in the case" ); reservoirViews.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_matrixModelResults, "MatrixModelResults", "", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 391680e1e6..e50bc7b002 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -68,7 +68,7 @@ #include "RimWellLogTrack.h" #include "cafCategoryMapper.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiListEditor.h" #include "cafPdmUiToolButtonEditor.h" #include "cafPdmUiTreeSelectionEditor.h" @@ -102,19 +102,13 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe { CAF_PDM_InitScriptableObjectWithNameAndComment( "Result Definition", "", "", "", "EclipseResult", "An eclipse result definition" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_resultType, "ResultType", "Type", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Type", "", "", "" ); m_resultType.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_porosityModel, "PorosityModelType", "Porosity", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModelType", "Porosity", "", "", "" ); m_porosityModel.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_resultVariable, - "ResultVariable", - RiaDefines::undefinedResultName(), - "Variable", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_resultVariable, "ResultVariable", RiaDefines::undefinedResultName(), "Variable", "", "", "" ); m_resultVariable.uiCapability()->setUiHidden( true ); CAF_PDM_InitFieldNoDefault( &m_flowSolution, "FlowDiagSolution", "Solution", "", "", "" ); @@ -135,27 +129,17 @@ RimEclipseResultDefinition::RimEclipseResultDefinition( caf::PdmUiItemInfo::Labe CAF_PDM_InitFieldNoDefault( &m_selectedTracers_OBSOLETE, "SelectedTracers", "Tracers", "", "", "" ); m_selectedTracers_OBSOLETE.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedInjectorTracers, - "SelectedInjectorTracers", - "Injector Tracers", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInjectorTracers, "SelectedInjectorTracers", "Injector Tracers", "", "", "" ); m_selectedInjectorTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedProducerTracers, - "SelectedProducerTracers", - "Producer Tracers", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedProducerTracers, "SelectedProducerTracers", "Producer Tracers", "", "", "" ); m_selectedProducerTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedSouringTracers, "SelectedSouringTracers", "Tracers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedSouringTracers, "SelectedSouringTracers", "Tracers", "", "", "" ); m_selectedSouringTracers.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_phaseSelection, "PhaseSelection", "Phases", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_flowTracerSelectionMode, "FlowTracerSelectionMode", "Tracers", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_phaseSelection, "PhaseSelection", "Phases", "", "", "" ); m_phaseSelection.uiCapability()->setUiLabelPosition( m_labelPosition ); // Ui only fields diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index ea5451584c..0f1109e05c 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -38,7 +38,7 @@ #include "RiuMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiTextEditor.h" #include "cafProgressInfo.h" @@ -77,50 +77,40 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase() m_selectionSummary.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() ); m_selectionSummary.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_resultType, "ResultType", "Result Type", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_resultType, "ResultType", "Result Type", "", "", "" ); m_resultType.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_porosityModel, "PorosityModel", "Porosity Model", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porosityModel, "PorosityModel", "Porosity Model", "", "", "" ); m_porosityModel.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedDynamicProperties, - "DynamicPropertiesToCalculate", - "Dyn Prop", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedStaticProperties, - "StaticPropertiesToCalculate", - "Stat Prop", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedGeneratedProperties, "GeneratedPropertiesToCalculate", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedInputProperties, "InputPropertiesToCalculate", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedDynamicProperties, "DynamicPropertiesToCalculate", "Dyn Prop", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedStaticProperties, "StaticPropertiesToCalculate", "Stat Prop", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedGeneratedProperties, "GeneratedPropertiesToCalculate", "", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedInputProperties, "InputPropertiesToCalculate", "", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedFractureDynamicProperties, - "FractureDynamicPropertiesToCalculate", - "", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedFractureStaticProperties, - "FractureStaticPropertiesToCalculate", - "", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedFractureGeneratedProperties, - "FractureGeneratedPropertiesToCalculate", - "", - "", - "", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_selectedFractureInputProperties, - "FractureInputPropertiesToCalculate", - "", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedFractureDynamicProperties, + "FractureDynamicPropertiesToCalculate", + "", + "", + "", + "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedFractureStaticProperties, + "FractureStaticPropertiesToCalculate", + "", + "", + "", + "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedFractureGeneratedProperties, + "FractureGeneratedPropertiesToCalculate", + "", + "", + "", + "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_selectedFractureInputProperties, + "FractureInputPropertiesToCalculate", + "", + "", + "", + "" ); m_selectedDynamicProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedStaticProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); @@ -132,28 +122,28 @@ RimEclipseStatisticsCase::RimEclipseStatisticsCase() m_selectedFractureGeneratedProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_selectedFractureInputProperties.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitScriptableFieldWithIO( &m_calculatePercentiles, "CalculatePercentiles", true, "Calculate Percentiles", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_percentileCalculationType, "PercentileCalculationType", "Method", "", "", "" ); + CAF_PDM_InitScriptableField( &m_calculatePercentiles, "CalculatePercentiles", true, "Calculate Percentiles", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_percentileCalculationType, "PercentileCalculationType", "Method", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_lowPercentile, "LowPercentile", 10.0, "Low", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_midPercentile, "MidPercentile", 50.0, "Mid", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_highPercentile, "HighPercentile", 90.0, "High", "", "", "" ); + CAF_PDM_InitScriptableField( &m_lowPercentile, "LowPercentile", 10.0, "Low", "", "", "" ); + CAF_PDM_InitScriptableField( &m_midPercentile, "MidPercentile", 50.0, "Mid", "", "", "" ); + CAF_PDM_InitScriptableField( &m_highPercentile, "HighPercentile", 90.0, "High", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_wellDataSourceCase, - "WellDataSourceCase", - RiaDefines::undefinedResultName(), - "Well Data Source Case", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_wellDataSourceCase, + "WellDataSourceCase", + RiaDefines::undefinedResultName(), + "Well Data Source Case", + "", + "", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_useZeroAsInactiveCellValue, - "UseZeroAsInactiveCellValue", - false, - "Use Zero as Inactive Cell Value", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_useZeroAsInactiveCellValue, + "UseZeroAsInactiveCellValue", + false, + "Use Zero as Inactive Cell Value", + "", + "", + "" ); m_populateSelectionAfterLoadingGrid = false; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 00c6ff6674..2a9f7f4e4e 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -99,8 +99,8 @@ #include "cafDisplayCoordTransform.h" #include "cafFrameAnimationControl.h" #include "cafOverlayScalarMapperLegend.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiTreeOrdering.h" #include "cvfDrawable.h" @@ -128,13 +128,13 @@ RimEclipseView::RimEclipseView() "EclipseView", "The Eclipse 3d Reservoir View" ); - CAF_PDM_InitScriptableFieldWithKeywordNoDefault( &m_cellResult, - "GridCellResult", - "CellResult", - "Cell Result", - ":/CellResult.png", - "", - "" ); + CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( &m_cellResult, + "GridCellResult", + "CellResult", + "Cell Result", + ":/CellResult.png", + "", + "" ); m_cellResult = new RimEclipseCellColors(); m_cellResult.uiCapability()->setUiHidden( true ); m_cellResult->setDiffResultOptionsEnabled( true ); diff --git a/ApplicationCode/ProjectDataModel/RimElasticProperties.cpp b/ApplicationCode/ProjectDataModel/RimElasticProperties.cpp index 8fb5ce0d61..b91c60d854 100644 --- a/ApplicationCode/ProjectDataModel/RimElasticProperties.cpp +++ b/ApplicationCode/ProjectDataModel/RimElasticProperties.cpp @@ -22,8 +22,8 @@ #include "RicElasticPropertiesImportTools.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiLineEditor.h" #include "cafPdmUiTextEditor.h" diff --git a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp index adeed48290..efbdd62bdc 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp @@ -31,7 +31,7 @@ #include "RigWellLogCurveData.h" #include "cafPdmBase.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmUiGroup.h" diff --git a/ApplicationCode/ProjectDataModel/RimFractureModelPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimFractureModelPlotCollection.cpp index 95ebd9e48f..6656251f07 100644 --- a/ApplicationCode/ProjectDataModel/RimFractureModelPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFractureModelPlotCollection.cpp @@ -20,8 +20,8 @@ #include "RimFractureModelPlot.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" CAF_PDM_SOURCE_INIT( RimFractureModelPlotCollection, "FractureModelPlotCollection" ); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp index 8fe9b309d8..104ba58103 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp @@ -51,8 +51,8 @@ #include "RimWellLogPlotCollection.h" #include "cafCmdFeatureManager.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiDoubleValueEditor.h" #include "cafPdmUiListEditor.h" #include "cafPdmUiPropertyViewDialog.h" @@ -108,13 +108,13 @@ RimGeoMechCase::RimGeoMechCase( void ) "GeoMechCase", "The Abaqus Based GeoMech Case" ); - CAF_PDM_InitScriptableFieldWithKeywordNoDefault( &geoMechViews, - "GeoMechViews", - "Views", - "", - "", - "", - "All GeoMech Views in the Case" ); + CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( &geoMechViews, + "GeoMechViews", + "Views", + "", + "", + "", + "All GeoMech Views in the Case" ); geoMechViews.uiCapability()->setUiHidden( true ); CAF_PDM_InitField( &m_cohesion, "CaseCohesion", 10.0, "Cohesion", "", "Used to calculate the SE:SFI result", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 592f4c47e4..ada473b320 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -41,8 +41,8 @@ #include "Riu3DMainWindowTools.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafProgressInfo.h" #include @@ -62,11 +62,11 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup() "GridCaseGroup", "A statistics case group" ); - CAF_PDM_InitScriptableFieldWithIO( &name, "UserDescription", QString( "Grid Case Group" ), "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &name, "UserDescription", QString( "Grid Case Group" ), "Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &groupId, "GroupId", -1, "Case Group ID", "", "", "" ); + CAF_PDM_InitScriptableField( &groupId, "GroupId", -1, "Case Group ID", "", "", "" ); groupId.uiCapability()->setUiReadOnly( true ); - groupId.capability()->setIOWriteable( false ); + groupId.capability()->setIOWriteable( false ); CAF_PDM_InitFieldNoDefault( &statisticsCaseCollection, "StatisticsCaseCollection", diff --git a/ApplicationCode/ProjectDataModel/RimMudWeightWindowParameters.cpp b/ApplicationCode/ProjectDataModel/RimMudWeightWindowParameters.cpp index 7008019c37..70894ca2dc 100644 --- a/ApplicationCode/ProjectDataModel/RimMudWeightWindowParameters.cpp +++ b/ApplicationCode/ProjectDataModel/RimMudWeightWindowParameters.cpp @@ -27,8 +27,8 @@ #include "RimGeoMechCase.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiDoubleValueEditor.h" #include "cafPdmUiListEditor.h" #include "cafPdmUiPropertyViewDialog.h" diff --git a/ApplicationCode/ProjectDataModel/RimPlotWindow.cpp b/ApplicationCode/ProjectDataModel/RimPlotWindow.cpp index cae603939b..a04f07a160 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotWindow.cpp +++ b/ApplicationCode/ProjectDataModel/RimPlotWindow.cpp @@ -26,7 +26,7 @@ #include "RimProject.h" #include "RiuMultiPlotPage.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiComboBoxEditor.h" #include @@ -45,11 +45,11 @@ RimPlotWindow::RimPlotWindow() "PlotWindow", "The Abstract base class for all MDI Windows in the Plot Window" ); - CAF_PDM_InitScriptableFieldWithIO( &m_id, "Id", -1, "View ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_id, "Id", -1, "View ID", "", "", "" ); m_id.registerKeywordAlias( "ViewId" ); m_id.uiCapability()->setUiReadOnly( true ); m_id.uiCapability()->setUiHidden( true ); - m_id.capability()->setIOWriteable( false ); + m_id.capability()->setIOWriteable( false ); m_id.xmlCapability()->setCopyable( false ); CAF_PDM_InitField( &m_showPlotLegends, "ShowTrackLegends", true, "Show Legends", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp index a3fcdb9824..9b98156d0f 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp @@ -47,7 +47,7 @@ #include "RivReservoirViewPartMgr.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiTreeOrdering.h" #include "cvfMath.h" @@ -71,7 +71,7 @@ RimSimWellInView::RimSimWellInView() "SimulationWell", "An Eclipse Simulation Well" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &name, "Name", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &name, "Name", "Name", "", "", "" ); name.registerKeywordAlias( "WellName" ); CAF_PDM_InitField( &showWell, "ShowWell", true, "Show well ", "", "", "" ); diff --git a/ApplicationCode/ProjectDataModel/RimWbsParameters.cpp b/ApplicationCode/ProjectDataModel/RimWbsParameters.cpp index 6a277896c3..7f32087cff 100644 --- a/ApplicationCode/ProjectDataModel/RimWbsParameters.cpp +++ b/ApplicationCode/ProjectDataModel/RimWbsParameters.cpp @@ -26,7 +26,7 @@ #include "RimWellLogFile.h" #include "RimWellPath.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" CAF_PDM_SOURCE_INIT( RimWbsParameters, "WbsParameters" ); @@ -37,109 +37,97 @@ RimWbsParameters::RimWbsParameters() { CAF_PDM_InitScriptableObject( "Well Bore Stability Parameters", ":/WellLogPlot16x16.png", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_porePressureSource, - "PorePressureReservoirSource", - "Reservoir Pore Pressure", - "", - "Data source for Pore Pressure in reservoir", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porePressureSource, + "PorePressureReservoirSource", + "Reservoir Pore Pressure", + "", + "Data source for Pore Pressure in reservoir", + "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_porePressureNonReservoirSource, - "PorePressureNonReservoirSource", - "Non-Reservoir Pore Pressure", - "", - "Data source for Non-Reservoir Pore Pressure", - "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedPPShale, - "UserPPNonReservoir", - 1.0, - " Multiplier of hydrostatic PP", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_porePressureNonReservoirSource, + "PorePressureNonReservoirSource", + "Non-Reservoir Pore Pressure", + "", + "Data source for Non-Reservoir Pore Pressure", + "" ); + CAF_PDM_InitScriptableField( &m_userDefinedPPShale, "UserPPNonReservoir", 1.0, " Multiplier of hydrostatic PP", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_poissonRatioSource, - "PoissionRatioSource", - "Poisson Ratio", - "", - "Data source for Poisson Ratio", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_poissonRatioSource, + "PoissionRatioSource", + "Poisson Ratio", + "", + "Data source for Poisson Ratio", + "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_ucsSource, - "UcsSource", - "Uniaxial Compressive Strength", - "", - "Data source for UCS", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_ucsSource, + "UcsSource", + "Uniaxial Compressive Strength", + "", + "Data source for UCS", + "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_OBG0Source, - "OBG0Source", - "Initial Overburden Gradient", - "", - "Data source for OBG0", - "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_DFSource, - "DFSource", - "Depletion Factor (DF)", - "", - "Data source for Depletion Factor", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_OBG0Source, + "OBG0Source", + "Initial Overburden Gradient", + "", + "Data source for OBG0", + "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_DFSource, + "DFSource", + "Depletion Factor (DF)", + "", + "Data source for Depletion Factor", + "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_K0SHSource, - "K0SHSource", - "K0_SH", - "", - "SH from Matthews & Kelly = K0_SH * (OBG0-PP0) + PP0 + DF * " - "(PP-PP0)\nK0_SH = " - "(SH - PP)/(OBG-PP)", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_K0SHSource, + "K0SHSource", + "K0_SH", + "", + "SH from Matthews & Kelly = K0_SH * (OBG0-PP0) + PP0 + DF * " + "(PP-PP0)\nK0_SH = " + "(SH - PP)/(OBG-PP)", + "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_FGShaleSource, "FGShaleSource", "FG in Shale Calculation", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_K0FGSource, - "K0FGSource", - "K0_FG", - "", - "FG in shale = K0_FG * (OBG0-PP0)\nK0_FG = (FG-PP)/(OBG-PP)", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_FGShaleSource, "FGShaleSource", "FG in Shale Calculation", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_K0FGSource, + "K0FGSource", + "K0_FG", + "", + "FG in shale = K0_FG * (OBG0-PP0)\nK0_FG = (FG-PP)/(OBG-PP)", + "" ); CAF_PDM_InitFieldNoDefault( &m_waterDensitySource, "WaterDensitySource", "Water Density", "", "", "" ); m_waterDensitySource.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedPoissionRatio, - "UserPoissonRatio", - 0.35, - "User Defined Poisson Ratio", - "", - "User Defined Poisson Ratio", - "" ); + CAF_PDM_InitScriptableField( &m_userDefinedPoissionRatio, + "UserPoissonRatio", + 0.35, + "User Defined Poisson Ratio", + "", + "User Defined Poisson Ratio", + "" ); // Typical UCS: http://ceae.colorado.edu/~amadei/CVEN5768/PDF/NOTES8.pdf // Typical UCS for Shale is 5 - 100 MPa -> 50 - 1000 bar. - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedUcs, - "UserUcs", - 100.0, - "User Defined UCS [bar]", - "", - "User Defined UCS [bar]", - "" ); + CAF_PDM_InitScriptableField( &m_userDefinedUcs, "UserUcs", 100.0, "User Defined UCS [bar]", "", "User Defined UCS [bar]", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedDF, "UserDF", 0.7, "User Defined DF", "", "User Defined Depletion Factor", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedK0FG, "UserK0FG", 0.75, "User Defined K0_FG", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedK0SH, "UserK0SH", 0.65, "User Defined K0_SH", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_FGShaleMultiplier, - "FGMultiplier", - 1.05, - "SH Multiplier for FG in Shale", - "", - "FG in Shale = Multiplier * SH", - "" ); + CAF_PDM_InitScriptableField( &m_userDefinedDF, "UserDF", 0.7, "User Defined DF", "", "User Defined Depletion Factor", "" ); + CAF_PDM_InitScriptableField( &m_userDefinedK0FG, "UserK0FG", 0.75, "User Defined K0_FG", "", "", "" ); + CAF_PDM_InitScriptableField( &m_userDefinedK0SH, "UserK0SH", 0.65, "User Defined K0_SH", "", "", "" ); + CAF_PDM_InitScriptableField( &m_FGShaleMultiplier, + "FGMultiplier", + 1.05, + "SH Multiplier for FG in Shale", + "", + "FG in Shale = Multiplier * SH", + "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_userDefinedDensity, - "WaterDensity", - 1.03, - "Density of Sea Water [g/cm^3]", - "", - "Units: g/cm^3", - "" ); + CAF_PDM_InitScriptableField( &m_userDefinedDensity, + "WaterDensity", + 1.03, + "Density of Sea Water [g/cm^3]", + "", + "Units: g/cm^3", + "" ); CAF_PDM_InitFieldNoDefault( &m_geoMechCase, "GeoMechCase", "GeoMechCase", "", "", "" ); m_geoMechCase.uiCapability()->setUiHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp b/ApplicationCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp index 8e8154224d..3e2f83c43c 100644 --- a/ApplicationCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellBoreStabilityPlot.cpp @@ -31,9 +31,9 @@ #include "RimWellLogFile.h" #include "cafPdmBase.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiGroup.h" @@ -49,13 +49,13 @@ RimWellBoreStabilityPlot::RimWellBoreStabilityPlot() "", "A GeoMechanical Well Bore Stabilit Plot" ); - CAF_PDM_InitScriptableFieldWithKeywordNoDefault( &m_wbsParameters, - "WbsParameters", - "Parameters", - "Well Bore Stability Parameters", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( &m_wbsParameters, + "WbsParameters", + "Parameters", + "Well Bore Stability Parameters", + "", + "", + "" ); m_wbsParameters = new RimWbsParameters; m_wbsParameters.uiCapability()->setUiTreeHidden( true ); m_wbsParameters.uiCapability()->setUiTreeChildrenHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp index 5d34839133..b1105d0275 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp @@ -36,8 +36,8 @@ #include "RiuQwtPlotWidget.h" #include "RiuWellLogPlot.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiDoubleValueEditor.h" #include "cvfAssert.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp index dc0c581575..4dee7f20f1 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp @@ -50,7 +50,7 @@ #include "RiuMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiTreeOrdering.h" #include "cafUtils.h" @@ -76,7 +76,7 @@ RimWellPath::RimWellPath() { CAF_PDM_InitScriptableObjectWithNameAndComment( "WellPath", ":/Well.png", "", "", "WellPath", "The Base class for Well Paths" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_name, "Name", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_name, "Name", "Name", "", "", "" ); m_name.registerKeywordAlias( "WellPathName" ); m_name.uiCapability()->setUiReadOnly( true ); m_name.uiCapability()->setUiHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp index 7dfa139edf..34628df353 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp @@ -27,8 +27,8 @@ #include "RimTools.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" #include #include @@ -46,7 +46,7 @@ CAF_PDM_SOURCE_INIT( RimFileSummaryCase, "FileSummaryCase" ); RimFileSummaryCase::RimFileSummaryCase() { CAF_PDM_InitScriptableObject( "File Summary Case ", ":/SummaryCases16x16.png", "", "A Summary Case based on SMSPEC files" ); - CAF_PDM_InitScriptableFieldWithIO( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); + CAF_PDM_InitScriptableField( &m_includeRestartFiles, "IncludeRestartFiles", false, "Include Restart Files", "", "", "" ); m_includeRestartFiles.uiCapability()->setUiHidden( true ); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp index 0eae875b75..c6c44645a0 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp @@ -25,7 +25,7 @@ #include "RimFileSummaryCase.h" #include "RimProject.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" #include diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp index 28ca46cded..e1fb8796b3 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -32,7 +32,7 @@ #include "RimSummaryCaseMainCollection.h" #include "RimSummaryPlotCollection.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cvfAssert.h" @@ -49,21 +49,16 @@ RimSummaryCase::RimSummaryCase() { CAF_PDM_InitScriptableObject( "Summary Case", ":/SummaryCase16x16.png", "", "The Base Class for all Summary Cases" ); - CAF_PDM_InitScriptableFieldWithIO( &m_shortName, "ShortName", QString( "Display Name" ), DEFAULT_DISPLAY_NAME, "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_useAutoShortName, "AutoShortyName", false, "Use Auto Display Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_shortName, "ShortName", QString( "Display Name" ), DEFAULT_DISPLAY_NAME, "", "", "" ); + CAF_PDM_InitScriptableField( &m_useAutoShortName, "AutoShortyName", false, "Use Auto Display Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_summaryHeaderFilename, - "SummaryHeaderFilename", - "Summary Header File", - "", - "", - "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_summaryHeaderFilename, "SummaryHeaderFilename", "Summary Header File", "", "", "" ); m_summaryHeaderFilename.uiCapability()->setUiReadOnly( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_caseId, "Id", -1, "Case ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_caseId, "Id", -1, "Case ID", "", "", "" ); m_caseId.registerKeywordAlias( "CaseId" ); m_caseId.uiCapability()->setUiReadOnly( true ); - m_caseId.capability()->setIOWriteable( false ); + m_caseId.capability()->setIOWriteable( false ); m_isObservedData = false; } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index f56c429960..511fd14df5 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -32,7 +32,7 @@ #include "RifReaderEnsembleStatisticsRft.h" #include "RifSummaryReaderInterface.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include #include @@ -190,19 +190,19 @@ RimSummaryCaseCollection::RimSummaryCaseCollection() CAF_PDM_InitFieldNoDefault( &m_cases, "SummaryCases", "", "", "", "" ); m_cases.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_name, "SummaryCollectionName", QString( "Group" ), "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_name, "SummaryCollectionName", QString( "Group" ), "Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_nameAndItemCount, "NameCount", "Name", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_nameAndItemCount, "NameCount", "Name", "", "", "" ); m_nameAndItemCount.registerGetMethod( this, &RimSummaryCaseCollection::nameAndItemCount ); RiaFieldhandleTools::disableWriteAndSetFieldHidden( &m_nameAndItemCount ); - CAF_PDM_InitScriptableFieldWithIO( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "" ); + CAF_PDM_InitScriptableField( &m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "" ); m_isEnsemble.uiCapability()->setUiHidden( true ); - CAF_PDM_InitScriptableFieldWithIO( &m_ensembleId, "Id", -1, "Ensemble ID", "", "", "" ); + CAF_PDM_InitScriptableField( &m_ensembleId, "Id", -1, "Ensemble ID", "", "", "" ); m_ensembleId.registerKeywordAlias( "EnsembleId" ); m_ensembleId.uiCapability()->setUiReadOnly( true ); - m_ensembleId.capability()->setIOWriteable( false ); + m_ensembleId.capability()->setIOWriteable( false ); m_statisticsEclipseRftReader = new RifReaderEnsembleStatisticsRft( this ); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index da7ac3bb95..e52e485fb6 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -53,7 +53,7 @@ #include "cvfColor3.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmUiCheckBoxEditor.h" #include "cafPdmUiTreeOrdering.h" #include "cafSelectionManager.h" @@ -146,20 +146,14 @@ RimSummaryPlot::RimSummaryPlot() { CAF_PDM_InitScriptableObject( "Summary Plot", ":/SummaryPlotLight16x16.png", "", "A Summary Plot" ); - CAF_PDM_InitScriptableFieldWithIO( &m_showPlotTitle, "ShowPlotTitle", true, "Plot Title", "", "", "" ); + CAF_PDM_InitScriptableField( &m_showPlotTitle, "ShowPlotTitle", true, "Plot Title", "", "", "" ); m_showPlotTitle.xmlCapability()->setIOWritable( false ); - CAF_PDM_InitScriptableFieldWithIO( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto Title", "", "", "" ); + CAF_PDM_InitScriptableField( &m_useAutoPlotTitle, "IsUsingAutoName", true, "Auto Title", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name", "", "", "" ); + CAF_PDM_InitScriptableField( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_normalizeCurveYValues, - "normalizeCurveYValues", - false, - "Normalize all curves", - "", - "", - "" ); + CAF_PDM_InitScriptableField( &m_normalizeCurveYValues, "normalizeCurveYValues", false, "Normalize all curves", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "", "", "", "" ); m_summaryCurveCollection.uiCapability()->setUiTreeHidden( true ); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp index 33c1aeb802..99d8fb0f27 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp @@ -24,8 +24,8 @@ #include "RimProject.h" #include "RimSummaryPlot.h" -#include "cafPdmFieldScriptability.h" -#include "cafPdmObjectScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" +#include "cafPdmObjectScriptingCapability.h" CAF_PDM_SOURCE_INIT( RimSummaryPlotCollection, "SummaryPlotCollection" ); diff --git a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp index 692358731c..af38543062 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerDouble.cpp @@ -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", "", "", "" ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp index f4a14b616d..5910d6103f 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerString.cpp @@ -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", "", "", "" ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp index 8c9c6b0dce..877aec9978 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcDataContainerTime.cpp @@ -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", "", "", "" ); } diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp index 49471cc92f..26c541d974 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelCollection.cpp @@ -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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp index 7a7f9db0b7..5f14b7a17d 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlot.cpp @@ -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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp index 2392821ad9..5f57ce5803 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcFractureModelPlotCollection.cpp @@ -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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp b/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp index faeef65f3e..0aa903c123 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp @@ -25,7 +25,7 @@ #include "RimSummaryCase.h" #include "RiuPlotMainWindow.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -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", "", "", "", "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp b/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp index 842055abb4..641fb9bfd7 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp @@ -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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp index f117f46945..9b063a71c0 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp @@ -25,8 +25,8 @@ #include "RimSummaryPlot.h" #include "RimSummaryPlotCollection.h" -#include "cafPdmFieldIOScriptability.h" -#include "cafPdmFieldScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" +#include "cafPdmFieldScriptingCapability.h" #include @@ -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" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp b/ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp index 107a733053..32db4cc80b 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcSummaryResampleData.cpp @@ -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", "", "", "" ); } diff --git a/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp b/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp index 36966fab07..ced25e6cb3 100644 --- a/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp +++ b/ApplicationCode/UnitTests/RifcCommandCore-Test.cpp @@ -5,7 +5,7 @@ #include "RifcCommandFileReader.h" #include "cafPdmField.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmScriptIOMessages.h" class TestCommand1 : public RicfCommandObject @@ -15,10 +15,10 @@ class TestCommand1 : public RicfCommandObject public: TestCommand1() { - CAF_PDM_InitScriptableFieldWithIO( &m_textArgument, "TextArgument", QString(), "TextArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_doubleArgument, "DoubleArgument", 0.0, "DoubleArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_intArgument, "IntArgument", 0, "IntArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_boolArgument, "BoolArgument", false, "BoolArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_textArgument, "TextArgument", QString(), "TextArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_doubleArgument, "DoubleArgument", 0.0, "DoubleArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_intArgument, "IntArgument", 0, "IntArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_boolArgument, "BoolArgument", false, "BoolArgument", "", "", "" ); } caf::PdmScriptResponse execute() override @@ -44,10 +44,10 @@ class TC2 : public RicfCommandObject public: TC2() { - CAF_PDM_InitScriptableFieldWithIO( &m_textArgument, "ta", QString(), "TextArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_doubleArgument, "da", 0.0, "DoubleArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_intArgument, "ia", 0, "IntArgument", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIO( &m_boolArgument, "ba", false, "BoolArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_textArgument, "ta", QString(), "TextArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_doubleArgument, "da", 0.0, "DoubleArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_intArgument, "ia", 0, "IntArgument", "", "", "" ); + CAF_PDM_InitScriptableField( &m_boolArgument, "ba", false, "BoolArgument", "", "", "" ); } caf::PdmScriptResponse execute() override diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index 9a7851fbaf..4c55728997 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -22,8 +22,10 @@ add_library( ${PROJECT_NAME} cafPdmXmlColor3f.cpp cafPdmXmlColor3f.h cafPdmFieldCvfColor.h - cafPdmFieldIOScriptabilityCvfColor3.h - cafPdmFieldIOScriptabilityCvfColor3.cpp + cafPdmFieldScriptingCapabilityCvfColor3.h + cafPdmFieldScriptingCapabilityCvfColor3.cpp + cafPdmFieldScriptingCapabilityCvfVec3d.h + cafPdmFieldScriptingCapabilityCvfVec3d.cpp cafPdmCoreVec3d.h cafPdmUiCoreVec3d.cpp diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.cpp b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.cpp similarity index 74% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.cpp rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.cpp index e93c6befda..cdaccbf903 100644 --- a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.cpp +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.cpp @@ -33,7 +33,7 @@ // for more details. // //################################################################################################## -#include "cafPdmFieldIOScriptabilityCvfColor3.h" +#include "cafPdmFieldScriptingCapabilityCvfColor3.h" #include @@ -42,16 +42,16 @@ using namespace caf; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::writeToField( cvf::Color3f& fieldValue, - QTextStream& inputStream, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted ) +void PdmFieldScriptingCapabilityIOHandler::writeToField( cvf::Color3f& fieldValue, + QTextStream& inputStream, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted ) { QString fieldStringValue; - PdmFieldScriptabilityIOHandler::writeToField( fieldStringValue, - inputStream, - errorMessageContainer, - stringsAreQuoted ); + PdmFieldScriptingCapabilityIOHandler::writeToField( fieldStringValue, + inputStream, + errorMessageContainer, + stringsAreQuoted ); QColor qColor( fieldStringValue ); if ( qColor.isValid() ) @@ -63,12 +63,12 @@ void PdmFieldScriptabilityIOHandler::writeToField( cvf::Color3f& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::readFromField( const cvf::Color3f& fieldValue, - QTextStream& outputStream, - bool quoteStrings, - bool quoteNonBuiltin ) +void PdmFieldScriptingCapabilityIOHandler::readFromField( const cvf::Color3f& fieldValue, + QTextStream& outputStream, + bool quoteStrings, + bool quoteNonBuiltin ) { QColor qColor( fieldValue.rByte(), fieldValue.gByte(), fieldValue.bByte() ); QString fieldStringValue = qColor.name(); - PdmFieldScriptabilityIOHandler::readFromField( fieldStringValue, outputStream, quoteStrings ); + PdmFieldScriptingCapabilityIOHandler::readFromField( fieldStringValue, outputStream, quoteStrings ); } diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.h b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h similarity index 95% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.h rename to Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h index 0a224785cd..9d23b301ae 100644 --- a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldIOScriptabilityCvfColor3.h +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h @@ -33,14 +33,14 @@ // for more details. // //################################################################################################## -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cvfColor3.h" namespace caf { template <> -struct PdmFieldScriptabilityIOHandler +struct PdmFieldScriptingCapabilityIOHandler { static void writeToField( cvf::Color3f& fieldValue, QTextStream& inputStream, diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp new file mode 100644 index 0000000000..4f48278d4e --- /dev/null +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp @@ -0,0 +1,82 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) Ceetron Solutions AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## +#include "cafPdmFieldScriptingCapabilityCvfVec3d.h" + +using namespace caf; + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmFieldScriptingCapabilityIOHandler::writeToField( cvf::Vec3d& fieldValue, + QTextStream& inputStream, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted ) +{ + std::vector fieldVectorValue; + PdmFieldScriptingCapabilityIOHandler>::writeToField( fieldVectorValue, + inputStream, + errorMessageContainer, + stringsAreQuoted ); + if ( fieldVectorValue.size() == 3u ) + { + for ( int i = 0; i < 3; ++i ) + { + fieldValue[i] = fieldVectorValue[i]; + } + } + else + { + QString errMsg = QString( "Expected three dimensions in the vector, got %1" ).arg( fieldVectorValue.size() ); + errorMessageContainer->addError( errMsg ); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmFieldScriptingCapabilityIOHandler::readFromField( const cvf::Vec3d& fieldValue, + QTextStream& outputStream, + bool quoteStrings, + bool quoteNonBuiltin ) +{ + std::vector fieldVectorValue( 3u ); + for ( int i = 0; i < 3; ++i ) + { + fieldVectorValue[i] = fieldValue[i]; + } + + PdmFieldScriptingCapabilityIOHandler>::readFromField( fieldVectorValue, outputStream, quoteStrings ); +} diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h new file mode 100644 index 0000000000..ab65d97313 --- /dev/null +++ b/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h @@ -0,0 +1,54 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) Ceetron Solutions AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## +#include "cafPdmFieldScriptingCapability.h" + +#include "cvfVector3.h" + +namespace caf +{ +template <> +struct PdmFieldScriptingCapabilityIOHandler +{ + static void writeToField( cvf::Vec3d& fieldValue, + QTextStream& inputStream, + PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted = true ); + static void readFromField( const cvf::Vec3d& fieldValue, + QTextStream& outputStream, + bool quoteStrings = true, + bool quoteNonBuiltins = false ); +}; +} // namespace caf \ No newline at end of file diff --git a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt index 14e3c4a54e..b334d17772 100644 --- a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt @@ -4,20 +4,20 @@ project (cafPdmScripting) set( PROJECT_FILES cafPdmCodeGenerator.h - cafPdmFieldScriptability.h - cafPdmFieldScriptability.cpp - cafPdmFieldIOScriptability.h - cafPdmFieldIOScriptability.cpp - cafPdmObjectMethod.h - cafPdmObjectMethod.cpp - cafPdmObjectScriptabilityRegister.h - cafPdmObjectScriptabilityRegister.cpp + cafPdmAbstractFieldScriptingCapability.h + cafPdmAbstractFieldScriptingCapability.cpp + cafPdmFieldScriptingCapability.h + cafPdmFieldScriptingCapability.cpp + cafPdmObjectMethod.h + cafPdmObjectMethod.cpp + cafPdmObjectScriptingCapabilityRegister.h + cafPdmObjectScriptingCapabilityRegister.cpp cafPdmPythonGenerator.h cafPdmPythonGenerator.cpp cafPdmScriptIOMessages.h cafPdmScriptIOMessages.cpp - cafPdmObjectScriptability.h - cafPdmObjectScriptability.cpp + cafPdmObjectScriptingCapability.h + cafPdmObjectScriptingCapability.cpp cafPdmScriptResponse.h cafPdmScriptResponse.cpp cafPdmMarkdownGenerator.h diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.cpp similarity index 61% rename from Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.cpp rename to Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.cpp index 1f497ba364..9d3a61c354 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.cpp @@ -33,7 +33,7 @@ // for more details. // //################################################################################################## -#include "cafPdmFieldScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmFieldHandle.h" #include "cafPdmPythonGenerator.h" @@ -43,7 +43,9 @@ using namespace caf; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -PdmFieldScriptability::PdmFieldScriptability( caf::PdmFieldHandle* owner, const QString& scriptFieldName, bool giveOwnership ) +PdmAbstractFieldScriptingCapability::PdmAbstractFieldScriptingCapability( caf::PdmFieldHandle* owner, + const QString& scriptFieldName, + bool giveOwnership ) { m_IOWriteable = true; m_owner = owner; @@ -54,14 +56,14 @@ PdmFieldScriptability::PdmFieldScriptability( caf::PdmFieldHandle* owner, const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -PdmFieldScriptability::~PdmFieldScriptability() +PdmAbstractFieldScriptingCapability::~PdmAbstractFieldScriptingCapability() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const QString PdmFieldScriptability::scriptFieldName() const +const QString PdmAbstractFieldScriptingCapability::scriptFieldName() const { return m_scriptFieldName; } @@ -69,7 +71,7 @@ const QString PdmFieldScriptability::scriptFieldName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool PdmFieldScriptability::isIOWriteable() const +bool PdmAbstractFieldScriptingCapability::isIOWriteable() const { return m_IOWriteable; } @@ -77,46 +79,15 @@ bool PdmFieldScriptability::isIOWriteable() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptability::setIOWriteable( bool writeable ) +void PdmAbstractFieldScriptingCapability::setIOWriteable( bool writeable ) { m_IOWriteable = writeable; } -//-------------------------------------------------------------------------------------------------- -/// Empty default implementation that doesn't offer any script IO for the field -//-------------------------------------------------------------------------------------------------- -void PdmFieldScriptability::readFromField( QTextStream& outputStream, - bool quoteStrings /*= true*/, - bool quoteNonBuiltins /*= false*/ ) const -{ -} - -//-------------------------------------------------------------------------------------------------- -/// Empty default implementation that doesn't offer any script IO for the field -//-------------------------------------------------------------------------------------------------- -void PdmFieldScriptability::writeToField( QTextStream& inputStream, - caf::PdmObjectFactory* objectFactory, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted /*= true*/, - caf::PdmObjectHandle* existingObjectsRoot /*= nullptr*/ ) -{ -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptability::addToField( caf::PdmFieldHandle* field, const QString& fieldName ) -{ - if ( field->template capability() == nullptr ) - { - new PdmFieldScriptability( field, fieldName, true ); - } -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString PdmFieldScriptability::helpString( const QString& existingTooltip, const QString& keyword ) +QString PdmAbstractFieldScriptingCapability::helpString( const QString& existingTooltip, const QString& keyword ) { QString snake_case = caf::PdmPythonGenerator::camelToSnakeCase( keyword ); diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.h new file mode 100644 index 0000000000..0207c460cd --- /dev/null +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmAbstractFieldScriptingCapability.h @@ -0,0 +1,77 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) Ceetron Solutions AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## +#pragma once + +#include "cafPdmFieldCapability.h" +#include + +class QTextStream; + +namespace caf +{ +class PdmFieldHandle; +class PdmObjectFactory; +class PdmObjectHandle; +class PdmScriptIOMessages; + +class PdmAbstractFieldScriptingCapability : public PdmFieldCapability +{ +public: + PdmAbstractFieldScriptingCapability( caf::PdmFieldHandle* owner, const QString& scriptFieldName, bool giveOwnership ); + virtual ~PdmAbstractFieldScriptingCapability(); + + const QString scriptFieldName() const; + + bool isIOWriteable() const; + void setIOWriteable( bool writeable ); + + virtual void + readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const = 0; + virtual void writeToField( QTextStream& inputStream, + caf::PdmObjectFactory* objectFactory, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted = true, + caf::PdmObjectHandle* existingObjectsRoot = nullptr ) = 0; + + static QString helpString( const QString& existingTooltip, const QString& keyword ); + +protected: + PdmFieldHandle* m_owner; + QString m_scriptFieldName; + bool m_IOWriteable; +}; + +} // namespace caf diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.h deleted file mode 100644 index 5511f2395e..0000000000 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptability.h +++ /dev/null @@ -1,115 +0,0 @@ -//################################################################################################## -// -// Custom Visualization Core library -// Copyright (C) Ceetron Solutions AS -// -// This library may be used under the terms of either the GNU General Public License or -// the GNU Lesser General Public License as follows: -// -// GNU General Public License Usage -// This library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at <> -// for more details. -// -// GNU Lesser General Public License Usage -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation; either version 2.1 of the License, or -// (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU Lesser General Public License at <> -// for more details. -// -//################################################################################################## -#pragma once - -#include "cafPdmFieldCapability.h" -#include - -class QTextStream; - -namespace caf -{ -class PdmFieldHandle; -class PdmObjectFactory; -class PdmObjectHandle; -class PdmScriptIOMessages; - -#define CAF_PDM_InitScriptableField( field, keyword, default, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitField( field, \ - keyword, \ - default, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, keyword ), \ - whatsThis ); \ - caf::PdmFieldScriptability::addToField( field, keyword ) - -#define CAF_PDM_InitScriptableFieldNoDefault( field, keyword, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitFieldNoDefault( field, \ - keyword, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, keyword ), \ - whatsThis ); \ - caf::PdmFieldScriptability::addToField( field, keyword ) - -#define CAF_PDM_InitScriptableFieldWithKeyword( field, keyword, scriptKeyword, default, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitField( field, \ - keyword, \ - default, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, scriptKeyword ), \ - whatsThis ); \ - caf::PdmFieldScriptability::addToField( field, scriptKeyword ) - -#define CAF_PDM_InitScriptableFieldWithKeywordNoDefault( field, keyword, scriptKeyword, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitFieldNoDefault( field, \ - keyword, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, scriptKeyword ), \ - whatsThis ); \ - caf::PdmFieldScriptability::addToField( field, scriptKeyword ) - -class PdmFieldScriptability : public PdmFieldCapability -{ -public: - PdmFieldScriptability( caf::PdmFieldHandle* owner, const QString& scriptFieldName, bool giveOwnership ); - virtual ~PdmFieldScriptability(); - - const QString scriptFieldName() const; - - bool isIOWriteable() const; - void setIOWriteable( bool writeable ); - - virtual void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const; - virtual void writeToField( QTextStream& inputStream, - caf::PdmObjectFactory* objectFactory, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted = true, - caf::PdmObjectHandle* existingObjectsRoot = nullptr ); - - static void addToField( caf::PdmFieldHandle* field, const QString& fieldName ); - static QString helpString( const QString& existingTooltip, const QString& keyword ); - -protected: - PdmFieldHandle* m_owner; - QString m_scriptFieldName; - bool m_IOWriteable; -}; - -} // namespace caf diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.cpp similarity index 79% rename from Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.cpp rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.cpp index 31a5eb258f..92b23bc232 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.cpp @@ -33,17 +33,17 @@ // for more details. // //################################################################################################## -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" using namespace caf; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::writeToField( QString& fieldValue, - QTextStream& inputStream, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted ) +void PdmFieldScriptingCapabilityIOHandler::writeToField( QString& fieldValue, + QTextStream& inputStream, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted ) { fieldValue = ""; @@ -116,10 +116,10 @@ void PdmFieldScriptabilityIOHandler::writeToField( QString& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::readFromField( const QString& fieldValue, - QTextStream& outputStream, - bool quoteStrings, - bool quoteNonBuiltin ) +void PdmFieldScriptingCapabilityIOHandler::readFromField( const QString& fieldValue, + QTextStream& outputStream, + bool quoteStrings, + bool quoteNonBuiltin ) { outputStream << "\""; for ( int i = 0; i < fieldValue.size(); ++i ) @@ -136,10 +136,10 @@ void PdmFieldScriptabilityIOHandler::readFromField( const QString& fiel //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::writeToField( bool& fieldValue, - QTextStream& inputStream, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted ) +void PdmFieldScriptingCapabilityIOHandler::writeToField( bool& fieldValue, + QTextStream& inputStream, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted ) { errorMessageContainer->skipWhiteSpaceWithLineNumberCount( inputStream ); QString accumulatedFieldValue; @@ -175,10 +175,10 @@ void PdmFieldScriptabilityIOHandler::writeToField( bool& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptabilityIOHandler::readFromField( const bool& fieldValue, - QTextStream& outputStream, - bool quoteStrings, - bool quoteNonBuiltin ) +void PdmFieldScriptingCapabilityIOHandler::readFromField( const bool& fieldValue, + QTextStream& outputStream, + bool quoteStrings, + bool quoteNonBuiltin ) { // Lower-case true/false is used in the documentation. outputStream << ( fieldValue ? "true" : "false" ); diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h similarity index 60% rename from Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.h rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h index 75474b74ab..a260aa8722 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldIOScriptability.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h @@ -36,7 +36,9 @@ #pragma once #include "cafAppEnum.h" -#include "cafPdmFieldScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" +#include "cafPdmChildArrayField.h" +#include "cafPdmChildField.h" #include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include "cafPdmScriptIOMessages.h" @@ -45,61 +47,61 @@ #include #include -#define CAF_PDM_InitScriptableFieldWithIO( field, keyword, default, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitField( field, \ - keyword, \ - default, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, keyword ), \ - whatsThis ); \ - caf::AddFieldIOScriptabilityToField( field, keyword ) +#define CAF_PDM_InitScriptableField( field, keyword, default, uiName, iconResourceName, toolTip, whatsThis ) \ + CAF_PDM_InitField( field, \ + keyword, \ + default, \ + uiName, \ + iconResourceName, \ + caf::PdmAbstractFieldScriptingCapability::helpString( toolTip, keyword ), \ + whatsThis ); \ + caf::AddScriptingCapabilityToField( field, keyword ) -#define CAF_PDM_InitScriptableFieldWithIONoDefault( field, keyword, uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitFieldNoDefault( field, \ - keyword, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, keyword ), \ - whatsThis ); \ - caf::AddFieldIOScriptabilityToField( field, keyword ) +#define CAF_PDM_InitScriptableFieldNoDefault( field, keyword, uiName, iconResourceName, toolTip, whatsThis ) \ + CAF_PDM_InitFieldNoDefault( field, \ + keyword, \ + uiName, \ + iconResourceName, \ + caf::PdmAbstractFieldScriptingCapability::helpString( toolTip, keyword ), \ + whatsThis ); \ + caf::AddScriptingCapabilityToField( field, keyword ) -#define CAF_PDM_InitScriptableFieldWithIOAndScriptName( field, \ - keyword, \ - scriptKeyword, \ - default, \ - uiName, \ - iconResourceName, \ - toolTip, \ - whatsThis ) \ - CAF_PDM_InitField( field, \ - keyword, \ - default, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, scriptKeyword ), \ - whatsThis ); \ - caf::AddFieldIOScriptabilityToField( field, scriptKeyword ) +#define CAF_PDM_InitScriptableFieldWithScriptKeyword( field, \ + keyword, \ + scriptKeyword, \ + default, \ + uiName, \ + iconResourceName, \ + toolTip, \ + whatsThis ) \ + CAF_PDM_InitField( field, \ + keyword, \ + default, \ + uiName, \ + iconResourceName, \ + caf::PdmAbstractFieldScriptingCapability::helpString( toolTip, scriptKeyword ), \ + whatsThis ); \ + caf::AddScriptingCapabilityToField( field, scriptKeyword ) -#define CAF_PDM_InitScriptableFieldWithIOAndScriptNameNoDefault( field, \ - keyword, \ - scriptKeyword, \ - uiName, \ - iconResourceName, \ - toolTip, \ - whatsThis ) \ - CAF_PDM_InitFieldNoDefault( field, \ - keyword, \ - uiName, \ - iconResourceName, \ - caf::PdmFieldScriptability::helpString( toolTip, scriptKeyword ), \ - whatsThis ); \ - caf::AddFieldIOScriptabilityToField( field, scriptKeyword ) +#define CAF_PDM_InitScriptableFieldWithScriptKeywordNoDefault( field, \ + keyword, \ + scriptKeyword, \ + uiName, \ + iconResourceName, \ + toolTip, \ + whatsThis ) \ + CAF_PDM_InitFieldNoDefault( field, \ + keyword, \ + uiName, \ + iconResourceName, \ + caf::PdmAbstractFieldScriptingCapability::helpString( toolTip, scriptKeyword ), \ + whatsThis ); \ + caf::AddScriptingCapabilityToField( field, scriptKeyword ) namespace caf { template -struct PdmFieldScriptabilityIOHandler +struct PdmFieldScriptingCapabilityIOHandler { static void writeToField( DataType& fieldValue, QTextStream& inputStream, @@ -127,7 +129,7 @@ struct PdmFieldScriptabilityIOHandler }; template <> -struct PdmFieldScriptabilityIOHandler +struct PdmFieldScriptingCapabilityIOHandler { static void writeToField( QString& fieldValue, QTextStream& inputStream, @@ -140,7 +142,7 @@ struct PdmFieldScriptabilityIOHandler }; template <> -struct PdmFieldScriptabilityIOHandler +struct PdmFieldScriptingCapabilityIOHandler { static void writeToField( bool& fieldValue, QTextStream& inputStream, @@ -153,7 +155,7 @@ struct PdmFieldScriptabilityIOHandler }; template -struct PdmFieldScriptabilityIOHandler> +struct PdmFieldScriptingCapabilityIOHandler> { static void writeToField( AppEnum& fieldValue, QTextStream& inputStream, @@ -204,7 +206,7 @@ struct PdmFieldScriptabilityIOHandler> }; template -struct PdmFieldScriptabilityIOHandler> +struct PdmFieldScriptingCapabilityIOHandler> { static void writeToField( std::vector& fieldValue, QTextStream& inputStream, @@ -231,7 +233,7 @@ struct PdmFieldScriptabilityIOHandler> } T value; - PdmFieldScriptabilityIOHandler::writeToField( value, inputStream, errorMessageContainer, true ); + PdmFieldScriptingCapabilityIOHandler::writeToField( value, inputStream, errorMessageContainer, true ); fieldValue.push_back( value ); } } @@ -251,7 +253,7 @@ struct PdmFieldScriptabilityIOHandler> outputStream << "["; for ( size_t i = 0; i < fieldValue.size(); ++i ) { - PdmFieldScriptabilityIOHandler::readFromField( fieldValue[i], outputStream, quoteNonBuiltins ); + PdmFieldScriptingCapabilityIOHandler::readFromField( fieldValue[i], outputStream, quoteNonBuiltins ); if ( i < fieldValue.size() - 1 ) { outputStream << ", "; @@ -262,7 +264,7 @@ struct PdmFieldScriptabilityIOHandler> }; template -struct PdmFieldScriptabilityIOHandler> +struct PdmFieldScriptingCapabilityIOHandler> { static void writeToField( std::vector& fieldValue, const std::vector& allObjectsOfType, @@ -289,7 +291,10 @@ struct PdmFieldScriptabilityIOHandler> } T* value; - PdmFieldScriptabilityIOHandler::writeToField( value, allObjectsOfType, inputStream, errorMessageContainer ); + PdmFieldScriptingCapabilityIOHandler::writeToField( value, + allObjectsOfType, + inputStream, + errorMessageContainer ); fieldValue.push_back( value ); } } @@ -309,7 +314,7 @@ struct PdmFieldScriptabilityIOHandler> outputStream << "["; for ( size_t i = 0; i < fieldValue.size(); ++i ) { - PdmFieldScriptabilityIOHandler::readFromField( fieldValue[i], outputStream, quoteNonBuiltins ); + PdmFieldScriptingCapabilityIOHandler::readFromField( fieldValue[i], outputStream, quoteNonBuiltins ); if ( i < fieldValue.size() - 1 ) { outputStream << ", "; @@ -320,7 +325,7 @@ struct PdmFieldScriptabilityIOHandler> }; template -struct PdmFieldScriptabilityIOHandler +struct PdmFieldScriptingCapabilityIOHandler { static void writeToField( DataType*& fieldValue, const std::vector& allObjectsOfType, @@ -331,10 +336,10 @@ struct PdmFieldScriptabilityIOHandler QString fieldString; bool stringsAreQuoted = false; - PdmFieldScriptabilityIOHandler::writeToField( fieldString, - inputStream, - errorMessageContainer, - stringsAreQuoted ); + PdmFieldScriptingCapabilityIOHandler::writeToField( fieldString, + inputStream, + errorMessageContainer, + stringsAreQuoted ); if ( inputStream.status() == QTextStream::ReadCorruptData ) { @@ -367,8 +372,19 @@ struct PdmFieldScriptabilityIOHandler bool quoteStrings = true, bool quoteNonBuiltins = false ) { - outputStream - << QString( "%1:%2" ).arg( DataType::classKeywordStatic() ).arg( reinterpret_cast( fieldValue ) ); + if ( fieldValue ) + { + QString textOutput = + QString( "%1:%2" ).arg( DataType::classKeywordStatic() ).arg( reinterpret_cast( fieldValue ) ); + if ( quoteNonBuiltins ) + { + outputStream << QString( "\"%1\"" ).arg( textOutput ); + } + else + { + outputStream << textOutput; + } + } } }; @@ -378,11 +394,11 @@ struct PdmFieldScriptabilityIOHandler // //================================================================================================== template -class PdmFieldIOScriptability : public PdmFieldScriptability +class PdmFieldScriptingCapability : public PdmAbstractFieldScriptingCapability { public: - PdmFieldIOScriptability( FieldType* field, const QString& fieldName, bool giveOwnership ) - : PdmFieldScriptability( field, fieldName, giveOwnership ) + PdmFieldScriptingCapability( FieldType* field, const QString& fieldName, bool giveOwnership ) + : PdmAbstractFieldScriptingCapability( field, fieldName, giveOwnership ) { m_field = field; } @@ -396,10 +412,10 @@ public: caf::PdmObjectHandle* existingObjectsRoot = nullptr ) override { typename FieldType::FieldDataType value; - PdmFieldScriptabilityIOHandler::writeToField( value, - inputStream, - errorMessageContainer, - stringsAreQuoted ); + PdmFieldScriptingCapabilityIOHandler::writeToField( value, + inputStream, + errorMessageContainer, + stringsAreQuoted ); if ( this->isIOWriteable() ) { @@ -409,10 +425,10 @@ public: void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override { - PdmFieldScriptabilityIOHandler::readFromField( m_field->value(), - outputStream, - quoteStrings, - quoteNonBuiltins ); + PdmFieldScriptingCapabilityIOHandler::readFromField( m_field->value(), + outputStream, + quoteStrings, + quoteNonBuiltins ); } private: @@ -420,11 +436,11 @@ private: }; template -class PdmFieldIOScriptability> : public PdmFieldScriptability +class PdmFieldScriptingCapability> : public PdmAbstractFieldScriptingCapability { public: - PdmFieldIOScriptability( PdmPtrField* field, const QString& fieldName, bool giveOwnership ) - : PdmFieldScriptability( field, fieldName, giveOwnership ) + PdmFieldScriptingCapability( PdmPtrField* field, const QString& fieldName, bool giveOwnership ) + : PdmAbstractFieldScriptingCapability( field, fieldName, giveOwnership ) { m_field = field; } @@ -441,7 +457,10 @@ public: existingObjectsRoot->descendantsIncludingThisOfType( allObjectsOfType ); DataType* object = nullptr; - PdmFieldScriptabilityIOHandler::writeToField( object, allObjectsOfType, inputStream, errorMessageContainer ); + PdmFieldScriptingCapabilityIOHandler::writeToField( object, + allObjectsOfType, + inputStream, + errorMessageContainer ); if ( object && this->isIOWriteable() ) { @@ -451,10 +470,10 @@ public: void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override { - PdmFieldScriptabilityIOHandler::readFromField( m_field->value(), - outputStream, - quoteStrings, - quoteNonBuiltins ); + PdmFieldScriptingCapabilityIOHandler::readFromField( m_field->value(), + outputStream, + quoteStrings, + quoteNonBuiltins ); } private: @@ -462,11 +481,56 @@ private: }; template -class PdmFieldIOScriptability> : public PdmFieldScriptability +class PdmFieldScriptingCapability> : public PdmAbstractFieldScriptingCapability { public: - PdmFieldIOScriptability( PdmPtrArrayField* field, const QString& fieldName, bool giveOwnership ) - : PdmFieldScriptability( field, fieldName, giveOwnership ) + PdmFieldScriptingCapability( PdmChildField* field, const QString& fieldName, bool giveOwnership ) + : PdmAbstractFieldScriptingCapability( field, fieldName, giveOwnership ) + { + m_field = field; + } + + // Xml Serializing +public: + void writeToField( QTextStream& inputStream, + PdmObjectFactory* objectFactory, + PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted = true, + caf::PdmObjectHandle* existingObjectsRoot = nullptr ) override + { + std::vector allObjectsOfType; + existingObjectsRoot->descendantsIncludingThisOfType( allObjectsOfType ); + + DataType* object = nullptr; + PdmFieldScriptingCapabilityIOHandler::writeToField( object, + allObjectsOfType, + inputStream, + errorMessageContainer ); + + if ( object && this->isIOWriteable() ) + { + m_field->setValue( object ); + } + } + + void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override + { + PdmFieldScriptingCapabilityIOHandler::readFromField( m_field->value(), + outputStream, + quoteStrings, + quoteNonBuiltins ); + } + +private: + PdmChildField* m_field; +}; + +template +class PdmFieldScriptingCapability> : public PdmAbstractFieldScriptingCapability +{ +public: + PdmFieldScriptingCapability( PdmPtrArrayField* field, const QString& fieldName, bool giveOwnership ) + : PdmAbstractFieldScriptingCapability( field, fieldName, giveOwnership ) { m_field = field; } @@ -483,10 +547,10 @@ public: existingObjectsRoot->descendantsIncludingThisOfType( allObjectsOfType ); std::vector objects; - PdmFieldScriptabilityIOHandler>::writeToField( objects, - allObjectsOfType, - inputStream, - errorMessageContainer ); + PdmFieldScriptingCapabilityIOHandler>::writeToField( objects, + allObjectsOfType, + inputStream, + errorMessageContainer ); if ( this->isIOWriteable() ) { @@ -496,22 +560,67 @@ public: void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override { - PdmFieldScriptabilityIOHandler>::readFromField( m_field->ptrReferencedObjects(), - outputStream, - quoteStrings, - quoteNonBuiltins ); + PdmFieldScriptingCapabilityIOHandler>::readFromField( m_field->ptrReferencedObjects(), + outputStream, + quoteStrings, + quoteNonBuiltins ); } private: PdmPtrArrayField* m_field; }; -template -void AddFieldIOScriptabilityToField( FieldType* field, const QString& fieldName ) +template +class PdmFieldScriptingCapability> : public PdmAbstractFieldScriptingCapability { - if ( field->template capability>() == nullptr ) +public: + PdmFieldScriptingCapability( PdmChildArrayField* field, const QString& fieldName, bool giveOwnership ) + : PdmAbstractFieldScriptingCapability( field, fieldName, giveOwnership ) { - new PdmFieldIOScriptability( field, fieldName, true ); + m_field = field; + } + + // Xml Serializing +public: + void writeToField( QTextStream& inputStream, + PdmObjectFactory* objectFactory, + PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted = true, + caf::PdmObjectHandle* existingObjectsRoot = nullptr ) override + { + std::vector allObjectsOfType; + existingObjectsRoot->descendantsIncludingThisOfType( allObjectsOfType ); + + std::vector objects; + PdmFieldScriptingCapabilityIOHandler>::writeToField( objects, + allObjectsOfType, + inputStream, + errorMessageContainer ); + + if ( this->isIOWriteable() ) + { + m_field->setValue( objects ); + } + } + + void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override + { + PdmFieldScriptingCapabilityIOHandler>::readFromField( m_field->childObjects(), + outputStream, + quoteStrings, + quoteNonBuiltins ); + } + +private: + PdmChildArrayField* m_field; +}; + +template +void AddScriptingCapabilityToField( FieldType* field, const QString& fieldName ) +{ + if ( field->template capability>() == nullptr ) + { + new PdmFieldScriptingCapability( field, fieldName, true ); } } diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownBuilder.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownBuilder.cpp index 0cf6e8378d..fde3bb5b83 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownBuilder.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownBuilder.cpp @@ -36,16 +36,17 @@ #include "cafPdmMarkdownBuilder.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" -#include "cafPdmFieldScriptability.h" #include "cafPdmObject.h" #include "cafPdmObjectFactory.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" #include "cafPdmProxyValueField.h" #include "cafPdmPythonGenerator.h" #include "cafPdmXmlFieldHandle.h" + #include #include @@ -99,8 +100,8 @@ QString caf::PdmMarkdownBuilder::generateDocDataModelObjects( std::vector attributesGenerated; @@ -112,7 +113,7 @@ QString caf::PdmMarkdownBuilder::generateDocDataModelObjects( std::vectorfields( fields ); for ( auto field : fields ) { - auto scriptability = field->template capability(); + auto scriptability = field->template capability(); if ( scriptability != nullptr ) { QString snake_field_name = PdmPythonGenerator::camelToSnakeCase( scriptability->scriptFieldName() ); @@ -200,7 +201,7 @@ QString caf::PdmMarkdownBuilder::generateDocDataModelObjects( std::vectorxmlCapability()->isVectorField() ? QString( "List of %1" ).arg( scriptDataType ) @@ -250,7 +251,7 @@ QString caf::PdmMarkdownBuilder::generateDocDataModelObjects( std::vectorclassKeyword() ); + QString comment = caf::PdmObjectScriptingCapabilityRegister::scriptClassComment( object->classKeyword() ); objs.push_back( {snakeCommandName, comment, attributes} ); // objectsAndAttributes[snakeCommandName] = attributes; } diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownGenerator.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownGenerator.cpp index 53243269bf..fec56b0988 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownGenerator.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmMarkdownGenerator.cpp @@ -37,7 +37,7 @@ #include "cafPdmMarkdownGenerator.h" #include "cafPdmMarkdownBuilder.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" using namespace caf; @@ -59,7 +59,7 @@ QString caf::PdmMarkdownGenerator::generate( PdmObjectFactory* factory ) const std::vector> allObjects = caf::PdmMarkdownBuilder::createAllObjects( factory ); for ( auto obj : allObjects ) { - if ( PdmObjectScriptabilityRegister::isScriptable( obj.get() ) ) + if ( PdmObjectScriptingCapabilityRegister::isScriptable( obj.get() ) ) { scriptableObjects.push_back( obj ); } diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h index 3773538a2e..210340ddec 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectMethod.h @@ -93,7 +93,7 @@ protected: } private: - friend class PdmObjectScriptability; + friend class PdmObjectScriptingCapability; PdmPointer m_self; }; diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.cpp index c00726899e..6ba5904102 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.cpp @@ -33,9 +33,9 @@ // for more details. // //################################################################################################## -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" -#include "cafPdmFieldScriptability.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmObjectHandle.h" #include "cafPdmScriptIOMessages.h" @@ -48,7 +48,7 @@ using namespace caf; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -PdmObjectScriptability::PdmObjectScriptability( PdmObjectHandle* owner, bool giveOwnership ) +PdmObjectScriptingCapability::PdmObjectScriptingCapability( PdmObjectHandle* owner, bool giveOwnership ) : m_owner( owner ) { m_owner->addCapability( this, giveOwnership ); @@ -57,16 +57,16 @@ PdmObjectScriptability::PdmObjectScriptability( PdmObjectHandle* owner, bool giv //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -PdmObjectScriptability::~PdmObjectScriptability() +PdmObjectScriptingCapability::~PdmObjectScriptingCapability() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmObjectScriptability::readFields( QTextStream& inputStream, - PdmObjectFactory* objectFactory, - PdmScriptIOMessages* errorMessageContainer ) +void PdmObjectScriptingCapability::readFields( QTextStream& inputStream, + PdmObjectFactory* objectFactory, + PdmScriptIOMessages* errorMessageContainer ) { std::set readFields; bool isLastArgumentRead = false; @@ -147,10 +147,12 @@ void PdmObjectScriptability::readFields( QTextStream& inputStream, // Make field read its data PdmFieldHandle* fieldHandle = m_owner->findField( keyword ); - if ( fieldHandle && fieldHandle->xmlCapability() && fieldHandle->capability() ) + if ( fieldHandle && fieldHandle->xmlCapability() && + fieldHandle->capability() ) { - PdmXmlFieldHandle* xmlFieldHandle = fieldHandle->xmlCapability(); - PdmFieldScriptability* scriptability = fieldHandle->capability(); + PdmXmlFieldHandle* xmlFieldHandle = fieldHandle->xmlCapability(); + PdmAbstractFieldScriptingCapability* scriptability = + fieldHandle->capability(); if ( xmlFieldHandle->isIOReadable() ) { @@ -212,15 +214,16 @@ void PdmObjectScriptability::readFields( QTextStream& inputStream, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmObjectScriptability::writeFields( QTextStream& outputStream ) const +void PdmObjectScriptingCapability::writeFields( QTextStream& outputStream ) const { std::vector fields; m_owner->fields( fields ); int writtenFieldCount = 0; for ( size_t it = 0; it < fields.size(); ++it ) { - const PdmXmlFieldHandle* xmlField = fields[it]->xmlCapability(); - const PdmFieldScriptability* scriptability = fields[it]->capability(); + const PdmXmlFieldHandle* xmlField = fields[it]->xmlCapability(); + const PdmAbstractFieldScriptingCapability* scriptability = + fields[it]->capability(); if ( scriptability && xmlField && xmlField->isIOWritable() ) { QString keyword = xmlField->fieldHandle()->keyword(); diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.cpp new file mode 100644 index 0000000000..6ba5904102 --- /dev/null +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.cpp @@ -0,0 +1,243 @@ +//################################################################################################## +// +// Custom Visualization Core library +// Copyright (C) Ceetron Solutions AS +// +// This library may be used under the terms of either the GNU General Public License or +// the GNU Lesser General Public License as follows: +// +// GNU General Public License Usage +// This library is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at <> +// for more details. +// +// GNU Lesser General Public License Usage +// This library is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU Lesser General Public License at <> +// for more details. +// +//################################################################################################## +#include "cafPdmObjectScriptingCapability.h" + +#include "cafPdmAbstractFieldScriptingCapability.h" +#include "cafPdmObject.h" +#include "cafPdmObjectHandle.h" +#include "cafPdmScriptIOMessages.h" +#include "cafPdmXmlFieldHandle.h" + +#include + +using namespace caf; + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +PdmObjectScriptingCapability::PdmObjectScriptingCapability( PdmObjectHandle* owner, bool giveOwnership ) + : m_owner( owner ) +{ + m_owner->addCapability( this, giveOwnership ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +PdmObjectScriptingCapability::~PdmObjectScriptingCapability() +{ +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmObjectScriptingCapability::readFields( QTextStream& inputStream, + PdmObjectFactory* objectFactory, + PdmScriptIOMessages* errorMessageContainer ) +{ + std::set readFields; + bool isLastArgumentRead = false; + while ( !inputStream.atEnd() && !isLastArgumentRead ) + { + // Read field keyword + bool fieldDataFound = false; + bool isEndOfArgumentFound = false; + QString keyword; + { + errorMessageContainer->skipWhiteSpaceWithLineNumberCount( inputStream ); + { + QChar currentChar; + while ( !inputStream.atEnd() ) + { + currentChar = errorMessageContainer->readCharWithLineNumberCount( inputStream ); + + if ( currentChar == QChar( '=' ) || currentChar == QChar( ')' ) || currentChar == QChar( ',' ) || + currentChar.isSpace() ) + { + break; + } + else + { + keyword += currentChar; + } + } + + if ( currentChar.isSpace() ) + { + errorMessageContainer->skipWhiteSpaceWithLineNumberCount( inputStream ); + currentChar = errorMessageContainer->readCharWithLineNumberCount( inputStream ); + } + + if ( currentChar == QChar( '=' ) ) + { + fieldDataFound = true; + } + else if ( currentChar == QChar( ')' ) ) + { + if ( !keyword.isNull() ) + { + errorMessageContainer->addError( + QString( "Can't find the '=' after the argument named '%1' in the command '%2'" ) + .arg( keyword ) + .arg( errorMessageContainer->currentCommand ) ); + } + isLastArgumentRead = true; + } + else if ( currentChar == QChar( ',' ) ) + { + errorMessageContainer->addError( + QString( "Can't find the '=' after the argument named '%1' in the command '%2'" ) + .arg( keyword ) + .arg( errorMessageContainer->currentCommand ) ); + isEndOfArgumentFound = true; + } + else + { + errorMessageContainer->addError( + QString( "Can't find the '=' after the argument named '%1' in the command '%2'" ) + .arg( keyword ) + .arg( errorMessageContainer->currentCommand ) ); + } + } + + if ( readFields.count( keyword ) ) + { + // Warning message: Referenced the same argument several times + errorMessageContainer->addWarning( "The argument: \"" + keyword + + "\" is referenced several times in the command: \"" + + errorMessageContainer->currentCommand + "\"" ); + } + } + + if ( fieldDataFound ) + { + // Make field read its data + + PdmFieldHandle* fieldHandle = m_owner->findField( keyword ); + if ( fieldHandle && fieldHandle->xmlCapability() && + fieldHandle->capability() ) + { + PdmXmlFieldHandle* xmlFieldHandle = fieldHandle->xmlCapability(); + PdmAbstractFieldScriptingCapability* scriptability = + fieldHandle->capability(); + + if ( xmlFieldHandle->isIOReadable() ) + { + errorMessageContainer->currentArgument = keyword; + scriptability->writeToField( inputStream, objectFactory, errorMessageContainer ); + errorMessageContainer->currentArgument = keyword; + } + } + else + { + // Error message: Unknown argument name + errorMessageContainer->addWarning( "The argument: \"" + keyword + "\" does not exist in the command: \"" + + errorMessageContainer->currentCommand + "\"" ); + } + } + + // Skip to end of argument ',' or end of call ')' + if ( !( isLastArgumentRead || isEndOfArgumentFound ) ) + { + QChar currentChar; + bool isOutsideQuotes = true; + while ( !inputStream.atEnd() ) + { + currentChar = errorMessageContainer->readCharWithLineNumberCount( inputStream ); + if ( isOutsideQuotes ) + { + if ( currentChar == QChar( ',' ) ) + { + break; + } + + if ( currentChar == QChar( ')' ) ) + { + isLastArgumentRead = true; + break; + } + if ( currentChar == QChar( '\"' ) ) + { + isOutsideQuotes = false; + } + } + else + { + if ( currentChar == QChar( '\"' ) ) + { + isOutsideQuotes = true; + } + + if ( currentChar == QChar( '\\' ) ) + { + currentChar = errorMessageContainer->readCharWithLineNumberCount( inputStream ); + } + } + } + } + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmObjectScriptingCapability::writeFields( QTextStream& outputStream ) const +{ + std::vector fields; + m_owner->fields( fields ); + int writtenFieldCount = 0; + for ( size_t it = 0; it < fields.size(); ++it ) + { + const PdmXmlFieldHandle* xmlField = fields[it]->xmlCapability(); + const PdmAbstractFieldScriptingCapability* scriptability = + fields[it]->capability(); + if ( scriptability && xmlField && xmlField->isIOWritable() ) + { + QString keyword = xmlField->fieldHandle()->keyword(); + CAF_ASSERT( PdmXmlObjectHandle::isValidXmlElementName( keyword ) ); + + if ( writtenFieldCount >= 1 ) + { + outputStream << ", "; + } + + outputStream << keyword << " = "; + scriptability->readFromField( outputStream ); + + writtenFieldCount++; + } + } +} diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h similarity index 74% rename from Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.h rename to Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h index 5e652ae990..dcd594766c 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptability.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapability.h @@ -38,7 +38,7 @@ #include "cafPdmChildArrayField.h" #include "cafPdmObjectCapability.h" #include "cafPdmObjectMethod.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" #include @@ -48,13 +48,17 @@ class QTextStream; -#define CAF_PDM_InitScriptableObject( uiName, iconResourceName, toolTip, whatsThis ) \ - CAF_PDM_InitObject( uiName, iconResourceName, toolTip, whatsThis ); \ - caf::PdmObjectScriptabilityRegister::registerScriptClassNameAndComment( classKeyword(), classKeyword(), whatsThis ); +#define CAF_PDM_InitScriptableObject( uiName, iconResourceName, toolTip, whatsThis ) \ + CAF_PDM_InitObject( uiName, iconResourceName, toolTip, whatsThis ); \ + caf::PdmObjectScriptingCapabilityRegister::registerScriptClassNameAndComment( classKeyword(), \ + classKeyword(), \ + whatsThis ); #define CAF_PDM_InitScriptableObjectWithNameAndComment( uiName, iconResourceName, toolTip, whatsThis, scriptClassName, scriptComment ) \ CAF_PDM_InitObject( uiName, iconResourceName, toolTip, whatsThis ); \ - caf::PdmObjectScriptabilityRegister::registerScriptClassNameAndComment( classKeyword(), scriptClassName, scriptComment ); + caf::PdmObjectScriptingCapabilityRegister::registerScriptClassNameAndComment( classKeyword(), \ + scriptClassName, \ + scriptComment ); namespace caf { @@ -68,12 +72,12 @@ class PdmScriptIOMessages; // // //================================================================================================== -class PdmObjectScriptability : public PdmObjectCapability +class PdmObjectScriptingCapability : public PdmObjectCapability { public: - PdmObjectScriptability( PdmObjectHandle* owner, bool giveOwnership ); + PdmObjectScriptingCapability( PdmObjectHandle* owner, bool giveOwnership ); - ~PdmObjectScriptability() override; + ~PdmObjectScriptingCapability() override; void readFields( QTextStream& inputStream, PdmObjectFactory* objectFactory, PdmScriptIOMessages* errorMessageContainer ); void writeFields( QTextStream& outputStream ) const; diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.cpp similarity index 80% rename from Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.cpp rename to Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.cpp index 5206759d5d..c0af5ac044 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.cpp @@ -33,22 +33,22 @@ // for more details. // //################################################################################################## -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" #include "cafPdmObject.h" using namespace caf; -std::map PdmObjectScriptabilityRegister::s_classKeywordToScriptClassName; -std::map PdmObjectScriptabilityRegister::s_scriptClassNameToClassKeyword; -std::map PdmObjectScriptabilityRegister::s_scriptClassComments; +std::map PdmObjectScriptingCapabilityRegister::s_classKeywordToScriptClassName; +std::map PdmObjectScriptingCapabilityRegister::s_scriptClassNameToClassKeyword; +std::map PdmObjectScriptingCapabilityRegister::s_scriptClassComments; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmObjectScriptabilityRegister::registerScriptClassNameAndComment( const QString& classKeyword, - const QString& scriptClassName, - const QString& scriptClassComment ) +void PdmObjectScriptingCapabilityRegister::registerScriptClassNameAndComment( const QString& classKeyword, + const QString& scriptClassName, + const QString& scriptClassComment ) { s_classKeywordToScriptClassName[classKeyword] = scriptClassName; s_scriptClassNameToClassKeyword[scriptClassName] = classKeyword; @@ -58,7 +58,7 @@ void PdmObjectScriptabilityRegister::registerScriptClassNameAndComment( const QS //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString PdmObjectScriptabilityRegister::scriptClassNameFromClassKeyword( const QString& classKeyword ) +QString PdmObjectScriptingCapabilityRegister::scriptClassNameFromClassKeyword( const QString& classKeyword ) { auto it = s_classKeywordToScriptClassName.find( classKeyword ); if ( it != s_classKeywordToScriptClassName.end() ) @@ -71,7 +71,7 @@ QString PdmObjectScriptabilityRegister::scriptClassNameFromClassKeyword( const Q //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( const QString& scriptClassName ) +QString PdmObjectScriptingCapabilityRegister::classKeywordFromScriptClassName( const QString& scriptClassName ) { auto it = s_scriptClassNameToClassKeyword.find( scriptClassName ); if ( it != s_scriptClassNameToClassKeyword.end() ) @@ -84,7 +84,7 @@ QString PdmObjectScriptabilityRegister::classKeywordFromScriptClassName( const Q //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString PdmObjectScriptabilityRegister::scriptClassComment( const QString& classKeyword ) +QString PdmObjectScriptingCapabilityRegister::scriptClassComment( const QString& classKeyword ) { auto it = s_scriptClassComments.find( classKeyword ); if ( it != s_scriptClassComments.end() ) @@ -97,7 +97,7 @@ QString PdmObjectScriptabilityRegister::scriptClassComment( const QString& class //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool PdmObjectScriptabilityRegister::isScriptable( const caf::PdmObject* object ) +bool PdmObjectScriptingCapabilityRegister::isScriptable( const caf::PdmObject* object ) { return s_classKeywordToScriptClassName.find( object->classKeyword() ) != s_classKeywordToScriptClassName.end(); } diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.h b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.h similarity index 98% rename from Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.h rename to Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.h index 56c0e08e69..5ed5915a3e 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptabilityRegister.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmObjectScriptingCapabilityRegister.h @@ -46,7 +46,7 @@ class PdmObject; //================================================================================================== /// Static register for object scriptability. //================================================================================================== -class PdmObjectScriptabilityRegister +class PdmObjectScriptingCapabilityRegister { public: static void registerScriptClassNameAndComment( const QString& classKeyword, diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp index 98da1e6e7e..a2381be34a 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmPythonGenerator.cpp @@ -35,16 +35,17 @@ //################################################################################################## #include "cafPdmPythonGenerator.h" +#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" -#include "cafPdmFieldScriptability.h" #include "cafPdmObject.h" #include "cafPdmObjectFactory.h" #include "cafPdmObjectMethod.h" -#include "cafPdmObjectScriptabilityRegister.h" +#include "cafPdmObjectScriptingCapabilityRegister.h" #include "cafPdmProxyValueField.h" #include "cafPdmXmlFieldHandle.h" + #include #include @@ -74,7 +75,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const CAF_ASSERT( object ); std::shared_ptr sharedObject( object ); - if ( PdmObjectScriptabilityRegister::isScriptable( sharedObject.get() ) ) + if ( PdmObjectScriptingCapabilityRegister::isScriptable( sharedObject.get() ) ) { dummyObjects.push_back( sharedObject ); } @@ -100,8 +101,8 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const for ( auto it = classInheritanceStack.begin(); it != classInheritanceStack.end(); ++it ) { - const QString& classKeyword = *it; - QString scriptClassComment = PdmObjectScriptabilityRegister::scriptClassComment( classKeyword ); + const QString& classKeyword = *it; + QString scriptClassComment = PdmObjectScriptingCapabilityRegister::scriptClassComment( classKeyword ); std::map attributesGenerated; @@ -113,7 +114,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const object->fields( fields ); for ( auto field : fields ) { - auto scriptability = field->template capability(); + auto scriptability = field->template capability(); if ( scriptability != nullptr ) { QString snake_field_name = camelToSnakeCase( scriptability->scriptFieldName() ); @@ -201,7 +202,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const { QString dataType = PdmPythonGenerator::dataTypeString( field, false ); QString scriptDataType = - PdmObjectScriptabilityRegister::scriptClassNameFromClassKeyword( dataType ); + PdmObjectScriptingCapabilityRegister::scriptClassNameFromClassKeyword( dataType ); QString commentDataType = field->xmlCapability()->isVectorField() ? QString( "List of %1" ).arg( scriptDataType ) @@ -262,7 +263,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const { bool isList = field->xmlCapability()->isVectorField(); QString defaultValue = isList ? "[]" : "None"; - auto scriptability = field->capability(); + auto scriptability = field->capability(); auto argumentName = camelToSnakeCase( scriptability->scriptFieldName() ); auto dataType = dataTypeString( field, false ); if ( isList ) dataType = "List of " + dataType; @@ -303,7 +304,7 @@ QString PdmPythonGenerator::generate( PdmObjectFactory* factory ) const for ( auto it = classInheritanceStack.begin(); it != classInheritanceStack.end(); ++it ) { const QString& classKeyword = *it; - QString scriptClassName = PdmObjectScriptabilityRegister::scriptClassNameFromClassKeyword( classKeyword ); + QString scriptClassName = PdmObjectScriptingCapabilityRegister::scriptClassNameFromClassKeyword( classKeyword ); if ( scriptClassName.isEmpty() ) scriptClassName = classKeyword; if ( !classesWritten.count( scriptClassName ) ) diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp index 0610abb3fb..042fe399da 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp @@ -42,7 +42,7 @@ #include "cafPdmCodeGenerator.h" #include "cafPdmDocument.h" #include "cafPdmField.h" -#include "cafPdmFieldIOScriptability.h" +#include "cafPdmFieldScriptingCapability.h" #include "cafPdmObject.h" #include "cafPdmObjectGroup.h" #include "cafPdmPointer.h" @@ -51,7 +51,7 @@ #include -#include "cafPdmObjectScriptability.h" +#include "cafPdmObjectScriptingCapability.h" #include /// Demo objects to show the usage of the Pdm system @@ -190,8 +190,8 @@ public: "ScriptClassName_InheritedDemoObj", "Script comment test" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_texts, "Texts", "Some words", "", "", "" ); - CAF_PDM_InitScriptableFieldWithIONoDefault( &m_numbers, "Numbers", "Some words", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_texts, "Texts", "Some words", "", "", "" ); + CAF_PDM_InitScriptableFieldNoDefault( &m_numbers, "Numbers", "Some words", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_testEnumField, "TestEnumValue", "An Enum", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_simpleObjectsField, "SimpleObjects", diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h index aea35fd2ca..ed16a14306 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h @@ -64,6 +64,7 @@ public: void deleteAllChildObjects() override; void insertAt( int indexAfter, PdmObjectHandle* obj ) override; PdmObjectHandle* at( size_t index ) override; + void setValue( const std::vector& objects ); virtual void deleteAllChildObjectsAsync(); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl index 78dc6ec55c..392e6d59fb 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl @@ -182,6 +182,19 @@ size_t PdmChildArrayField::index( const DataType* pointer ) const return ( size_t )( -1 ); // Undefined size_t > m_pointers.size(); } +//-------------------------------------------------------------------------------------------------- +/// Assign objects to the field, replacing the current child objects +//-------------------------------------------------------------------------------------------------- +template +void PdmChildArrayField::setValue( const std::vector& objects ) +{ + clear(); + for ( auto object : objects ) + { + push_back( object ); + } +} + //-------------------------------------------------------------------------------------------------- /// Removes all instances of object pointer from the container without deleting the object. //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl index 71cd1b2311..11f386e224 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl @@ -25,7 +25,7 @@ void caf::PdmChildField::childObjects( std::vector* template void caf::PdmChildField::setChildObject( PdmObjectHandle* object ) { - if ( m_fieldValue.rawPtr() != NULL ) + if ( m_fieldValue.rawPtr() != nullptr ) { PdmObjectHandle* oldObject = m_fieldValue.rawPtr(); this->removeChildObject( oldObject ); @@ -41,10 +41,10 @@ void caf::PdmChildField::setChildObject( PdmObjectHandle* object ) template void caf::PdmChildField::removeChildObject( PdmObjectHandle* object ) { - if ( m_fieldValue.rawPtr() != NULL && m_fieldValue.rawPtr() == object ) + if ( m_fieldValue.rawPtr() != nullptr && m_fieldValue.rawPtr() == object ) { m_fieldValue.rawPtr()->removeAsParentField( this ); - m_fieldValue.setRawPtr( NULL ); + m_fieldValue.setRawPtr( nullptr ); } } @@ -56,7 +56,7 @@ caf::PdmChildField::PdmChildField( const DataTypePtr& fieldValue ) { if ( m_fieldValue ) m_fieldValue->removeAsParentField( this ); m_fieldValue = fieldValue; - if ( m_fieldValue != NULL ) m_fieldValue->setAsParentField( this ); + if ( m_fieldValue != nullptr ) m_fieldValue->setAsParentField( this ); } //-------------------------------------------------------------------------------------------------- @@ -78,8 +78,19 @@ caf::PdmChildField& PdmChildField::operator=( const DataTy if ( m_fieldValue ) m_fieldValue->removeAsParentField( this ); m_fieldValue = fieldValue; - if ( m_fieldValue != NULL ) m_fieldValue->setAsParentField( this ); + if ( m_fieldValue != nullptr ) m_fieldValue->setAsParentField( this ); return *this; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +template +void caf::PdmChildField::setValue( const DataTypePtr& fieldValue ) +{ + if ( m_fieldValue ) m_fieldValue->removeAsParentField( this ); + m_fieldValue = fieldValue; + if ( m_fieldValue != nullptr ) m_fieldValue->setAsParentField( this ); +} + } // End of namespace caf