Improve the drag icon for processor drags.

[ardour.git] / libs / pbd / cartesian.cc

diff --git a/libs/pbd/cartesian.cc b/libs/pbd/cartesian.cc
index 0a84fa6bbc5263774815b3a74be95db644a6618f..c09e00b189b742ed6ab7ecd1dec3f623f6f0913f 100644 (file)
--- a/libs/pbd/cartesian.cc
+++ b/libs/pbd/cartesian.cc
@@ -17,58 +17,65 @@
 */
 
 #include <iostream>
-#include <cmath>
+#include <math.h>
+
 #include "pbd/cartesian.h"
 
+using namespace std;
+
 void
 PBD::azi_ele_to_cart (double azi, double ele, double& x, double& y, double& z)
 {
-        static const double atorad = 2.0 * M_PI / 360.0 ;
-        x = cos (azi * atorad) * cos (ele * atorad);
-        y = sin (azi * atorad) * cos (ele * atorad);
-        z = sin (ele * atorad);
+       /* convert from cylindrical coordinates in degrees to cartesian */
+
+       static const double atorad = 2.0 * M_PI / 360.0 ;
+
+       x = cos (azi * atorad) * cos (ele * atorad);
+       y = sin (azi * atorad) * cos (ele * atorad);
+       z = sin (ele * atorad);
 }
 
 void 
 PBD::cart_to_azi_ele (double x, double y, double z, double& azimuth, double& elevation)
 {
-        /* converts cartesian coordinates to angular */
-        const double atorad = 2.0 * M_PI / 360.0;
-        double atan_y_per_x, atan_x_pl_y_per_z;
-        double distance;
-
-        if(x == 0.0) {
-                atan_y_per_x = M_PI / 2;
-        } else {
-                atan_y_per_x = atan (y/x);
-        }
-
-        azimuth = atan_y_per_x / atorad;
-
-        if (x < 0.0) {
-                azimuth += 180.0;
-        }
-
-        distance = sqrt (x*x + y*y);
-
-        if (z == 0.0) {
-                atan_x_pl_y_per_z = 0.0;
-        } else {
-                atan_x_pl_y_per_z = atan (z/distance);
-        }
-
-        if (distance == 0.0) {
-                if (z < 0.0) {
-                        atan_x_pl_y_per_z = -M_PI/2.0;
-                } else {
-                        atan_x_pl_y_per_z = M_PI/2.0;
-                }
-        }
-
-        elevation = atan_x_pl_y_per_z / atorad;
-
-        std::cerr << x << ", " << y << ", " << z << " = " << azimuth << " /= " << elevation << std::endl;
-
-        // distance = sqrtf (x*x + y*y + z*z);
+       /* converts cartesian coordinates to cylindrical in degrees*/
+
+       const double atorad = 2.0 * M_PI / 360.0;
+       double atan_y_per_x, atan_x_pl_y_per_z;
+       double distance;
+
+       if (x == 0.0) {
+               atan_y_per_x = M_PI / 2;
+       } else {
+               atan_y_per_x = atan2 (y,x);
+       }
+
+       if (y < 0.0) {
+               /* below x-axis: atan2 returns 0 .. -PI (negative) so convert to degrees and ADD to 180 */
+               azimuth = 180.0 + (atan_y_per_x / (M_PI/180.0) + 180.0);
+       } else {
+               /* above x-axis: atan2 returns 0 .. +PI so convert to degrees */
+               azimuth = atan_y_per_x / atorad;
+       }
+
+       distance = sqrt (x*x + y*y);
+
+       if (z == 0.0) {
+               atan_x_pl_y_per_z = 0.0;
+       } else {
+               atan_x_pl_y_per_z = atan2 (z,distance);
+       }
+
+       if (distance == 0.0) {
+               if (z < 0.0) {
+                       atan_x_pl_y_per_z = -M_PI/2.0;
+               } else if (z > 0.0) {
+                       atan_x_pl_y_per_z = M_PI/2.0;
+               }
+       }
+
+       elevation = atan_x_pl_y_per_z / atorad;
+
+       // distance = sqrtf (x*x + y*y + z*z);
 }