[or-cvs] r23254: {arm} fix: dropping intermediate graph bounds if they match the mi (in arm/trunk: . src/interface/graphing)

[Damian Johnson]

Author: atagar
Date: 2010-09-20 16:45:04 +0000 (Mon, 20 Sep 2010)
New Revision: 23254

Modified:
   arm/trunk/TODO
   arm/trunk/src/interface/graphing/graphPanel.py
Log:
fix: dropping intermediate graph bounds if they match the min or max bound (they're useless in this case)



Modified: arm/trunk/TODO
===================================================================
--- arm/trunk/TODO	2010-09-20 16:06:20 UTC (rev 23253)
+++ arm/trunk/TODO	2010-09-20 16:45:04 UTC (rev 23254)
@@ -84,6 +84,10 @@
   * conn panel:
     * *never* do reverse dns lookups for first hops (could be resolving via
       tor and hence leaking to the exit)
+    * If there's duplicate family entries (and harder case: both nickname and
+      fingerprint entries for the same relay) then the duplicate should be
+      removed. This is also causing a bad scrolling bug where the cursor can't
+      get past the pair of duplicate entries.
     * revise multikey sort of connections
         Currently using a pretty ugly hack. Look at:
         http://www.velocityreviews.com/forums/

Modified: arm/trunk/src/interface/graphing/graphPanel.py
===================================================================
--- arm/trunk/src/interface/graphing/graphPanel.py	2010-09-20 16:06:20 UTC (rev 23253)
+++ arm/trunk/src/interface/graphing/graphPanel.py	2010-09-20 16:45:04 UTC (rev 23254)
@@ -328,11 +328,11 @@
           
           if primaryMinBound != primaryMaxBound:
             primaryVal = (primaryMaxBound - primaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1)
-            self.addstr(row + 2, 0, "%4i" % primaryVal, primaryColor)
+            if not primaryVal in (primaryMinBound, primaryMaxBound): self.addstr(row + 2, 0, "%4i" % primaryVal, primaryColor)
           
           if secondaryMinBound != secondaryMaxBound:
             secondaryVal = (secondaryMaxBound - secondaryMinBound) / (self.graphHeight - 1) * (self.graphHeight - row - 1)
-            self.addstr(row + 2, graphCol + 5, "%4i" % secondaryVal, secondaryColor)
+            if not secondaryVal in (secondaryMinBound, secondaryMaxBound): self.addstr(row + 2, graphCol + 5, "%4i" % secondaryVal, secondaryColor)
       
       # creates bar graph (both primary and secondary)
       for col in range(graphCol):