From 80d74fd5902fb2e2a569a28a8317992358a6b302 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 20 Jan 2022 11:03:57 -0500 Subject: [PATCH] Clear the tracker data point also when clearing graphs --- history.txt | 5 +++++ src/net/i2p/itoopie/gui/OverviewTab.java | 10 ++-------- src/net/i2p/itoopie/gui/component/BandwidthChart.java | 11 +++++++++++ .../gui/component/ParticipatingTunnelsChart.java | 10 ++++++++++ .../gui/component/chart/DummyDataCollector.java | 5 +++++ .../gui/component/chart/InboundBandwidthTracker.java | 5 +++++ .../gui/component/chart/OutboundBandwidthTracker.java | 5 +++++ .../component/chart/ParticipatingTunnelsTracker.java | 5 +++++ .../itoopie/gui/component/chart/RateStatTracker.java | 5 +++++ src/net/i2p/itoopie/gui/component/chart/Tracker.java | 2 ++ 10 files changed, 55 insertions(+), 8 deletions(-) diff --git a/history.txt b/history.txt index 426bdfb9a..dc8ae9999 100644 --- a/history.txt +++ b/history.txt @@ -5,6 +5,8 @@ * Layout fixes and adjustments * Fixes for long translated strings * Fixes for i2pd + * Fix IPv6 address host + * Fix tray icon on Gnome * Graph adjustments * Localize time format on graphs * Move Settings from a popup frame to a new tab @@ -15,9 +17,12 @@ * Clear graph after changing router host/port * Don't clear graph when user closes the window * Update to jchart2d 3.2.2 2011-09-25 + * Disable reseed monitor * Remove debug output + * Refactoring * README updates * Pulled in new and updated translations + * Preliminary changes for plugin version 0.0.3 - 2015-03-02 diff --git a/src/net/i2p/itoopie/gui/OverviewTab.java b/src/net/i2p/itoopie/gui/OverviewTab.java index 191d013f9..4693f5a14 100644 --- a/src/net/i2p/itoopie/gui/OverviewTab.java +++ b/src/net/i2p/itoopie/gui/OverviewTab.java @@ -4,8 +4,6 @@ import java.awt.Color; import java.awt.EventQueue; import java.util.EnumMap; -import info.monitorenter.gui.chart.Chart2D; -import info.monitorenter.gui.chart.ITrace2D; import info.monitorenter.gui.chart.views.ChartPanel; import javax.swing.BorderFactory; @@ -166,12 +164,8 @@ public class OverviewTab extends TabLogoPanel { * @since 0.0.4 */ public void clearGraphs() { - for (ITrace2D trace : bwChart.getTraces()) { - trace.removeAllPoints(); - } - for (ITrace2D trace : partTunnelChart.getTraces()) { - trace.removeAllPoints(); - } + bwChart.clearData(); + partTunnelChart.clearData(); } private void populateInfo(){ diff --git a/src/net/i2p/itoopie/gui/component/BandwidthChart.java b/src/net/i2p/itoopie/gui/component/BandwidthChart.java index 4893871cc..9d4ed0ae7 100644 --- a/src/net/i2p/itoopie/gui/component/BandwidthChart.java +++ b/src/net/i2p/itoopie/gui/component/BandwidthChart.java @@ -90,6 +90,17 @@ public class BandwidthChart extends Chart2D{ bwOutAdapter = new ObjRecorder2Trace2DAdapter(dataBWOut, bwOutTracker, "m_value", updateInterval/2); } + /** + * @since 0.0.4 + */ + public void clearData() { + bwInTracker.clearData(); + bwOutTracker.clearData(); + for (ITrace2D trace : getTraces()) { + trace.removeAllPoints(); + } + } + @Override public void destroy() { bwInTracker.kill(); diff --git a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java index a6a856cc2..f9e7d5afa 100644 --- a/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java +++ b/src/net/i2p/itoopie/gui/component/ParticipatingTunnelsChart.java @@ -76,6 +76,16 @@ public class ParticipatingTunnelsChart extends Chart2D { partTunnelAdapter = new ObjRecorder2Trace2DAdapter(dataPartTunnels, partTunnelTracker, "m_value", updateInterval/2); } + /** + * @since 0.0.4 + */ + public void clearData() { + partTunnelTracker.clearData(); + for (ITrace2D trace : getTraces()) { + trace.removeAllPoints(); + } + } + @Override public void destroy() { partTunnelTracker.kill(); diff --git a/src/net/i2p/itoopie/gui/component/chart/DummyDataCollector.java b/src/net/i2p/itoopie/gui/component/chart/DummyDataCollector.java index 849ebabf4..79b99235a 100644 --- a/src/net/i2p/itoopie/gui/component/chart/DummyDataCollector.java +++ b/src/net/i2p/itoopie/gui/component/chart/DummyDataCollector.java @@ -66,4 +66,9 @@ public class DummyDataCollector extends Thread implements Tracker { * @since 0.0.4 */ public double getData() { return m_number; } + + /** + * @since 0.0.4 + */ + public void clearData() { m_number = 0; } } diff --git a/src/net/i2p/itoopie/gui/component/chart/InboundBandwidthTracker.java b/src/net/i2p/itoopie/gui/component/chart/InboundBandwidthTracker.java index ac9b2aa0d..e8130b562 100644 --- a/src/net/i2p/itoopie/gui/component/chart/InboundBandwidthTracker.java +++ b/src/net/i2p/itoopie/gui/component/chart/InboundBandwidthTracker.java @@ -71,4 +71,9 @@ public class InboundBandwidthTracker extends Thread implements Tracker { * @since 0.0.4 */ public double getData() { return m_value; } + + /** + * @since 0.0.4 + */ + public void clearData() { m_value = 0; } } diff --git a/src/net/i2p/itoopie/gui/component/chart/OutboundBandwidthTracker.java b/src/net/i2p/itoopie/gui/component/chart/OutboundBandwidthTracker.java index d1f5630f6..497c7b7f7 100644 --- a/src/net/i2p/itoopie/gui/component/chart/OutboundBandwidthTracker.java +++ b/src/net/i2p/itoopie/gui/component/chart/OutboundBandwidthTracker.java @@ -70,4 +70,9 @@ public class OutboundBandwidthTracker extends Thread implements Tracker { * @since 0.0.4 */ public double getData() { return m_value; } + + /** + * @since 0.0.4 + */ + public void clearData() { m_value = 0; } } diff --git a/src/net/i2p/itoopie/gui/component/chart/ParticipatingTunnelsTracker.java b/src/net/i2p/itoopie/gui/component/chart/ParticipatingTunnelsTracker.java index cef0f81e9..ad91cda34 100644 --- a/src/net/i2p/itoopie/gui/component/chart/ParticipatingTunnelsTracker.java +++ b/src/net/i2p/itoopie/gui/component/chart/ParticipatingTunnelsTracker.java @@ -71,4 +71,9 @@ public class ParticipatingTunnelsTracker extends Thread implements Tracker { * @since 0.0.4 */ public double getData() { return m_value; } + + /** + * @since 0.0.4 + */ + public void clearData() { m_value = 0; } } diff --git a/src/net/i2p/itoopie/gui/component/chart/RateStatTracker.java b/src/net/i2p/itoopie/gui/component/chart/RateStatTracker.java index 852cb0ee0..40d26a910 100644 --- a/src/net/i2p/itoopie/gui/component/chart/RateStatTracker.java +++ b/src/net/i2p/itoopie/gui/component/chart/RateStatTracker.java @@ -60,4 +60,9 @@ public class RateStatTracker extends Thread implements Tracker { * @since 0.0.4 */ public double getData() { return m_value; } + + /** + * @since 0.0.4 + */ + public void clearData() { m_value = 0; } } diff --git a/src/net/i2p/itoopie/gui/component/chart/Tracker.java b/src/net/i2p/itoopie/gui/component/chart/Tracker.java index d9ba7544f..a4f94d8e0 100644 --- a/src/net/i2p/itoopie/gui/component/chart/Tracker.java +++ b/src/net/i2p/itoopie/gui/component/chart/Tracker.java @@ -6,4 +6,6 @@ package net.i2p.itoopie.gui.component.chart; public interface Tracker { public double getData(); + + public void clearData(); }