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

[FEM] use predefined M_PI

Browse Source
This commit is contained in:
Uwe
2022-01-07 21:50:47 +01:00
parent 2db409659e
commit b8bdf9f67c
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
View File

@@ -58,7 +58,6 @@
#include <Mod/Fem/App/FemTools.h>
#include <math.h>
#define PI (3.141592653589793238462643383279502884L)
using namespace FemGui;
using namespace Gui;
@@ -333,25 +332,27 @@ void TaskFemConstraintTransform::addToSelection()
double l = normal.z;
//about Z-axis
double about_z;
double mag_norm_z = sqrt(n*n +m*m) ; //normal vector mapped onto XY plane
if (mag_norm_z ==0) {
double mag_norm_z = sqrt(n * n + m * m); //normal vector mapped onto XY plane
if (mag_norm_z == 0) {
about_z = 0;
} else {
about_z = (-1*(acos(m/mag_norm_z) * 180/PI) +180);
}
if (n>0) {
about_z = about_z*(-1);
else {
about_z = (-1 * (acos(m / mag_norm_z) * 180 / M_PI) + 180);
}
if (n > 0) {
about_z = about_z * (-1);
}
//rotation to ZY plane
double m_p = n*sin(about_z*PI/180) + m*cos(about_z*PI/180);
double m_p = n * sin(about_z * M_PI / 180) + m * cos(about_z * M_PI / 180);
double l_p = l;
//about X-axis
double about_x;
double mag_norm_x = sqrt(m_p*m_p + l_p*l_p);
if (mag_norm_x ==0){
double mag_norm_x = sqrt(m_p * m_p + l_p * l_p);
if (mag_norm_x == 0) {
about_x = 0;
} else {
about_x = -(acos(l_p/mag_norm_x) * 180/PI); //rotation to the Z axis
}
else {
about_x = -(acos(l_p / mag_norm_x) * 180 / M_PI); //rotation to the Z axis
}
ui->sp_X->setValue(round(about_x));
ui->sp_Z->setValue(round(about_z));

50
src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp
View File

@@ -56,8 +56,6 @@
#include <Gui/Control.h>
#define PI (3.141592653589793238462643383279502884L)
using namespace FemGui;
PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintTransform, FemGui::ViewProviderFemConstraint)
@@ -154,9 +152,9 @@ void ViewProviderFemConstraintTransform::updateData(const App::Property* prop)
double z_axis_y = 0;
double z_axis_z = 1;
double rot_x = (pcConstraint->X_rot.getValue() * (PI/180));
double rot_y = (pcConstraint->Y_rot.getValue() * (PI/180));
double rot_z = (pcConstraint->Z_rot.getValue() * (PI/180));
double rot_x = (pcConstraint->X_rot.getValue() * (M_PI /180));
double rot_y = (pcConstraint->Y_rot.getValue() * (M_PI /180));
double rot_z = (pcConstraint->Z_rot.getValue() * (M_PI /180));
double x_axis_x_p;
double x_axis_y_p;
@@ -170,51 +168,51 @@ void ViewProviderFemConstraintTransform::updateData(const App::Property* prop)
double z_axis_y_p;
double z_axis_z_p;
if (rot_x!=0){
x_axis_z_p = x_axis_z*cos(rot_x) - x_axis_y*sin(rot_x);
x_axis_y_p = x_axis_y*cos(rot_x) + x_axis_z*sin(rot_x);
if (rot_x != 0) {
x_axis_z_p = x_axis_z * cos(rot_x) - x_axis_y * sin(rot_x);
x_axis_y_p = x_axis_y * cos(rot_x) + x_axis_z * sin(rot_x);
x_axis_z = x_axis_z_p;
x_axis_y = x_axis_y_p;
y_axis_z_p = y_axis_z*cos(rot_x) - y_axis_y*sin(rot_x);
y_axis_y_p = y_axis_y*cos(rot_x) + y_axis_z*sin(rot_x);
y_axis_z_p = y_axis_z * cos(rot_x) - y_axis_y * sin(rot_x);
y_axis_y_p = y_axis_y * cos(rot_x) + y_axis_z * sin(rot_x);
y_axis_z = y_axis_z_p;
y_axis_y = y_axis_y_p;
z_axis_z_p = z_axis_z*cos(rot_x) - z_axis_y*sin(rot_x);
z_axis_y_p = z_axis_y*cos(rot_x) + z_axis_z*sin(rot_x);
z_axis_z_p = z_axis_z * cos(rot_x) - z_axis_y * sin(rot_x);
z_axis_y_p = z_axis_y * cos(rot_x) + z_axis_z * sin(rot_x);
z_axis_z = z_axis_z_p;
z_axis_y = z_axis_y_p;
}
if (rot_y != 0){
x_axis_z_p = x_axis_z*cos(rot_y) + x_axis_x*sin(rot_y);
x_axis_x_p = x_axis_x*cos(rot_y) - x_axis_z*sin(rot_y);
if (rot_y != 0) {
x_axis_z_p = x_axis_z * cos(rot_y) + x_axis_x * sin(rot_y);
x_axis_x_p = x_axis_x * cos(rot_y) - x_axis_z * sin(rot_y);
x_axis_z = x_axis_z_p;
x_axis_x = x_axis_x_p;
y_axis_z_p = y_axis_z*cos(rot_y) + y_axis_x*sin(rot_y);
y_axis_x_p = y_axis_x*cos(rot_y) - y_axis_z*sin(rot_y);
y_axis_z_p = y_axis_z * cos(rot_y) + y_axis_x * sin(rot_y);
y_axis_x_p = y_axis_x * cos(rot_y) - y_axis_z * sin(rot_y);
y_axis_z = y_axis_z_p;
y_axis_x = y_axis_x_p;
z_axis_z_p = z_axis_z*cos(rot_y) + z_axis_x*sin(rot_y);
z_axis_x_p = z_axis_x*cos(rot_y) - z_axis_z*sin(rot_y);
z_axis_z_p = z_axis_z * cos(rot_y) + z_axis_x * sin(rot_y);
z_axis_x_p = z_axis_x * cos(rot_y) - z_axis_z * sin(rot_y);
z_axis_z = z_axis_z_p;
z_axis_x = z_axis_x_p;
}
if (rot_z !=0){
x_axis_x_p = x_axis_x*cos(rot_z) + x_axis_y*sin(rot_z);
x_axis_y_p = x_axis_y*cos(rot_z) - x_axis_x*sin(rot_z);
if (rot_z != 0) {
x_axis_x_p = x_axis_x * cos(rot_z) + x_axis_y * sin(rot_z);
x_axis_y_p = x_axis_y * cos(rot_z) - x_axis_x * sin(rot_z);
x_axis_x = x_axis_x_p;
x_axis_y = x_axis_y_p;
y_axis_x_p = y_axis_x*cos(rot_z) + y_axis_y*sin(rot_z);
y_axis_y_p = y_axis_y*cos(rot_z) - y_axis_x*sin(rot_z);
y_axis_x_p = y_axis_x * cos(rot_z) + y_axis_y * sin(rot_z);
y_axis_y_p = y_axis_y * cos(rot_z) - y_axis_x * sin(rot_z);
y_axis_x = y_axis_x_p;
y_axis_y = y_axis_y_p;
z_axis_x_p = z_axis_x*cos(rot_z) + z_axis_y*sin(rot_z);
z_axis_y_p = z_axis_y*cos(rot_z) - z_axis_x*sin(rot_z);
z_axis_x_p = z_axis_x * cos(rot_z) + z_axis_y * sin(rot_z);
z_axis_y_p = z_axis_y * cos(rot_z) - z_axis_x * sin(rot_z);
z_axis_x = z_axis_x_p;
z_axis_y = z_axis_y_p;
}