From c11fdbe3557e2dd685b9a335dc1ffdb020582c39 Mon Sep 17 00:00:00 2001 From: kgoao Date: Tue, 20 Dec 2016 18:10:54 +0100 Subject: [PATCH] FEM: ConstraintTransform: Allow forces to be transformed --- src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp | 6 +++--- src/Mod/Fem/Gui/TaskFemConstraintTransform.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp index ca4164165..4627eb41a 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp @@ -114,7 +114,7 @@ TaskFemConstraintTransform::TaskFemConstraintTransform(ViewProviderFemConstraint ui->lw_Rect->clear(); //Transformable surfaces - Gui::Command::doCommand(Gui::Command::Doc,TaskFemConstraintTransform::getDisplcementReferences((static_cast(ConstraintView->getObject()))->getNameInDocument()).c_str()); + Gui::Command::doCommand(Gui::Command::Doc,TaskFemConstraintTransform::getSurfaceReferences((static_cast(ConstraintView->getObject()))->getNameInDocument()).c_str()); std::vector ObjDispl = pcConstraint->RefDispl.getValues(); std::vector nDispl = pcConstraint->NameDispl.getValues(); std::vector SubElemDispl = pcConstraint->RefDispl.getSubValues(); @@ -436,7 +436,7 @@ void TaskFemConstraintTransform::onReferenceDeleted() { TaskFemConstraintTransform::removeFromSelection(); } -std::string TaskFemConstraintTransform::getDisplcementReferences(std::string showConstr="") +std::string TaskFemConstraintTransform::getSurfaceReferences(std::string showConstr="") { return "for obj in FreeCAD.ActiveDocument.Objects:\n\ if obj.isDerivedFrom(\"Fem::FemAnalysisPython\"):\n\ @@ -446,7 +446,7 @@ A = []\n\ i = 0\n\ ss = []\n\ for member in members:\n\ - if member.isDerivedFrom(\"Fem::ConstraintDisplacement\"):\n\ + if (member.isDerivedFrom(\"Fem::ConstraintDisplacement\")) or (member.isDerivedFrom(\"Fem::ConstraintForce\")):\n\ m = member.References\n\ A.append(m)\n\ if i >0:\n\ diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h index ac2da9857..83ef19314 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.h @@ -55,7 +55,7 @@ public: double get_Y_rot()const; double get_Z_rot()const; std::string get_transform_type(void) const; - static std::string getDisplcementReferences(const std::string showConstr); + static std::string getSurfaceReferences(const std::string showConstr); private Q_SLOTS: void onReferenceDeleted(void);