From 915745c389b25593016ab231ff9c03ed6d29021d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 25 Oct 2021 11:38:25 +0200 Subject: [PATCH] Janitor: Cleanup names of scripted classes in Python Avoid Rim prefix and use keyword alias to ensure backwards compability --- .../ProjectDataModel/CellFilters/RimCellFilterCollection.cpp | 2 +- .../ProjectDataModel/Completions/RimFractureTemplate.cpp | 2 +- .../Completions/RimFractureTemplateCollection.cpp | 2 +- .../Completions/RimStimPlanFractureTemplate.cpp | 2 +- .../Surfaces/RimEnsembleStatisticsSurface.cpp | 3 --- .../ProjectDataModel/Surfaces/RimFileSurface.cpp | 5 +---- .../ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp | 2 +- .../Python/rips/PythonExamples/import_fractures_on_well.py | 2 +- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp index b95479735b..bd6f7a7852 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp @@ -32,7 +32,7 @@ #include "cafPdmObjectScriptingCapability.h" #include "cvfStructGridGeometryGenerator.h" -CAF_PDM_SOURCE_INIT( RimCellFilterCollection, "RimCellFilterCollection", "CellRangeFilterCollection" ); +CAF_PDM_SOURCE_INIT( RimCellFilterCollection, "CellFilterCollection", "RimCellFilterCollection", "CellRangeFilterCollection" ); //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index b604c4f724..7ad3393b86 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -103,7 +103,7 @@ void caf::AppEnum::setUp() #define CAF_PDM_InitField_Basic( field, keyword, default, uiName ) \ CAF_PDM_InitField( field, keyword, default, uiName, "", "", "" ) -CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimFractureTemplate, "RimFractureTemplate" ); +CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimFractureTemplate, "FractureTemplate", "RimFractureTemplate" ); //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index cc5d554f67..1401552e57 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -45,7 +45,7 @@ #include -CAF_PDM_SOURCE_INIT( RimFractureTemplateCollection, "FractureDefinitionCollection" ); +CAF_PDM_SOURCE_INIT( RimFractureTemplateCollection, "FractureTemplateCollection", "FractureDefinitionCollection" ); //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp index bc65835752..0ad822317a 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp @@ -64,7 +64,7 @@ static std::vector EMPTY_DOUBLE_VECTOR; -CAF_PDM_SOURCE_INIT( RimStimPlanFractureTemplate, "RimStimPlanFractureTemplate" ); +CAF_PDM_SOURCE_INIT( RimStimPlanFractureTemplate, "StimPlanFractureTemplate", "RimStimPlanFractureTemplate" ); //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp index c8ec194e8d..d7f45e9301 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleStatisticsSurface.cpp @@ -28,9 +28,6 @@ #include -// TODO: Use the alias concept prototyped below when the alias concept for class is ready -// CAF_PDM_SOURCE_INIT( RimEnsembleStatisticsSurface, "EnsembleStatisticsSurface", "Surface" ); -// CAF_PDM_SOURCE_INIT( , , ); CAF_PDM_SOURCE_INIT( RimEnsembleStatisticsSurface, "EnsembleStatisticsSurface" ); //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp index 584b590963..19cff0309f 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimFileSurface.cpp @@ -31,10 +31,7 @@ #include -// TODO: Use the alias concept prototyped below when the alias concept for class is ready -// CAF_PDM_SOURCE_INIT( RimFileSurface, "FileSurface", "Surface" ); -// CAF_PDM_SOURCE_INIT( , , ); -CAF_PDM_SOURCE_INIT( RimFileSurface, "Surface" ); +CAF_PDM_SOURCE_INIT( RimFileSurface, "Surface", "FileSurface" ); //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index 439e9268d5..271dfb91a5 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -76,7 +76,7 @@ /// //================================================================================================== -CAF_PDM_SOURCE_INIT( RimWellLogExtractionCurve, "RimWellLogExtractionCurve" ); +CAF_PDM_SOURCE_INIT( RimWellLogExtractionCurve, "WellLogExtractionCurve", "RimWellLogExtractionCurve" ); namespace caf { diff --git a/GrpcInterface/Python/rips/PythonExamples/import_fractures_on_well.py b/GrpcInterface/Python/rips/PythonExamples/import_fractures_on_well.py index 81b078bad9..6bc90184a2 100644 --- a/GrpcInterface/Python/rips/PythonExamples/import_fractures_on_well.py +++ b/GrpcInterface/Python/rips/PythonExamples/import_fractures_on_well.py @@ -18,7 +18,7 @@ cases = resinsight.project.cases() case = cases[0] # Create stim plan template -fmt_collection = project.descendants(rips.FractureDefinitionCollection)[0] +fmt_collection = project.descendants(rips.FractureTemplateCollection)[0] fracture_template = fmt_collection.append_fracture_template( file_path=stim_plan_file_path )