From 230e32592636776ac911283b85f5e17ed2f7375c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Fri, 10 Oct 2008 23:20:59 +0000
Subject: [PATCH] * The network usage data sources are now actually using a
 single scale as   intended before. * Also found a bug in the scales that
 prevented them from working.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27962 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/activitymonitor/ActivityView.cpp | 2 +-
 src/apps/activitymonitor/DataSource.cpp   | 7 +++++++
 src/apps/activitymonitor/DataSource.h     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/apps/activitymonitor/ActivityView.cpp b/src/apps/activitymonitor/ActivityView.cpp
index a457adad3d..30073d867e 100644
--- a/src/apps/activitymonitor/ActivityView.cpp
+++ b/src/apps/activitymonitor/ActivityView.cpp
@@ -115,7 +115,7 @@ Scale::Update(int64 value)
 {
 	if (!fInitialized || fMinimumValue > value)
 		fMinimumValue = value;
-	if (!fInitialized || fMaximumValue > value)
+	if (!fInitialized || fMaximumValue < value)
 		fMaximumValue = value;
 
 	fInitialized = true;
diff --git a/src/apps/activitymonitor/DataSource.cpp b/src/apps/activitymonitor/DataSource.cpp
index 1e1804350d..dfbdfb11b9 100644
--- a/src/apps/activitymonitor/DataSource.cpp
+++ b/src/apps/activitymonitor/DataSource.cpp
@@ -1066,6 +1066,13 @@ NetworkUsageDataSource::AdaptiveScale() const
 }
 
 
+scale_type
+NetworkUsageDataSource::ScaleType() const
+{
+	return kBytePerSecondScale;
+}
+
+
 bool
 NetworkUsageDataSource::Primary() const
 {
diff --git a/src/apps/activitymonitor/DataSource.h b/src/apps/activitymonitor/DataSource.h
index bdef9b4dc7..965b8bddd1 100644
--- a/src/apps/activitymonitor/DataSource.h
+++ b/src/apps/activitymonitor/DataSource.h
@@ -267,6 +267,7 @@ public:
 	virtual const char*	Name() const;
 	virtual const char*	Label() const;
 	virtual bool		AdaptiveScale() const;
+	virtual scale_type	ScaleType() const;
 	virtual bool		Primary() const;
 
 private: