mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for visibility tracking and allow manual entry air temp

Browse source 
Turns out we had a data field for visibility as a length unit - but never
used it. I can never guess how much visibility we actually had on a dive -
but I think most everyone can assign a rating between abysmal (zero stars,
"I couldn't read my dive computer even right in front of my mask" - trust
me, I had some of those dives) to amazing ("five stars, I could see farther
than I though possible" - and I had one or two of those, too). So I
changed this to an integer and am re-using the star infrastructure we have
for the overall dive rating.

When displaying this I was dismayed that we are running out of space in
the "Dive Notes" notbook. So I moved this to the "Dive Info" notebook.
This is not consistent and not logical. I think we need to revisit the
notebooks and think about what we want to display where.

While adding the infrastructure to manually enter the visibility I went
ahead and added the ability to manually enter the air temperature as well
(that was one of the things missing in the previous commit).

Fixes #7

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-10-28 15:49:02 -07:00
parent 601ac0c362
commit 01f1ccff14
5 changed files with 74 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

60
info.c
View file

@ -238,6 +238,19 @@ static GtkEntry *text_value(GtkWidget *box, const char *label)
return GTK_ENTRY(widget);
}
static GtkEntry *single_text_entry(GtkWidget *box, const char *label, const char *text)
{
GtkEntry *entry;
GtkWidget *frame = gtk_frame_new(label);
gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
entry = GTK_ENTRY(gtk_entry_new());
gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(entry));
if (text && *text)
gtk_entry_set_text(entry, text);
return entry;
}
static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions, const char *text)
{
GtkEntry *entry;
@ -387,7 +400,8 @@ static int get_rating(const char *string)
}
struct dive_info {
GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit;
GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit, *viz;
GtkEntry *airtemp;
GtkTextView *notes;
};
@ -395,6 +409,7 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc
{
char *old_text, *new_text;
char *rating_string;
double newtemp;
int changed = 0;
new_text = get_combo_box_entry_text(info->location, &dive->location, master->location);
@ -429,6 +444,33 @@ static void save_dive_info_changes(struct dive *dive, struct dive *master, struc
}
free(rating_string);
rating_string = strdup(star_strings[dive->visibility]);
new_text = get_combo_box_entry_text(info->viz, &rating_string, star_strings[master->visibility]);
if (new_text) {
dive->visibility = get_rating(rating_string);
changed = 1;
}
free(rating_string);
new_text = (char *)gtk_entry_get_text(info->airtemp);
if(sscanf(new_text, "%lf", &newtemp) == 1) {
unsigned long mkelvin;
switch (output_units.temperature) {
case CELSIUS:
mkelvin = C_to_mkelvin(newtemp);
break;
case FAHRENHEIT:
mkelvin = F_to_mkelvin(newtemp);
break;
default:
mkelvin = 0;
}
if (mkelvin != dive->airtemp.mkelvin) {
dive->airtemp.mkelvin = mkelvin;
changed = 1;
}
}
if (info->notes) {
old_text = dive->notes;
dive->notes = get_text(info->notes);
@ -465,6 +507,9 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
{
GtkWidget *hbox, *label, *frame, *equipment;
char buffer[128];
char airtemp[6];
const char *unit;
double value;
snprintf(buffer, sizeof(buffer), "%s", _("Edit multiple dives"));
@ -487,6 +532,19 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
info->rating = text_entry(hbox, _("Rating"), star_list, star_strings[dive->rating]);
info->suit = text_entry(hbox, _("Suit"), suit_list, dive->suit);
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
info->viz = text_entry(hbox, _("Visibility"), star_list, star_strings[dive->visibility]);
value = get_temp_units(dive->airtemp.mkelvin, &unit);
snprintf(buffer, sizeof(buffer), _("Air Temp in %s"), unit);
if (dive->airtemp.mkelvin)
snprintf(airtemp, sizeof(airtemp), "%.1f", value);
else
airtemp[0] = '\0';
info->airtemp = single_text_entry(hbox, buffer, airtemp);
/* only show notes if editing a single dive */
if (multi) {
info->notes = NULL;