#6417 Fix update of cvf::Vec3d from Python

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) + '\"')
+                list_of_values.append(self.__convert_to_grpc_value(val))
-            return "[" + ", ".join(list_of_strings) + "]"
+            return "[" + ", ".join(list_of_values) + "]"
         return str(value)
 
     def __get_grpc_value(self, camel_keyword):

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"

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"

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( "" );
 }
 
 //--------------------------------------------------------------------------------------------------

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" );

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h

@@ -20,7 +20,6 @@
 
 #include "cafPdmChildArrayField.h"
 #include "cafPdmObject.h"
-#include "cafPdmObjectMethod.h"
 #include "cafPdmPtrArrayField.h"
 
 class RimSummaryPlot;

ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp

@@ -104,6 +104,7 @@ caf::PdmObjectHandle* RimSummaryCase_availableAddresses::execute()
 {
     auto*                      summaryCase = self<RimSummaryCase>();
     RifSummaryReaderInterface* sumReader   = summaryCase->summaryReader();
+    CAF_ASSERT( sumReader );
 
     const std::set<RifEclipseSummaryAddress>& addresses = sumReader->allResultAddresses();
 
@@ -153,6 +154,7 @@ caf::PdmObjectHandle* RimSummaryCase_availableTimeSteps::execute()
 {
     auto*                      summaryCase = self<RimSummaryCase>();
     RifSummaryReaderInterface* sumReader   = summaryCase->summaryReader();
+    CAF_ASSERT( sumReader );
 
     RifEclipseSummaryAddress adr;
     auto                     timeValues = sumReader->timeSteps( adr );

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}
 )
 

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})

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 <QStringList>
 #include <QTextStream>
 
+#include <type_traits>
+
 #define CAF_PDM_InitScriptableField( field, keyword, default, uiName, iconResourceName, toolTip, whatsThis ) \
     CAF_PDM_InitField( field,                                                                                \
                        keyword,                                                                              \

Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfColor3.h

@@ -33,6 +33,7 @@
 //   for more details.
 //
 //##################################################################################################
+#pragma once
 #include "cafPdmFieldScriptingCapability.h"
 
 #include "cvfColor3.h"

Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapabilityCvfVec3d.cpp

@@ -40,10 +40,10 @@ using namespace caf;
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void PdmFieldScriptingCapabilityIOHandler<cvf::Vec3d>::writeToField( cvf::Vec3d&               fieldValue,
+void PdmFieldScriptingCapabilityIOHandler<cvf::Vector3<double>>::writeToField( cvf::Vector3<double>& fieldValue,
-                                                                     QTextStream&              inputStream,
+                                                                               QTextStream&          inputStream,
-                                                                     caf::PdmScriptIOMessages* errorMessageContainer,
+                                                                               caf::PdmScriptIOMessages* errorMessageContainer,
-                                                                     bool                      stringsAreQuoted )
+                                                                               bool stringsAreQuoted )
 {
     std::vector<double> fieldVectorValue;
     PdmFieldScriptingCapabilityIOHandler<std::vector<double>>::writeToField( fieldVectorValue,
@@ -67,10 +67,10 @@ void PdmFieldScriptingCapabilityIOHandler<cvf::Vec3d>::writeToField( cvf::Vec3d&
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void PdmFieldScriptingCapabilityIOHandler<cvf::Vec3d>::readFromField( const cvf::Vec3d& fieldValue,
+void PdmFieldScriptingCapabilityIOHandler<cvf::Vector3<double>>::readFromField( const cvf::Vector3<double>& fieldValue,
-                                                                      QTextStream&      outputStream,
+                                                                                QTextStream& outputStream,
-                                                                      bool              quoteStrings,
+                                                                                bool         quoteStrings,
-                                                                      bool              quoteNonBuiltin )
+                                                                                bool         quoteNonBuiltin )
 {
     std::vector<double> fieldVectorValue( 3u );
     for ( int i = 0; i < 3; ++i )

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<cvf::Vec3d>
+struct PdmFieldScriptingCapabilityIOHandler<cvf::Vector3<double>>
 {
-    static void writeToField( cvf::Vec3d&          fieldValue,
+    static void writeToField( cvf::Vector3<double>& fieldValue,
-                              QTextStream&         inputStream,
+                              QTextStream&          inputStream,
-                              PdmScriptIOMessages* errorMessageContainer,
+                              PdmScriptIOMessages*  errorMessageContainer,
-                              bool                 stringsAreQuoted = true );
+                              bool                  stringsAreQuoted = true );
-    static void readFromField( const cvf::Vec3d& fieldValue,
+    static void readFromField( const cvf::Vector3<double>& fieldValue,
-                               QTextStream&      outputStream,
+                               QTextStream&                outputStream,
-                               bool              quoteStrings     = true,
+                               bool                        quoteStrings     = true,
-                               bool              quoteNonBuiltins = false );
+                               bool                        quoteNonBuiltins = false );
 };
-} // namespace caf
+} // namespace caf