From f9c4959578b313af05d3ffef27b49d53f3bf8feb Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 21 Apr 2016 09:53:00 -0700
Subject: [PATCH] remove some debugging, tweak formatting

---
 libraries/networking/src/NodeList.cpp     | 2 +-
 libraries/octree/src/OctreeSceneStats.cpp | 2 +-
 libraries/shared/src/SharedUtil.cpp       | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 359ce6ac86..25dfe884db 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -158,7 +158,7 @@ void NodeList::timePingReply(ReceivedMessage& message, const SharedNodePointer&
     sendingNode->setPingMs(pingTime / 1000);
     sendingNode->updateClockSkewUsec(clockSkew);
 
-    const bool wantDebug = true;
+    const bool wantDebug = false;
 
     if (wantDebug) {
         auto averageClockSkew = sendingNode->getClockSkewUsec();
diff --git a/libraries/octree/src/OctreeSceneStats.cpp b/libraries/octree/src/OctreeSceneStats.cpp
index 7282f26181..578d35b687 100644
--- a/libraries/octree/src/OctreeSceneStats.cpp
+++ b/libraries/octree/src/OctreeSceneStats.cpp
@@ -747,7 +747,7 @@ const char* OctreeSceneStats::getItemValue(Item item) {
 }
 
 void OctreeSceneStats::trackIncomingOctreePacket(ReceivedMessage& message, bool wasStatsPacket, qint64 nodeClockSkewUsec) {
-    const bool wantExtraDebugging = true;
+    const bool wantExtraDebugging = false;
 
     // skip past the flags
     message.seek(sizeof(OCTREE_PACKET_FLAGS));
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index bce6d3e2fc..580f23c0d9 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -624,9 +624,10 @@ void debug::checkDeadBeef(void* memoryVoid, int size) {
 QString formatUsecTime(quint64 usecs, int prec) {
     static const quint64 USECS_PER_MINUTE = USECS_PER_SECOND * 60;
     static const quint64 USECS_PER_HOUR = USECS_PER_MINUTE * 60;
+    static const quint64 TWO_HOURS = USECS_PER_HOUR * 2;
 
     QString result;
-    if (usecs > USECS_PER_HOUR) {
+    if (usecs > TWO_HOURS) {
         result = QString::number(usecs / USECS_PER_HOUR) + "hrs";
     } else if (usecs > USECS_PER_MINUTE) {
         result = QString::number(usecs / USECS_PER_MINUTE) + "min";
@@ -645,8 +646,9 @@ QString formatUsecTime(qint64 usecs, int prec) {
     static const qint64 USECS_PER_SECOND = 1000 * USECS_PER_MSEC;
     static const qint64 USECS_PER_MINUTE = USECS_PER_SECOND * 60;
     static const qint64 USECS_PER_HOUR = USECS_PER_MINUTE * 60;
+    static const qint64 TWO_HOURS = USECS_PER_HOUR * 2;
     QString result;
-    if (usecs > USECS_PER_HOUR) {
+    if (usecs > TWO_HOURS || usecs < -TWO_HOURS) {
         result = QString::number(usecs / USECS_PER_HOUR) + "hrs";
     } else if (usecs > USECS_PER_MINUTE || usecs < -USECS_PER_MINUTE) {
         result = QString::number(usecs / USECS_PER_MINUTE) + "min";
@@ -669,8 +671,9 @@ QString formatUsecTime(double usecs, int prec) {
     static const double USECS_PER_SECOND = 1000.0 * USECS_PER_MSEC;
     static const double USECS_PER_MINUTE = USECS_PER_SECOND * 60.0;
     static const double USECS_PER_HOUR = USECS_PER_MINUTE * 60.0;
+    static const double TWO_HOURS = USECS_PER_HOUR * 2;
     QString result;
-    if (usecs > USECS_PER_HOUR || usecs < -USECS_PER_HOUR) {
+    if (usecs > TWO_HOURS || usecs < -TWO_HOURS) {
         result = QString::number(usecs / USECS_PER_HOUR, 'f', prec) + "hrs";
     } else if (usecs > USECS_PER_MINUTE || usecs < -USECS_PER_MINUTE) {
         result = QString::number(usecs / USECS_PER_MINUTE, 'f', prec) + "min";