From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Aug 2011 21:35:31 +0000 (-0700)
Subject: dive profile plot: use saner minimum limits
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ee56021dfbc3bcc12f5917cdf481cc96c51a2b89;p=ext%2Fsubsurface.git

dive profile plot: use saner minimum limits

The time minimum was in seconds, not minutes, and we really do want to
show at least to 90ft to make shallow dives look shallow rather than
scaled to some full depth.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/profile.c b/profile.c
index b675570..f898be7 100644
--- a/profile.c
+++ b/profile.c
@@ -8,16 +8,21 @@
 int selected_dive = 0;
 
 #define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
 
+/*
+ * When showing dive profiles, we scale things to the
+ * current dive. However, we don't scale past less than
+ * 30 minutes or 90 ft, just so that small dives show
+ * up as such.
+ */
 static int round_seconds_up(int seconds)
 {
-	return MAX(30, ROUND_UP(seconds, 60*10));
+	return MAX(30*60, ROUND_UP(seconds, 60*10));
 }
 
 static int round_feet_up(int feet)
 {
-	return MAX(45, ROUND_UP(feet+5, 15));
+	return MAX(90, ROUND_UP(feet+5, 15));
 }
 
 /* Scale to 0,0 -> maxx,maxy */