comparison base/ScaleTickIntervals.h @ 1468:5f23274e21f9

Commit some extra debug, trying to narrow down Travis failure case

 
 #include "LogRange.h"
 #include "Debug.h"
 
 // Can't have this on by default, as we're called on every refresh
-//#define DEBUG_SCALE_TICK_INTERVALS 1
+#define DEBUG_SCALE_TICK_INTERVALS 1
 
 class ScaleTickIntervals
 {
 public:
     struct Range {

         } else {
             prec = precRange;
         }
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "ScaleTickIntervals: calculating linearInstruction" << endl
+        SVCERR << "ScaleTickIntervals: calculating linearInstruction" << endl
                 << "ScaleTickIntervals: min = " << r.min << ", max = " << r.max
                 << ", n = " << r.n << ", inc = " << inc << endl;
-        SVDEBUG << "ScaleTickIntervals: digMax = " << digMax
+        SVCERR << "ScaleTickIntervals: digMax = " << digMax
                 << ", digInc = " << digInc << endl;
-        SVDEBUG << "ScaleTickIntervals: display = " << display
+        SVCERR << "ScaleTickIntervals: display = " << display
                 << ", inc = " << inc << ", precInc = " << precInc
                 << ", precRange = " << precRange
                 << ", prec = " << prec << ", roundTo = " << roundTo
                 << endl;
 #endif

             if (inc < roundTo) inc = roundTo;
             min = ceil(min / roundTo - eps) * roundTo;
             if (min > r.max) min = r.max;
             if (min == -0.0) min = 0.0;
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-            SVDEBUG << "ScaleTickIntervals: rounded inc to " << inc
+            SVCERR << "ScaleTickIntervals: rounded inc to " << inc
                     << " and min to " << min << endl;
 #endif
         }
 
         if (display == Scientific && min != 0.0) {
             double digNewMin = log10(fabs(min));
             if (digNewMin < digInc) {
                 prec = int(ceil(digMax - digNewMin));
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-                SVDEBUG << "ScaleTickIntervals: min is smaller than increment, adjusting prec to " << prec << endl;
+                SVCERR << "ScaleTickIntervals: min is smaller than increment, adjusting prec to " << prec << endl;
 #endif
             }
         }
         
         return { min, r.max, inc, roundTo, display, prec, false };

     static Instruction logInstruction(Range r)
     {
         Display display = Auto;
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "ScaleTickIntervals::logInstruction: Range is "
+        SVCERR << "ScaleTickIntervals::logInstruction: Range is "
                 << r.min << " to " << r.max << endl;
 #endif
         
         if (r.n < 1) {
             return {};

         }
         
         double inc = (r.max - r.min) / r.n;
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "ScaleTickIntervals::logInstruction: "
+        SVCERR << "ScaleTickIntervals::logInstruction: "
                 << "Naive increment is " << inc << endl;
 #endif
 
         int precision = 1;
 

 
         inc = round(inc / roundIncTo) * roundIncTo;
         if (inc < roundIncTo) inc = roundIncTo;
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "ScaleTickIntervals::logInstruction: "
+        SVCERR << "ScaleTickIntervals::logInstruction: "
                 << "Rounded increment to " << inc << endl;
 #endif
 
         // if inc is close to giving us powers of two, nudge it
         if (fabs(inc - 0.301) < 0.01) {
             inc = log10(2.0);
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-            SVDEBUG << "ScaleTickIntervals::logInstruction: "
+            SVCERR << "ScaleTickIntervals::logInstruction: "
                     << "Nudged increment to " << inc << " to get powers of two"
                     << endl;
 #endif
         }
 

             
             int digits = (value != 0.0 ?
                           1 + int(floor(eps + log10(abs(value)))) :
                           0);
 
+#ifdef DEBUG_SCALE_TICK_INTERVALS
+            SVCERR << "makeTick: display = Auto, precision = "
+                   << precision << ", value = " << value
+                   << ", resulting digits = " << digits << endl;
+#endif
+            
             // This is not the same logic as %g uses for determining
             // whether to delegate to use scientific or fixed notation
 
             if (digits < -3 || digits > 4) {
 

 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
         
         snprintf(buffer, buflen, spec, precision, value);
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "makeTick: spec = \"" << spec
+        SVCERR << "makeTick: spec = \"" << spec
                 << "\", prec = " << precision << ", value = " << value
                 << ", label = \"" << buffer << "\"" << endl;
 #endif
         
         return Tick({ value, std::string(buffer) });
     }
     
     static Ticks explode(Instruction instruction) {
 
 #ifdef DEBUG_SCALE_TICK_INTERVALS
-        SVDEBUG << "ScaleTickIntervals::explode:" << endl
+        SVCERR << "ScaleTickIntervals::explode:" << endl
                 << "initial = " << instruction.initial
                 << ", limit = " << instruction.limit
                 << ", spacing = " << instruction.spacing
                 << ", roundTo = " << instruction.roundTo
                 << ", display = " << instruction.display