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 <przemo@firszt.eu>
This commit is contained in:
Przemo Firszt
2015-05-27 16:04:15 +01:00
parent 8195ce579b
commit 4e94c02dda
5 changed files with 9 additions and 9 deletions

View File

@@ -587,17 +587,17 @@ void ViewProviderFemMesh::setDisplacementByNodeIdHelper(const std::vector<Base::
int i=0;
for(std::vector<unsigned long>::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;

View File

@@ -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<long,App::Color> &ElementColorMap);
/// reset the view of the element colors

View File

@@ -15,7 +15,7 @@
<Author Licence="LGPL" Name="Juergen Riegel" EMail="Juergen.Riegel@web.de" />
<UserDocu>ViewProviderFemMesh class</UserDocu>
</Documentation>
<Methode Name="animate">
<Methode Name="applyDisplacement">
<Documentation>
<UserDocu></UserDocu>
</Documentation>

View File

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

View File

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