From b8bdf9f67c5179d5874c42c506f7988c36d5ea32 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 7 Jan 2022 21:50:47 +0100 Subject: [PATCH] [FEM] use predefined M_PI --- .../Fem/Gui/TaskFemConstraintTransform.cpp | 25 +++++----- .../ViewProviderFemConstraintTransform.cpp | 50 +++++++++---------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp index 1339a215f8..e9092cf159 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp @@ -58,7 +58,6 @@ #include #include -#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)); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp index 2c808ed842..f01378a41b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTransform.cpp @@ -56,8 +56,6 @@ #include -#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; }