Changeset 372 for cpp/frams/util/3d.cpp

Timestamp:

04/22/15 04:14:59 (9 years ago)

Author:

sz

Message:

Renamed some classes and functions to make their purpose more obvious:

• FramMessage?, FMprintf, etc. become Hmessage, Hprintf, etc... (H for handled message).
• ErrorManager? (and its family) becomes MessageHandler?. Handler names reflect their function better, e.g. MessageHandlerToStdout?.

All MessageHandlers? must now be given the explicit "Enable" argument if you want them to automatically become active. This makes side effects clearly visible.

File:

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

cpp/frams/util/3d.cpp

@@ -4 +4 @@
 
 #include <common/nonstd_math.h>
-#include <common/framsg.h>
+#include <common/hmessage.h>
 #include "3d.h"
 
@@ -17 +17 @@
 {
         double q = x*x + y*y + z*z;
-        if (q < 0) { if (report_errors) FMprintf("Pt3D", "operator()", FMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
+        if (q < 0) { if (report_errors) Hprintf("Pt3D", "operator()", HMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
 }
@@ -24 +24 @@
 {
         double len = length();
-        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; }
+        if (fabs(len) < 1e-50) { if (report_errors) Hprintf("Pt3D", "normalize()", HMLV_WARN, "vector[%g,%g,%g] too small", x, y, z); x = 1; y = 0; z = 0; return false; }
         operator/=(len);
         return true;
@@ -64 +64 @@
         if (dx == 0 && dy == 0)
         {
-                if (report_errors) FMprintf("Pt3D", "getAngle()", FMLV_WARN, "atan2(%g,%g)", dy, dx);
+                if (report_errors) Hprintf("Pt3D", "getAngle()", HMLV_WARN, "atan2(%g,%g)", dy, dx);
                 return 0; // incorrect result, but there is no correct one
         }
@@ -147 +147 @@
 {
         double q = x*x + y*y;
-        if (q < 0) { if (Pt3D::report_errors) FMprintf("", "d2()", FMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
+        if (q < 0) { if (Pt3D::report_errors) Hprintf("", "d2()", HMLV_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
 }