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

[Drawing] use predefined M_PI

Browse Source
This commit is contained in:
Uwe
2022-01-07 21:52:24 +01:00
parent 9057093f02
commit 629c1467ce
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
View File

@@ -45,11 +45,6 @@ using namespace DrawingGui;
using namespace std;
namespace bp = boost::placeholders;
#ifndef PI
#define PI 3.14159265358979323846 /* pi */
#endif
#if 0 // needed for Qt's lupdate utility
qApp->translate("QObject", "Make axonometric...");
qApp->translate("QObject", "Edit axonometric settings...");
@@ -247,25 +242,25 @@ void orthoview::set_projection(const gp_Ax2& cs)
// this can lead to choosing a different normal x-direction when the file
// gets reloaded see issue #1909
// we anticipate the actual_cs after reloading by rounding the Z_dir now
const double x = round( Z_dir.X() * 1e12 ) / 1e12;
const double y = round( Z_dir.Y() * 1e12 ) / 1e12;
const double z = round( Z_dir.Z() * 1e12 ) / 1e12;
actual_cs = gp_Ax2(gp_Pnt(0,0,0), gp_Dir(x,y,z));
const double x = round(Z_dir.X() * 1e12) / 1e12;
const double y = round(Z_dir.Y() * 1e12) / 1e12;
const double z = round(Z_dir.Z() * 1e12) / 1e12;
actual_cs = gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(x, y, z));
actual_X = actual_cs.XDirection();
// angle between desired projection and actual projection
float rotation = X_dir.Angle(actual_X);
if (rotation != 0 && abs(PI - rotation) > 0.05)
if (rotation != 0 && abs(M_PI - rotation) > 0.05)
if (!Z_dir.IsEqual(actual_X.Crossed(X_dir), 0.05))
rotation = -rotation;
calcCentre();
//this_view->Direction.setValue(Z_dir.X(), Z_dir.Y(), Z_dir.Z());
this_view->Direction.setValue(x,y,z);
this_view->Rotation.setValue(180 * rotation / PI);
this_view->Direction.setValue(x, y, z);
this_view->Rotation.setValue(180 * rotation / M_PI);
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -583,8 +578,8 @@ void OrthoViews::set_orientation(int index) // set orientation o
n = -views[index]->rel_y;
}
rotation = n * rotate_coeff * PI/2; // rotate_coeff is -1 or 1 for 1st or 3rd angle
cs = primary.Rotated(gp_Ax1(gp_Pnt(0,0,0), dir), rotation);
rotation = n * rotate_coeff * M_PI / 2; // rotate_coeff is -1 or 1 for 1st or 3rd angle
cs = primary.Rotated(gp_Ax1(gp_Pnt(0, 0, 0), dir), rotation);
views[index]->set_projection(cs);
}
}
@@ -740,19 +735,19 @@ void OrthoViews::set_Axo(int rel_x, int rel_y, gp_Dir up, gp_Dir right, bool awa
}
else
{
rotations[0] = 1.3088876392502007 - PI/2;
rotations[0] = 1.3088876392502007 - M_PI / 2;
rotations[1] = -0.6156624905260762;
}
if (away)
rotations[1] = - rotations[1];
gp_Ax2 cs = gp_Ax2(gp_Pnt(0,0,0), right);
gp_Ax2 cs = gp_Ax2(gp_Pnt(0, 0, 0), right);
cs.SetYDirection(up);
cs.Rotate(gp_Ax1(gp_Pnt(0,0,0), up), rotations[0]);
cs.Rotate(gp_Ax1(gp_Pnt(0, 0, 0), up), rotations[0]);
gp_Dir dir;
dir = cs.XDirection();
cs.Rotate(gp_Ax1(gp_Pnt(0,0,0), dir), rotations[1]);
cs.Rotate(gp_Ax1(gp_Pnt(0, 0, 0), dir), rotations[1]);
int num = index(rel_x, rel_y);
if (num != -1) {