Fem: Use pyViewObject base member in getPyObject methods
This commit is contained in:
committed by
Chris Hennes
parent
ce40d344a7
commit
abef50a518
@@ -596,11 +596,11 @@ void ViewProviderFemMesh::resetHighlightNodes()
|
||||
|
||||
PyObject* ViewProviderFemMesh::getPyObject()
|
||||
{
|
||||
if (PythonObject.is(Py::_None())) {
|
||||
// ref counter is set to 1
|
||||
PythonObject = Py::Object(new ViewProviderFemMeshPy(this), true);
|
||||
if (!pyViewObject) {
|
||||
pyViewObject = new ViewProviderFemMeshPy(this);
|
||||
}
|
||||
return Py::new_reference_to(PythonObject);
|
||||
pyViewObject->IncRef();
|
||||
return pyViewObject;
|
||||
}
|
||||
|
||||
void ViewProviderFemMesh::setDisplacementByNodeId(const std::map<long, Base::Vector3d>& NodeDispMap)
|
||||
|
||||
@@ -145,8 +145,6 @@ private:
|
||||
static App::PropertyFloatConstraint::Constraints floatRange;
|
||||
static const char* colorModeEnum[];
|
||||
|
||||
Py::Object PythonObject;
|
||||
|
||||
protected:
|
||||
/// get called by the container whenever a property has been changed
|
||||
void onChanged(const App::Property* prop) override;
|
||||
|
||||
@@ -240,9 +240,9 @@ void ViewProviderFemPostPipeline::scaleField(vtkDataSet* dset,
|
||||
|
||||
PyObject* ViewProviderFemPostPipeline::getPyObject()
|
||||
{
|
||||
if (PythonObject.is(Py::_None())) {
|
||||
// ref counter is set to 1
|
||||
PythonObject = Py::Object(new ViewProviderFemPostPipelinePy(this), true);
|
||||
if (!pyViewObject) {
|
||||
pyViewObject = new ViewProviderFemPostPipelinePy(this);
|
||||
}
|
||||
return Py::new_reference_to(PythonObject);
|
||||
pyViewObject->IncRef();
|
||||
return pyViewObject;
|
||||
}
|
||||
|
||||
@@ -52,9 +52,6 @@ public:
|
||||
void scaleField(vtkDataSet* dset, vtkDataArray* pdata, double FieldFactor);
|
||||
PyObject* getPyObject() override;
|
||||
|
||||
private:
|
||||
Py::Object PythonObject;
|
||||
|
||||
protected:
|
||||
void updateFunctionSize();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user