OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6417 Fix update of cvf::Vec3d from Python

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-07 13:59:08 +02:00
parent 66c57cfae8
commit 2e1bf89bff
14 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/GrpcInterface/Python/rips/pdmobject.py
View File

@@ -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):

2
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
View File

@@ -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"

3
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
View File

@@ -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"

6
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

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

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@@ -27,6 +27,7 @@
#include "cafPdmFieldReorderCapability.h"
#include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmObjectMethod.h"
#include "cafPdmObjectScriptingCapability.h"
CAF_PDM_SOURCE_INIT( RimSummaryPlotCollection, "SummaryPlotCollection" );

1
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
View File

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

2
ApplicationCode/ProjectDataModelCommands/RimcSummaryCase.cpp
View File

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