diff --git a/ApplicationCode/GrpcInterface/Python/rips/pdmobject.py b/ApplicationCode/GrpcInterface/Python/rips/pdmobject.py index 5d66970a47..c30d8351fa 100644 --- a/ApplicationCode/GrpcInterface/Python/rips/pdmobject.py +++ b/ApplicationCode/GrpcInterface/Python/rips/pdmobject.py @@ -179,10 +179,10 @@ class PdmObjectBase: if isinstance(value, PdmObjectBase): return value.__class__.__name__ + ":" + str(value.address()) if isinstance(value, list): - list_of_strings = [] + list_of_values = [] for val in value: - list_of_strings.append('\"' + self.__convert_to_grpc_value(val) + '\"') - return "[" + ", ".join(list_of_strings) + "]" + list_of_values.append(self.__convert_to_grpc_value(val)) + return "[" + ", ".join(list_of_values) + "]" return str(value) def __get_grpc_value(self, camel_keyword): diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp index 1aae4e794c..dc36bb96ab 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp @@ -51,7 +51,7 @@ #include "RimWellPathGeometryDef.h" #include "RimWellPathTarget.h" -#include "cafPdmFieldScriptingCapability.h" +#include "cafPdmFieldCvfVec3d.h" #include "cafPdmFieldScriptingCapabilityCvfVec3d.h" #include "cafPdmObjectScriptingCapability.h" #include "cafPdmUiDoubleSliderEditor.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h index f216ee1114..24b0871d06 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h @@ -24,9 +24,6 @@ #include "RimCheckableNamedObject.h" #include "RimWellPathComponentInterface.h" -#include "cvfObject.h" -#include "cvfVector3.h" - #include "cafPdmChildField.h" #include "cafPdmFieldCvfVec3d.h" #include "cafPdmProxyValueField.h" diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp index 6e28487a7a..2e836ceaa0 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp @@ -516,7 +516,11 @@ size_t Rim3dView::timeStepCount() //-------------------------------------------------------------------------------------------------- QString Rim3dView::timeStepName( int frameIdx ) const { - return this->ownerCase()->timeStepName( frameIdx ); + if ( this->ownerCase() ) + { + return this->ownerCase()->timeStepName( frameIdx ); + } + return QString( "" ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp index 4085ad3445..0526e7bbf9 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp @@ -27,6 +27,7 @@ #include "cafPdmFieldReorderCapability.h" #include "cafPdmAbstractFieldScriptingCapability.h" +#include "cafPdmObjectMethod.h" #include "cafPdmObjectScriptingCapability.h" CAF_PDM_SOURCE_INIT( RimSummaryPlotCollection, "SummaryPlotCollection" ); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h index 70316953af..84571883d8 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h @@ -20,7 +20,6 @@ #include "cafPdmChildArrayField.h" #include "cafPdmObject.h" -#include "cafPdmObjectMethod.h" #include "cafPdmPtrArrayField.h" class RimSummaryPlot; diff --git a/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp b/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp index 641fb9bfd7..55e5f8bcc3 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp @@ -104,6 +104,7 @@ caf::PdmObjectHandle* RimSummaryCase_availableAddresses::execute() { auto* summaryCase = self(); RifSummaryReaderInterface* sumReader = summaryCase->summaryReader(); + CAF_ASSERT( sumReader ); const std::set& addresses = sumReader->allResultAddresses(); @@ -153,6 +154,7 @@ caf::PdmObjectHandle* RimSummaryCase_availableTimeSteps::execute() { auto* summaryCase = self(); RifSummaryReaderInterface* sumReader = summaryCase->summaryReader(); + CAF_ASSERT( sumReader ); RifEclipseSummaryAddress adr; auto timeValues = sumReader->timeSteps( adr ); diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index 4c55728997..4804f1a0bc 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -22,11 +22,6 @@ add_library( ${PROJECT_NAME} cafPdmXmlColor3f.cpp cafPdmXmlColor3f.h cafPdmFieldCvfColor.h - cafPdmFieldScriptingCapabilityCvfColor3.h - cafPdmFieldScriptingCapabilityCvfColor3.cpp - cafPdmFieldScriptingCapabilityCvfVec3d.h - cafPdmFieldScriptingCapabilityCvfVec3d.cpp - cafPdmCoreVec3d.h cafPdmUiCoreVec3d.cpp cafPdmUiCoreVec3d.h @@ -41,7 +36,7 @@ add_library( ${PROJECT_NAME} cafPdmXmlMat4d.h cafPdmFieldCvfMat4d.h - cafPdmMat3d/cafPdmCoreMat3d.h + cafPdmMat3d/cafPdmCoreMat3d.h cafPdmMat3d/cafPdmUiCoreMat3d.h cafPdmMat3d/cafPdmXmlMat3d.cpp cafPdmMat3d/cafPdmXmlMat3d.h @@ -60,7 +55,6 @@ target_include_directories(${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME} cafUserInterface LibCore - cafPdmScripting ${QT_LIBRARIES} ) diff --git a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt index 4c5ca7426d..2c7e66b3f9 100644 --- a/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmScripting/CMakeLists.txt @@ -30,6 +30,10 @@ set( PROJECT_FILES cafPdmMarkdownGenerator.cpp cafPdmMarkdownBuilder.h cafPdmMarkdownBuilder.cpp + cafPdmFieldScriptingCapabilityCvfColor3.h + cafPdmFieldScriptingCapabilityCvfColor3.cpp + cafPdmFieldScriptingCapabilityCvfVec3d.h + cafPdmFieldScriptingCapabilityCvfVec3d.cpp ) @@ -45,6 +49,7 @@ target_include_directories(${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME} cafProjectDataModel + cafPdmCvf ) source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h index a260aa8722..c5cf9e5e0d 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h @@ -39,6 +39,8 @@ #include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" +#include "cafPdmCoreColor3f.h" +#include "cafPdmCoreVec3d.h" #include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include "cafPdmScriptIOMessages.h" @@ -47,6 +49,8 @@ #include #include +#include + #define CAF_PDM_InitScriptableField( field, keyword, default, uiName, iconResourceName, toolTip, whatsThis ) \ CAF_PDM_InitField( field, \ keyword, \ diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.cpp similarity index 100% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.cpp rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.cpp diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.h similarity index 98% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.h index 9d23b301ae..8e773782f9 100644 --- a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfColor3.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.h @@ -33,6 +33,7 @@ // for more details. // //################################################################################################## +#pragma once #include "cafPdmFieldScriptingCapability.h" #include "cvfColor3.h" diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.cpp similarity index 87% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.cpp index 4f48278d4e..e5ef4211b4 100644 --- a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.cpp @@ -40,10 +40,10 @@ using namespace caf; //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptingCapabilityIOHandler::writeToField( cvf::Vec3d& fieldValue, - QTextStream& inputStream, - caf::PdmScriptIOMessages* errorMessageContainer, - bool stringsAreQuoted ) +void PdmFieldScriptingCapabilityIOHandler>::writeToField( cvf::Vector3& fieldValue, + QTextStream& inputStream, + caf::PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted ) { std::vector fieldVectorValue; PdmFieldScriptingCapabilityIOHandler>::writeToField( fieldVectorValue, @@ -67,10 +67,10 @@ void PdmFieldScriptingCapabilityIOHandler::writeToField( cvf::Vec3d& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void PdmFieldScriptingCapabilityIOHandler::readFromField( const cvf::Vec3d& fieldValue, - QTextStream& outputStream, - bool quoteStrings, - bool quoteNonBuiltin ) +void PdmFieldScriptingCapabilityIOHandler>::readFromField( const cvf::Vector3& fieldValue, + QTextStream& outputStream, + bool quoteStrings, + bool quoteNonBuiltin ) { std::vector fieldVectorValue( 3u ); for ( int i = 0; i < 3; ++i ) diff --git a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.h similarity index 71% rename from Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h rename to Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.h index ab65d97313..7be7a058b7 100644 --- a/Fwk/AppFwk/cafPdmCvf/cafPdmFieldScriptingCapabilityCvfVec3d.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.h @@ -33,6 +33,8 @@ // for more details. // //################################################################################################## +#pragma once + #include "cafPdmFieldScriptingCapability.h" #include "cvfVector3.h" @@ -40,15 +42,15 @@ namespace caf { template <> -struct PdmFieldScriptingCapabilityIOHandler +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 ); + static void writeToField( cvf::Vector3& fieldValue, + QTextStream& inputStream, + PdmScriptIOMessages* errorMessageContainer, + bool stringsAreQuoted = true ); + static void readFromField( const cvf::Vector3& fieldValue, + QTextStream& outputStream, + bool quoteStrings = true, + bool quoteNonBuiltins = false ); }; -} // namespace caf \ No newline at end of file +} // namespace caf