Rename 'cylinder.c' as 'equipment.c'

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 94dcd34858b11f687d8f8807e888a50254990fc8..9cb048b808fbba20b8ed5b1daa0bfc4a700abaa8 100644 (file)
--- a/info.c
+++ b/info.c
@@ -11,7 +11,6 @@ static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locatio
 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)
 {
@@ -31,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;
 
@@ -49,15 +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;
-
        if (!dive) {
                gtk_label_set_text(GTK_LABEL(divedate), "no dive");
                gtk_label_set_text(GTK_LABEL(divetime), "");
@@ -78,9 +72,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),
@@ -89,10 +92,25 @@ 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 ? : "";
@@ -193,6 +211,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;
 }