X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=b65a82081cc51a061326a964a0f3b551368ad43e;hb=0282d515db875cee0139e121db13084be0caac82;hp=c3b51409155c8d42202be54a9b88d46a1f371376;hpb=6b075e0339f419555f08ece3a6c4a29407ecc32b;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index c3b5140..b65a820 100644
--- a/info.c
+++ b/info.c
@@ -5,12 +5,12 @@
 
 #include "dive.h"
 #include "display.h"
+#include "divelist.h"
 
 static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
 static GtkEntry *location;
 static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
-static struct dive *buffered_dive;
 
 static const char *weekday(int wday)
 {
@@ -30,10 +30,8 @@ static char *get_text(GtkTextBuffer *buffer)
 	return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 }
 
-void flush_dive_info_changes(void)
+void flush_dive_info_changes(struct dive *dive)
 {
-	struct dive *dive = buffered_dive;
-
 	if (!dive)
 		return;
 
@@ -48,14 +46,12 @@ void flush_dive_info_changes(void)
 	}
 }
 
-void update_dive_info(struct dive *dive)
+void show_dive_info(struct dive *dive)
 {
 	struct tm *tm;
 	char buffer[80];
 	char *text;
-
-	flush_dive_info_changes();
-	buffered_dive = dive;
+	int len;
 
 	if (!dive) {
 		gtk_label_set_text(GTK_LABEL(divedate), "no dive");
@@ -77,9 +73,18 @@ void update_dive_info(struct dive *dive)
 		tm->tm_hour, tm->tm_min, tm->tm_sec);
 	gtk_label_set_text(GTK_LABEL(divetime), buffer);
 
-	snprintf(buffer, sizeof(buffer),
-		"%d ft",
-		to_feet(dive->maxdepth));
+	switch (output_units.length) {
+	case METERS:
+		snprintf(buffer, sizeof(buffer),
+			"%.1f m",
+			dive->maxdepth.mm / 1000.0);
+		break;
+	case FEET:
+		snprintf(buffer, sizeof(buffer),
+			"%d ft",
+			to_feet(dive->maxdepth));
+		break;
+	}
 	gtk_label_set_text(GTK_LABEL(depth), buffer);
 
 	snprintf(buffer, sizeof(buffer),
@@ -88,15 +93,35 @@ void update_dive_info(struct dive *dive)
 	gtk_label_set_text(GTK_LABEL(duration), buffer);
 
 	*buffer = 0;
-	if (dive->watertemp.mkelvin)
-		snprintf(buffer, sizeof(buffer),
-			"%d C",
-			to_C(dive->watertemp));
+	if (dive->watertemp.mkelvin) {
+		switch (output_units.temperature) {
+		case CELSIUS:
+			snprintf(buffer, sizeof(buffer),
+				"%d C",
+				to_C(dive->watertemp));
+			break;
+		case FAHRENHEIT:
+			snprintf(buffer, sizeof(buffer),
+				"%d F",
+				to_F(dive->watertemp));
+			break;
+		case KELVIN:
+			snprintf(buffer, sizeof(buffer),
+				"%d K",
+				to_K(dive->watertemp));
+			break;
+		}
+	}
 	gtk_label_set_text(GTK_LABEL(temperature), buffer);
 
 	text = dive->location ? : "";
 	gtk_entry_set_text(location, text);
-	gtk_label_set_text(GTK_LABEL(locationnote), text);
+
+	len = 0;
+	if (dive->number)
+		len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number);
+	snprintf(buffer+len, sizeof(buffer)-len, "%s", text);
+	gtk_label_set_text(GTK_LABEL(locationnote), buffer);
 
 	text = dive->notes ? : "";
 	gtk_text_buffer_set_text(notes, text, -1);
@@ -192,6 +217,6 @@ GtkWidget *extended_dive_info_widget(void)
 	notes = text_view(vbox, "Notes", TRUE);
 
 	/* Add extended info here: name, description, yadda yadda */
-	update_dive_info(current_dive);
+	show_dive_info(current_dive);
 	return vbox;
 }