kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Assembly: Refactor get/setDraggerPlacement

Browse Source 
It seems that Base has very handy helpers for converting between various
types. This simplifies code of ViewProviderAssembly::get/setDraggerPlacement a
lot.
This commit is contained in:
Kacper Donat
2024-10-25 19:50:07 +02:00
committed by Chris Hennes
parent ea8814785a
commit 03d4157627
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@@ -71,6 +71,8 @@
#include "ViewProviderAssembly.h"
#include "ViewProviderAssemblyPy.h"
#include <Gui/Utilities.h>
using namespace Assembly;
using namespace AssemblyGui;
@@ -1154,27 +1156,14 @@ bool ViewProviderAssembly::getDraggerVisibility()
void ViewProviderAssembly::setDraggerPlacement(Base::Placement plc)
{
double q0, q1, q2, q3;
plc.getRotation().getValue(q0, q1, q2, q3);
Base::Vector3d pos = plc.getPosition();
asmDragger->rotation.setValue(q0, q1, q2, q3);
asmDragger->translation.setValue(pos.x, pos.y, pos.z);
asmDragger->rotation.setValue(Base::convertTo<SbRotation>(plc.getRotation()));
asmDragger->translation.setValue(Base::convertTo<SbVec3f>(plc.getPosition()));
}
Base::Placement ViewProviderAssembly::getDraggerPlacement()
{
Base::Placement plc;
SbVec3f pos = asmDragger->translation.getValue();
plc.setPosition(Base::Vector3d(pos[0], pos[1], pos[2]));
SbVec3f axis;
float angle;
asmDragger->rotation.getValue(axis, angle);
Base::Vector3d axisV = Base::Vector3d(axis[0], axis[1], axis[2]);
Base::Rotation rot(axisV, angle);
plc.setRotation(rot);
return plc;
return {Base::convertTo<Base::Vector3d>(asmDragger->translation.getValue()),
Base::convertTo<Base::Rotation>(asmDragger->rotation.getValue())};
}
Gui::SoFCCSysDragger* ViewProviderAssembly::getDragger()