Changeset 303 for cpp

Timestamp:

01/21/15 13:05:54 (10 years ago)

Author:

Maciej Komosinski

Message:

Improved error messages

File:

• cpp/frams/util/3d.cpp (modified) (7 diffs)

cpp/frams/util/3d.cpp

@@ -17 +17 @@
 {
         double q = x*x + y*y + z*z;
-        if (q < 0) { if (report_errors) FramMessage("Pt3D", "operator()", "sqrt domain error", 3); return 0; }
+        if (q < 0) { if (report_errors) FMprintf("Pt3D", "operator()", FMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
 }
@@ -24 +24 @@
 {
         double len = length();
-        if (fabs(len) < 1e-50) { if (report_errors) FramMessage("Pt3D", "normalize()", "vector too small", 1); x = 1; y = 0; z = 0; return false; }
+        if (fabs(len) < 1e-50) { if (report_errors) FMprintf("Pt3D", "normalize()", FMLV_WARN, "vector[%g,%g,%g] too small", x, y, z); x = 1; y = 0; z = 0; return false; }
         operator/=(len);
         return true;
@@ -41 +41 @@
 Orient Orient_1(Pt3D(1, 0, 0), Pt3D(0, 1, 0), Pt3D(0, 0, 1));
 
-// prosty obrot
+// simple rotation
 void rotate2D(double k, double &x, double &y)
 {
@@ -64 +64 @@
         Pt3D    t1(X), t2(dir);
         if (getAngle(t1.x, t1.y, z)) // non-vertical
-        {       
+        {
                 rotate2D(-z, t1.x, t1.y);
                 rotate2D(-z, t2.x, t2.y);
@@ -70 +70 @@
         }
         else // vertical
-        {       
+        {
                 z = 0;
                 if (t1.z < 0)
@@ -120 +120 @@
         {
                 y.x = 0; y.y = -x.z; y.z = x.y; // (0,-z,y)
-        } 
+        }
         if ((ay <= ax) && (ay <= az)) // y
         {
                 y.x = -x.z; y.y = 0; y.z = x.x; // (-z,0,x)
-        } 
+        }
         else // z
         {
                 y.x = -x.y; y.y = x.x; y.z = 0; // (-y,x,0)
-        } 
+        }
         y.normalize();
         z.vectorProduct(x, y);
@@ -137 +137 @@
 {
         double q = x*x + y*y;
-        if (q < 0) { if (Pt3D::report_errors) FramMessage("", "d2()", "sqrt domain error", 3); return 0; }
+        if (q < 0) { if (Pt3D::report_errors) FMprintf("", "d2()", FMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
 }