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

Pick GPS coordinates of dive location via map widget

Browse source 
I have some concerns about the way this is implemented - especially the
use of gtk_grab_add to make the map widget work has me worried. But it
seems to work and survived some test cases that I threw at it.

The GtkButton with the Pixmap looks a little off on my screen, but this
way it was easy to implement. Feel free to come up with a better design.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-01-28 07:54:30 -08:00
parent 075aba8f7d
commit 332d372b80
5 changed files with 136 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

63
info.c
View file

@ -520,6 +520,7 @@ static gboolean gps_changed(struct dive *dive, struct dive *master, const char *
struct dive_info {
GtkComboBoxEntry *location, *divemaster, *buddy, *rating, *suit, *viz;
GtkEntry *airtemp, *gps;
GtkWidget *gps_icon;
GtkTextView *notes;
};
@ -626,12 +627,52 @@ static void dive_trip_widget(GtkWidget *box, dive_trip_t *trip, struct dive_info
gtk_text_buffer_set_text(gtk_text_view_get_buffer(info->notes), trip->notes, -1);
}
struct location_update {
GtkEntry *entry;
struct dive *dive;
void (*callback)(float, float);
} location_update;
void print_gps_coordinates(char *buffer, int len, float lat, float lon)
{
unsigned int latdeg, londeg;
float latmin, lonmin;
char *lath, *lonh;
lath = lat >= 0.0 ? "N" : "S";
lonh = lon >= 0.0 ? "E" : "W";
lat = fabs(lat);
lon = fabs(lon);
latdeg = lat;
londeg = lon;
latmin = (lat - latdeg) * 60.0;
lonmin = (lon - londeg) * 60.0;
snprintf(buffer, len, "%s%u%s %6.3f\' , %s%u%s %6.3f\'",
lath, latdeg, UTF8_DEGREE, latmin,
lonh, londeg, UTF8_DEGREE, lonmin);
}
void update_gps_entry(float lat, float lon)
{
char gps_text[45];
print_gps_coordinates(gps_text, 45, lat, lon);
gtk_entry_set_text(location_update.entry, gps_text);
}
static gboolean gps_map_callback(GtkWidget *w, gpointer data)
{
struct dive *dive = location_update.dive;
show_gps_location(dive, update_gps_entry);
return TRUE;
}
static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info *info, gboolean multi)
{
GtkWidget *hbox, *label, *frame, *equipment;
GtkWidget *hbox, *label, *frame, *equipment, *image;
char buffer[128];
char airtemp[6];
char gps_text[25] = "";
char gps_text[45] = "";
const char *unit;
double value;
@ -645,9 +686,21 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
info->location = text_entry(box, _("Location"), location_list, dive->location);
if (dive_has_location(dive))
snprintf(gps_text, sizeof(gps_text), "%3.5lf;%3.5lf", dive->latitude.udeg / 1000000.0,
dive->longitude.udeg / 1000000.0);
info->gps = single_text_entry(box, _("GPS (WGS84 or GPS format - use ';' as separator)"), gps_text);
print_gps_coordinates(gps_text, sizeof(gps_text), dive->latitude.udeg / 1000000.0,
dive->longitude.udeg / 1000000.0);
hbox = gtk_hbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
info->gps = single_text_entry(hbox, _("GPS (WGS84 or GPS format)"), gps_text);
gtk_entry_set_width_chars(info->gps, 30);
info->gps_icon = gtk_button_new_with_label(_("Pick on map"));
gtk_box_pack_start(GTK_BOX(hbox), info->gps_icon, FALSE, FALSE, 6);
image = gtk_image_new_from_pixbuf(get_gps_icon());
gtk_image_set_pixel_size(GTK_IMAGE(image), 128);
gtk_button_set_image(GTK_BUTTON(info->gps_icon), image);
location_update.entry = info->gps;
location_update.dive = dive;
g_signal_connect(G_OBJECT(info->gps_icon), "clicked", G_CALLBACK(gps_map_callback), NULL);
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);