From 4e94c02dda339ec423c862f908edce8decf95400 Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Wed, 27 May 2015 16:04:15 +0100 Subject: [PATCH] FEM: Rename animateNodes to applyDisplacementToNodes Also animateNodes is now applyDisplacementToNodes. The funcions are not doing animation, but are responsible for deforming mesh. Signed-off-by: Przemo Firszt --- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 6 +++--- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp | 4 ++-- src/Mod/Fem/MechanicalAnalysis.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 0d21508e8d..26839b7845 100755 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -587,17 +587,17 @@ void ViewProviderFemMesh::setDisplacementByNodeIdHelper(const std::vector::const_iterator it=vNodeElementIdx.begin();it!=vNodeElementIdx.end();++it,i++) DisplacementVector[i] = DispVector[*it-startId]; - animateNodes(1.0); + applyDisplacementToNodes(1.0); } void ViewProviderFemMesh::resetDisplacementByNodeId(void) { - animateNodes(0.0); + applyDisplacementToNodes(0.0); DisplacementVector.clear(); } /// reaply the node displacement with a certain factor and do a redraw -void ViewProviderFemMesh::animateNodes(double factor) +void ViewProviderFemMesh::applyDisplacementToNodes(double factor) { if(DisplacementVector.size() == 0) return; diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index a4311954eb..1bc53e2cba 100755 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -117,7 +117,7 @@ public: /// reset the view of the node displacement void resetDisplacementByNodeId(void); /// reaply the node displacement with a certain factor and do a redraw - void animateNodes(double factor); + void applyDisplacementToNodes(double factor); /// set the color for each element void setColorByElementId(const std::map &ElementColorMap); /// reset the view of the element colors diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml b/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml index d120bfd112..20849b705b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml @@ -15,7 +15,7 @@ ViewProviderFemMesh class - + diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp index fac8f6ed1b..55c1a7b85c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp @@ -24,13 +24,13 @@ std::string ViewProviderFemMeshPy::representation(void) const -PyObject* ViewProviderFemMeshPy::animate(PyObject * args) +PyObject* ViewProviderFemMeshPy::applyDisplacement(PyObject * args) { double factor; if (!PyArg_ParseTuple(args, "d", &factor)) return 0; - this->getViewProviderFemMeshPtr()->animateNodes(factor); + this->getViewProviderFemMeshPtr()->applyDisplacementToNodes(factor); Py_Return; } diff --git a/src/Mod/Fem/MechanicalAnalysis.py b/src/Mod/Fem/MechanicalAnalysis.py index df48b5335a..6e2b190808 100644 --- a/src/Mod/Fem/MechanicalAnalysis.py +++ b/src/Mod/Fem/MechanicalAnalysis.py @@ -572,11 +572,11 @@ class _ResultControlTaskPanel: if checked: factor = self.form.horizontalScrollBar_Factor.value() self.setDisplacement() - self.MeshObject.ViewObject.animate(factor) + self.MeshObject.ViewObject.applyDisplacement(factor) QtGui.qApp.restoreOverrideCursor() def sliderValue(self, value): - self.MeshObject.ViewObject.animate(value) + self.MeshObject.ViewObject.applyDisplacement(value) self.form.spinBox_DisplacementFactor.setValue(value) def sliderMaxValue(self, value):