[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kmathtool/src/parts/kmathareaperimeter
From:       Pino Toscano <toscano.pino () tiscali ! it>
Date:       2005-03-11 18:51:55
Message-ID: 20050311185155.06DA7EED3 () office ! kde ! org
[Download RAW message or body]

CVS commit by pino: 

Use M_PI as pi value.


  M +10 -14    areaperimeter1.cpp   1.3


--- kdenonbeta/kmathtool/src/parts/kmathareaperimeter/areaperimeter1.cpp  #1.2:1.3
@@ -35,6 +35,4 @@
 #include "triangle.xpm"
 
-#define PI 3.141592654
-
 AreaPerimeter1::AreaPerimeter1(QWidget *parent, const char *name ) : \
AreaPerimeter1D(parent,name)  {
@@ -438,6 +436,4 @@ void AreaPerimeter1::slotCalculate()
             QString qsRadius, qsDiameter, qsArea, qsPerimeter;
             double r,d,A,U;
-            const double pi = 3.1412;
-
             switch (iSelected)
             {
@@ -448,6 +444,6 @@ void AreaPerimeter1::slotCalculate()
 
                     d = 2*r;
-                    A = pi*r*r;
-                    U = 2*pi*r;
+                    A = M_PI*r*r;
+                    U = 2*M_PI*r;
 
                     qsArea = qsArea.number(A);
@@ -466,6 +462,6 @@ void AreaPerimeter1::slotCalculate()
 
                     r = d/2;
-                    A = pi*r*r;
-                    U = 2*pi*r;
+                    A = M_PI*r*r;
+                    U = 2*M_PI*r;
 
                     qsRadius = qsRadius.number(r);
@@ -483,7 +479,7 @@ void AreaPerimeter1::slotCalculate()
                     A = qsArea.toDouble();
 
-                    r = sqrt(A/pi);
+                    r = sqrt(A/M_PI);
                     d = 2*r;
-                    U = 2*pi*r;
+                    U = 2*M_PI*r;
 
                     qsRadius = qsRadius.number(r);
@@ -501,7 +497,7 @@ void AreaPerimeter1::slotCalculate()
                     U = qsPerimeter.toDouble();
 
-                    r = U/(2*pi);
+                    r = U/(2*M_PI);
                     d = 2*r;
-                    A = pi*r*r;
+                    A = M_PI*r*r;
 
                     qsRadius = qsRadius.number(r);
@@ -538,6 +534,6 @@ void AreaPerimeter1::slotCalculate()
                     }
 
-                    gamma = acos ((a*a + b*b - c*c)/(2*a*b)) / (2*PI) * 360;    /* \
                vom Bogenma�ins Gradma�umwandeln!!! */
-                    A = 0.5 * a * b * sin(gamma/360*(2*PI));
+                    gamma = acos ((a*a + b*b - c*c)/(2*a*b)) / (2*M_PI) * 360;  /* \
vom Bogenma�ins Gradma�umwandeln!!! */ +                    A = 0.5 * a * b * \
sin(gamma/360*(2*M_PI));  U = a+b+c;
                     h = 2*A/c;


[prev in list] [next in list] [prev in thread] [next in thread]