[tor-commits] [arm/release] fix: Graph wasn't able to be paused
atagar at torproject.org
atagar at torproject.org
Sun Jul 17 06:08:20 UTC 2011
commit 13c7bd39c0d5459dc90b0903e6c2b16a27e17859
Author: Damian Johnson <atagar at torproject.org>
Date: Fri May 20 17:02:17 2011 -0700
fix: Graph wasn't able to be paused
When paused the graph would look paused, but if the screen was redrawn (such
as by switching pages or resizing) then the graph would update. The reason for
this was that the pause buffer was updating just like the primary instance.
---
src/cli/graphing/graphPanel.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py
index 615118a..b48f82b 100644
--- a/src/cli/graphing/graphPanel.py
+++ b/src/cli/graphing/graphPanel.py
@@ -72,6 +72,7 @@ class GraphStats(TorCtl.PostEventListener):
# panel to be redrawn when updated (set when added to GraphPanel)
self._graphPanel = None
self.isSelected = False
+ self.isPauseBuffer = False
# tracked stats
self.tick = 0 # number of processed events
@@ -114,6 +115,7 @@ class GraphStats(TorCtl.PostEventListener):
newCopy.maxSecondary = dict(self.maxSecondary)
newCopy.primaryCounts = copy.deepcopy(self.primaryCounts)
newCopy.secondaryCounts = copy.deepcopy(self.secondaryCounts)
+ newCopy.isPauseBuffer = True
return newCopy
def eventTick(self):
@@ -187,7 +189,7 @@ class GraphStats(TorCtl.PostEventListener):
pass
def bandwidth_event(self, event):
- self.eventTick()
+ if not self.isPauseBuffer: self.eventTick()
def _processEvent(self, primary, secondary):
"""
@@ -422,7 +424,6 @@ class GraphPanel(panel.Panel):
"""
stats._graphPanel = self
- stats.isPaused = True
self.stats[label] = stats
def setStats(self, label):
@@ -444,5 +445,5 @@ class GraphPanel(panel.Panel):
if attr == "stats":
# uses custom clone method to copy GraphStats instances
return dict([(key, self.stats[key].clone()) for key in self.stats])
- else: return panel.Panel.copyAttr(self, isPause)
+ else: return panel.Panel.copyAttr(self, attr)
More information about the tor-commits
mailing list