X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/0cabb40120ee0ac9984e591d8a437094da26bf15..86e57c5ba100383940b9ff094515ab31c4133a99:/src/vikdemlayer.c diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c index 688bcc92..f1242a0d 100644 --- a/src/vikdemlayer.c +++ b/src/vikdemlayer.c @@ -35,28 +35,15 @@ #include #endif #include +#include #include -#include "config.h" -#include "globals.h" -#include "coords.h" -#include "vikcoord.h" -#include "download.h" #include "background.h" -#include "vikwaypoint.h" -#include "viktrack.h" -#include "vikviewport.h" -#include "viktreeview.h" -#include "viklayer.h" -#include "vikaggregatelayer.h" -#include "viklayerspanel.h" +#include "viking.h" #include "vikmapslayer.h" #include "vikdemlayer.h" -#include "dialog.h" - #include "dem.h" #include "dems.h" - #include "icons/icons.h" #define MAPS_CACHE_DIR maps_layer_default_dir() @@ -69,12 +56,17 @@ #define DEM24K_DOWNLOAD_SCRIPT "dem24k.pl" #endif +#define UNUSED_LINE_THICKNESS 3 +static VikDEMLayer *dem_layer_new ( VikViewport *vvp ); +static void dem_layer_draw ( VikDEMLayer *vdl, VikViewport *vp ); +static void dem_layer_free ( VikDEMLayer *vdl ); +static VikDEMLayer *dem_layer_create ( VikViewport *vp ); +static const gchar* dem_layer_tooltip( VikDEMLayer *vdl ); static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ); static VikDEMLayer *dem_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); static gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ); static VikLayerParamData dem_layer_get_param ( VikDEMLayer *vdl, guint16 id, gboolean is_file_operation ); -static void dem_layer_update_gc ( VikDEMLayer *vdl, VikViewport *vp, const gchar *color ); static void dem_layer_post_read ( VikLayer *vl, VikViewport *vp, gboolean from_file ); static void srtm_draw_existence ( VikViewport *vp ); @@ -86,7 +78,6 @@ static void dem24k_draw_existence ( VikViewport *vp ); static VikLayerParamScale param_scales[] = { { 0, 30000, 10, 1 }, { 1, 30000, 10, 1 }, - { 1, 10, 1, 0 }, }; static gchar *params_source[] = { @@ -94,7 +85,6 @@ static gchar *params_source[] = { #ifdef VIK_CONFIG_DEM24K "USA 10m (USGS 24k)", #endif - "None", NULL }; @@ -108,7 +98,6 @@ enum { DEM_SOURCE_SRTM, #ifdef VIK_CONFIG_DEM24K DEM_SOURCE_DEM24K, #endif - DEM_SOURCE_NONE, }; enum { DEM_TYPE_HEIGHT = 0, @@ -116,33 +105,46 @@ enum { DEM_TYPE_HEIGHT = 0, DEM_TYPE_NONE, }; +static VikLayerParamData color_default ( void ) { + VikLayerParamData data; gdk_color_parse ( "blue", &data.c ); return data; +} + +static VikLayerParamData source_default ( void ) { return VIK_LPD_UINT ( DEM_SOURCE_SRTM ); } +static VikLayerParamData type_default ( void ) { return VIK_LPD_UINT ( DEM_TYPE_HEIGHT ); } +static VikLayerParamData min_elev_default ( void ) { return VIK_LPD_DOUBLE ( 0.0 ); } +static VikLayerParamData max_elev_default ( void ) { return VIK_LPD_DOUBLE ( 1000.0 ); } + static VikLayerParam dem_layer_params[] = { - { "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, N_("DEM Files:"), VIK_LAYER_WIDGET_FILELIST }, - { "source", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Download Source:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_source, NULL }, - { "color", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Color:"), VIK_LAYER_WIDGET_ENTRY }, - { "type", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Type:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_type, NULL }, - { "min_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Min Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 }, - { "max_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Max Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 }, - { "line_thickness", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Line Thickness:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 1 }, + { VIK_LAYER_DEM, "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, N_("DEM Files:"), VIK_LAYER_WIDGET_FILELIST, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_DEM, "source", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Download Source:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_source, NULL, NULL, source_default, NULL, NULL }, + { VIK_LAYER_DEM, "color", VIK_LAYER_PARAM_COLOR, VIK_LAYER_GROUP_NONE, N_("Min Elev Color:"), VIK_LAYER_WIDGET_COLOR, NULL, NULL, NULL, color_default, NULL, NULL }, + { VIK_LAYER_DEM, "type", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Type:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_type, NULL, NULL, type_default, NULL, NULL }, + { VIK_LAYER_DEM, "min_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Min Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0, NULL, NULL, min_elev_default, NULL, NULL }, + { VIK_LAYER_DEM, "max_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Max Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0, NULL, NULL, max_elev_default, NULL, NULL }, }; -enum { PARAM_FILES=0, PARAM_SOURCE, PARAM_COLOR, PARAM_TYPE, PARAM_MIN_ELEV, PARAM_MAX_ELEV, PARAM_LINE_THICKNESS, NUM_PARAMS }; +enum { PARAM_FILES=0, PARAM_SOURCE, PARAM_COLOR, PARAM_TYPE, PARAM_MIN_ELEV, PARAM_MAX_ELEV, NUM_PARAMS }; static gpointer dem_layer_download_create ( VikWindow *vw, VikViewport *vvp); static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *event, VikViewport *vvp ); static gboolean dem_layer_download_click ( VikDEMLayer *vdl, GdkEventButton *event, VikViewport *vvp ); static VikToolInterface dem_tools[] = { - { N_("DEM Download/Import"), (VikToolConstructorFunc) dem_layer_download_create, NULL, NULL, NULL, + { { "DEMDownload", "vik-icon-DEM Download", N_("_DEM Download"), NULL, N_("DEM Download"), 0 }, + (VikToolConstructorFunc) dem_layer_download_create, NULL, NULL, NULL, (VikToolMouseFunc) dem_layer_download_click, NULL, (VikToolMouseFunc) dem_layer_download_release, - (VikToolKeyFunc) NULL, GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf }, + (VikToolKeyFunc) NULL, + FALSE, + GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf }, }; -/* +/* HEIGHT COLORS + The first entry is blue for a default 'sea' colour, + however the value used by the corresponding gc can be configured as part of the DEM layer properties. + The other colours, shaded from brown to white are used to give an indication of height. */ - static gchar *dem_height_colors[] = { "#0000FF", "#9b793c", "#9c7d40", "#9d8144", "#9e8549", "#9f894d", "#a08d51", "#a29156", "#a3955a", "#a4995e", "#a69d63", @@ -165,7 +167,7 @@ static const guint DEM_N_HEIGHT_COLORS = sizeof(dem_height_colors)/sizeof(dem_he */ static gchar *dem_gradient_colors[] = { -"#AAAAAA" +"#AAAAAA", "#000000", "#000011", "#000022", "#000033", "#000044", "#00004c", "#000055", "#00005d", "#000066", "#00006e", "#000077", "#00007f", "#000088", "#000090", "#000099", "#0000a1", "#0000aa", "#0000b2", "#0000bb", "#0000c3", "#0000cc", "#0000d4", "#0000dd", "#0000e5", "#0000ee", "#0000f6", "#0000ff", "#0008f7", "#0011ee", "#0019e6", @@ -183,6 +185,8 @@ static const guint DEM_N_GRADIENT_COLORS = sizeof(dem_gradient_colors)/sizeof(de VikLayerInterface vik_dem_layer_interface = { "DEM", + N_("DEM"), + "D", &vikdemlayer_pixbuf, dem_tools, @@ -195,13 +199,13 @@ VikLayerInterface vik_dem_layer_interface = { VIK_MENU_ITEM_ALL, - (VikLayerFuncCreate) vik_dem_layer_create, + (VikLayerFuncCreate) dem_layer_create, (VikLayerFuncRealize) NULL, (VikLayerFuncPostRead) dem_layer_post_read, - (VikLayerFuncFree) vik_dem_layer_free, + (VikLayerFuncFree) dem_layer_free, (VikLayerFuncProperties) NULL, - (VikLayerFuncDraw) vik_dem_layer_draw, + (VikLayerFuncDraw) dem_layer_draw, (VikLayerFuncChangeCoordMode) NULL, (VikLayerFuncSetMenuItemsSelection) NULL, @@ -212,35 +216,46 @@ VikLayerInterface vik_dem_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, + (VikLayerFuncSublayerTooltip) NULL, + (VikLayerFuncLayerTooltip) dem_layer_tooltip, + (VikLayerFuncLayerSelected) NULL, (VikLayerFuncMarshall) dem_layer_marshall, (VikLayerFuncUnmarshall) dem_layer_unmarshall, (VikLayerFuncSetParam) dem_layer_set_param, (VikLayerFuncGetParam) dem_layer_get_param, + (VikLayerFuncChangeParam) NULL, (VikLayerFuncReadFileData) NULL, (VikLayerFuncWriteFileData) NULL, (VikLayerFuncDeleteItem) NULL, + (VikLayerFuncCutItem) NULL, (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, (VikLayerFuncDragDropRequest) NULL, + + (VikLayerFuncSelectClick) NULL, + (VikLayerFuncSelectMove) NULL, + (VikLayerFuncSelectRelease) NULL, + (VikLayerFuncSelectedViewportMenu) NULL, }; struct _VikDEMLayer { VikLayer vl; - GdkGC *gc; GdkGC **gcs; GdkGC **gcsgradient; GList *files; gdouble min_elev; gdouble max_elev; - guint8 line_thickness; - gchar *color; + GdkColor color; guint source; guint type; + + // right click menu only stuff - similar to mapslayer + GtkMenu *right_click_menu; }; GType vik_dem_layer_get_type () @@ -267,6 +282,13 @@ GType vik_dem_layer_get_type () return vdl_type; } +static const gchar* dem_layer_tooltip( VikDEMLayer *vdl ) +{ + static gchar tmp_buf[100]; + g_snprintf (tmp_buf, sizeof(tmp_buf), _("Number of files: %d"), g_list_length (vdl->files)); + return tmp_buf; +} + static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ) { vik_layer_marshall_params ( VIK_LAYER(vdl), data, len ); @@ -274,32 +296,110 @@ static void dem_layer_marshall( VikDEMLayer *vdl, guint8 **data, gint *len ) static VikDEMLayer *dem_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ) { - VikDEMLayer *rv = vik_dem_layer_new (); + VikDEMLayer *rv = dem_layer_new ( vvp ); gint i; /* TODO: share GCS between layers */ - for ( i = 0; i < DEM_N_HEIGHT_COLORS; i++ ) - rv->gcs[i] = vik_viewport_new_gc ( vvp, dem_height_colors[i], rv->line_thickness ); - + for ( i = 0; i < DEM_N_HEIGHT_COLORS; i++ ) { + if ( i == 0 ) + rv->gcs[i] = vik_viewport_new_gc_from_color ( vvp, &(rv->color), UNUSED_LINE_THICKNESS ); + else + rv->gcs[i] = vik_viewport_new_gc ( vvp, dem_height_colors[i], UNUSED_LINE_THICKNESS ); + } for ( i = 0; i < DEM_N_GRADIENT_COLORS; i++ ) - rv->gcsgradient[i] = vik_viewport_new_gc ( vvp, dem_gradient_colors[i], rv->line_thickness ); + rv->gcsgradient[i] = vik_viewport_new_gc ( vvp, dem_gradient_colors[i], UNUSED_LINE_THICKNESS ); vik_layer_unmarshall_params ( VIK_LAYER(rv), data, len, vvp ); return rv; } +/* Structure for DEM data used in background thread */ +typedef struct { + VikDEMLayer *vdl; +} dem_load_thread_data; + +/* + * Function for starting the DEM file loading as a background thread + */ +static int dem_layer_load_list_thread ( dem_load_thread_data *dltd, gpointer threaddata ) +{ + int result = 0; // Default to good + // Actual Load + if ( a_dems_load_list ( &(dltd->vdl->files), threaddata ) ) { + // Thread cancelled + result = -1; + } + + // ATM as each file is processed the screen is not updated (no mechanism exposed to a_dems_load_list) + // Thus force draw only at the end, as loading is complete/aborted + //gdk_threads_enter(); + // Test is helpful to prevent Gtk-CRITICAL warnings if the program is exitted whilst loading + if ( IS_VIK_LAYER(dltd->vdl) ) + vik_layer_emit_update ( VIK_LAYER(dltd->vdl) ); // NB update from background thread + //gdk_threads_leave(); + + return result; +} + +static void dem_layer_thread_data_free ( dem_load_thread_data *data ) +{ + // Simple release + g_free ( data ); +} + +static void dem_layer_thread_cancel ( dem_load_thread_data *data ) +{ + // Abort loading + // Instead of freeing the list, leave it as partially processed + // Thus we can see/use what was done +} + +/** + * Process the list of DEM files and convert each one to a relative path + */ +static GList *dem_layer_convert_to_relative_filenaming ( GList *files ) +{ + gchar *cwd = g_get_current_dir(); + if ( !cwd ) + return files; + + GList *relfiles = NULL; + + while ( files ) { + gchar *file = g_strdup ( file_GetRelativeFilename ( cwd, files->data ) ); + relfiles = g_list_prepend ( relfiles, file ); + files = files->next; + } + + g_free ( cwd ); + + if ( relfiles ) { + // Replacing current list, so delete old values first. + GList *iter = files; + while ( iter ) { + g_free ( iter->data ); + iter = iter->next; + } + g_list_free ( files ); + + return relfiles; + } + + return files; +} + gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ) { switch ( id ) { - case PARAM_COLOR: if ( vdl->color ) g_free ( vdl->color ); vdl->color = g_strdup ( data.s ); break; + case PARAM_COLOR: vdl->color = data.c; gdk_gc_set_rgb_fg_color ( vdl->gcs[0], &(vdl->color) ); break; case PARAM_SOURCE: vdl->source = data.u; break; case PARAM_TYPE: vdl->type = data.u; break; case PARAM_MIN_ELEV: /* Convert to store internally NB file operation always in internal units (metres) */ if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET ) - vdl->min_elev = data.d / 3.2808399; + vdl->min_elev = VIK_FEET_TO_METERS(data.d); else vdl->min_elev = data.d; break; @@ -307,12 +407,33 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData d /* Convert to store internally NB file operation always in internal units (metres) */ if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET ) - vdl->max_elev = data.d / 3.2808399; + vdl->max_elev = VIK_FEET_TO_METERS(data.d); else vdl->max_elev = data.d; break; - case PARAM_LINE_THICKNESS: if ( data.u >= 1 && data.u <= 15 ) vdl->line_thickness = data.u; break; - case PARAM_FILES: a_dems_load_list ( &(data.sl) ); a_dems_list_free ( vdl->files ); vdl->files = data.sl; break; + case PARAM_FILES: + { + // Clear out old settings - if any commonalities with new settings they will have to be read again + a_dems_list_free ( vdl->files ); + // Set file list so any other intermediate screen drawing updates will show currently loaded DEMs by the working thread + vdl->files = data.sl; + // No need for thread if no files + if ( vdl->files ) { + // Thread Load + dem_load_thread_data *dltd = g_malloc ( sizeof(dem_load_thread_data) ); + dltd->vdl = vdl; + dltd->vdl->files = data.sl; + + a_background_thread ( VIK_GTK_WINDOW_FROM_WIDGET(vp), + _("DEM Loading"), + (vik_thr_func) dem_layer_load_list_thread, + dltd, + (vik_thr_free_func) dem_layer_thread_data_free, + (vik_thr_free_func) dem_layer_thread_cancel, + g_list_length ( data.sl ) ); // Number of DEM files + } + break; + } } return TRUE; } @@ -322,15 +443,21 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer *vdl, guint16 id, gbo VikLayerParamData rv; switch ( id ) { - case PARAM_FILES: rv.sl = vdl->files; break; + case PARAM_FILES: + rv.sl = vdl->files; + if ( is_file_operation ) + // Save in relative format if necessary + if ( a_vik_get_file_ref_format() == VIK_FILE_REF_FORMAT_RELATIVE ) + rv.sl = dem_layer_convert_to_relative_filenaming ( rv.sl ); + break; case PARAM_SOURCE: rv.u = vdl->source; break; case PARAM_TYPE: rv.u = vdl->type; break; - case PARAM_COLOR: rv.s = vdl->color ? vdl->color : ""; break; + case PARAM_COLOR: rv.c = vdl->color; break; case PARAM_MIN_ELEV: /* Convert for display in desired units NB file operation always in internal units (metres) */ if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET ) - rv.d = vdl->min_elev * 3.2808399; + rv.d = VIK_METERS_TO_FEET(vdl->min_elev); else rv.d = vdl->min_elev; break; @@ -338,45 +465,36 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer *vdl, guint16 id, gbo /* Convert for display in desired units NB file operation always in internal units (metres) */ if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET ) - rv.d = vdl->max_elev * 3.2808399; + rv.d = VIK_METERS_TO_FEET(vdl->max_elev); else rv.d = vdl->max_elev; break; - case PARAM_LINE_THICKNESS: rv.i = vdl->line_thickness; break; } return rv; } static void dem_layer_post_read ( VikLayer *vl, VikViewport *vp, gboolean from_file ) { - VikDEMLayer *vdl = VIK_DEM_LAYER(vl); - if ( vdl->gc ) - g_object_unref ( G_OBJECT(vdl->gc) ); - - vdl->gc = vik_viewport_new_gc ( vp, vdl->color, vdl->line_thickness ); + /* nothing ATM, but keep in case it's needed the future */ } -VikDEMLayer *vik_dem_layer_new ( ) +static VikDEMLayer *dem_layer_new ( VikViewport *vvp ) { VikDEMLayer *vdl = VIK_DEM_LAYER ( g_object_new ( VIK_DEM_LAYER_TYPE, NULL ) ); - vik_layer_init ( VIK_LAYER(vdl), VIK_LAYER_DEM ); + vik_layer_set_type ( VIK_LAYER(vdl), VIK_LAYER_DEM ); vdl->files = NULL; - - vdl->gc = NULL; - vdl->gcs = g_malloc(sizeof(GdkGC *)*DEM_N_HEIGHT_COLORS); vdl->gcsgradient = g_malloc(sizeof(GdkGC *)*DEM_N_GRADIENT_COLORS); /* make new gcs only if we need it (copy layer -> use old) */ - vdl->min_elev = 0.0; - vdl->max_elev = 1000.0; - vdl->source = DEM_SOURCE_SRTM; - vdl->type = DEM_TYPE_HEIGHT; - vdl->line_thickness = 3; - vdl->color = NULL; + // Ensure the base GC is available so the default colour can be applied + if ( vvp ) vdl->gcs[0] = vik_viewport_new_gc ( vvp, "#0000FF", 1 ); + + vik_layer_set_defaults ( VIK_LAYER(vdl), vvp ); + return vdl; } @@ -452,7 +570,7 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * if ( y2 > vik_viewport_get_height(vp) ) y2=vik_viewport_get_height(vp); if ( x2 < 0 ) x2 = 0; if ( y1 < 0 ) y1 = 0; - vik_viewport_draw_rectangle ( vp, GTK_WIDGET(vp)->style->black_gc, + vik_viewport_draw_rectangle ( vp, gtk_widget_get_style(GTK_WIDGET(vp))->black_gc, FALSE, x2, y1, x1-x2, y2-y1 ); return; } @@ -504,7 +622,7 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * for ( x=start_x, counter.lon = start_lon; counter.lon <= end_lon+escale_deg*skip_factor; counter.lon += escale_deg * skip_factor, x += skip_factor ) { // NOTE: ( counter.lon <= end_lon + ESCALE_DEG*SKIP_FACTOR ) is neccessary so in high zoom modes, // the leftmost column does also get drawn, if the center point is out of viewport. - if ( x >= 0 && x < dem->n_columns ) { + if ( x < dem->n_columns ) { column = g_ptr_array_index ( dem->columns, x ); // get previous and next column. catch out-of-bound. gint32 new_x = x; @@ -549,10 +667,13 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * if(box_width < 0 || box_height < 0) continue; // skip this. this is out of our viewport anyway. FIXME: why? + gboolean below_minimum = FALSE; if(vdl->type == DEM_TYPE_HEIGHT) { - if ( elev != VIK_DEM_INVALID_ELEVATION && elev < vdl->min_elev ) + if ( elev != VIK_DEM_INVALID_ELEVATION && elev < vdl->min_elev ) { // Prevent 'elev - vdl->min_elev' from being negative so can safely use as array index elev = ceil ( vdl->min_elev ); + below_minimum = TRUE; + } if ( elev != VIK_DEM_INVALID_ELEVATION && elev > vdl->max_elev ) elev = vdl->max_elev; } @@ -603,7 +724,8 @@ static void vik_dem_layer_draw_dem ( VikDEMLayer *vdl, VikViewport *vp, VikDEM * if(vdl->type == DEM_TYPE_HEIGHT) { if ( elev == VIK_DEM_INVALID_ELEVATION ) ; /* don't draw it */ - else if ( elev <= 0 ) + else if ( elev <= 0 || below_minimum ) + /* If 'sea' colour or below the defined mininum draw in the configurable colour */ vik_viewport_draw_rectangle(vp, vdl->gcs[0], TRUE, box_x, box_y, box_width, box_height); else vik_viewport_draw_rectangle(vp, vdl->gcs[(gint)floor(((elev - vdl->min_elev)/(vdl->max_elev - vdl->min_elev))*(DEM_N_HEIGHT_COLORS-2))+1], TRUE, box_x, box_y, box_width, box_height); @@ -730,9 +852,8 @@ static const gchar *srtm_continent_dir ( gint lat, gint lon ) return(g_hash_table_lookup(srtm_continent, name)); } -void vik_dem_layer_draw ( VikDEMLayer *vdl, gpointer data ) +static void dem_layer_draw ( VikDEMLayer *vdl, VikViewport *vp ) { - VikViewport *vp = (VikViewport *) data; GList *dems_iter = vdl->files; VikDEM *dem; @@ -754,15 +875,9 @@ void vik_dem_layer_draw ( VikDEMLayer *vdl, gpointer data ) } } -void vik_dem_layer_free ( VikDEMLayer *vdl ) +static void dem_layer_free ( VikDEMLayer *vdl ) { gint i; - if ( vdl->gc != NULL ) - g_object_unref ( G_OBJECT(vdl->gc) ); - - if ( vdl->color != NULL ) - g_free ( vdl->color ); - if ( vdl->gcs ) for ( i = 0; i < DEM_N_HEIGHT_COLORS; i++ ) g_object_unref ( vdl->gcs[i] ); @@ -776,32 +891,19 @@ void vik_dem_layer_free ( VikDEMLayer *vdl ) a_dems_list_free ( vdl->files ); } -static void dem_layer_update_gc ( VikDEMLayer *vdl, VikViewport *vp, const gchar *color ) +VikDEMLayer *dem_layer_create ( VikViewport *vp ) { - if ( vdl->color ) - g_free ( vdl->color ); - - vdl->color = g_strdup ( color ); - - if ( vdl->gc ) - g_object_unref ( G_OBJECT(vdl->gc) ); - - vdl->gc = vik_viewport_new_gc ( vp, vdl->color, vdl->line_thickness ); -} - -VikDEMLayer *vik_dem_layer_create ( VikViewport *vp ) -{ - VikDEMLayer *vdl = vik_dem_layer_new (); + VikDEMLayer *vdl = dem_layer_new ( vp ); gint i; - - /* TODO: share GCS between layers */ - for ( i = 0; i < DEM_N_HEIGHT_COLORS; i++ ) - vdl->gcs[i] = vik_viewport_new_gc ( vp, dem_height_colors[i], vdl->line_thickness ); - - for ( i = 0; i < DEM_N_GRADIENT_COLORS; i++ ) - vdl->gcsgradient[i] = vik_viewport_new_gc ( vp, dem_gradient_colors[i], vdl->line_thickness ); - - dem_layer_update_gc ( vdl, vp, "red" ); + if ( vp ) { + /* TODO: share GCS between layers */ + for ( i = 0; i < DEM_N_HEIGHT_COLORS; i++ ) { + if ( i > 0 ) + vdl->gcs[i] = vik_viewport_new_gc ( vp, dem_height_colors[i], UNUSED_LINE_THICKNESS ); + } + for ( i = 0; i < DEM_N_GRADIENT_COLORS; i++ ) + vdl->gcsgradient[i] = vik_viewport_new_gc ( vp, dem_gradient_colors[i], UNUSED_LINE_THICKNESS ); + } return vdl; } /************************************************************** @@ -832,7 +934,11 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata continent_dir = srtm_continent_dir(intlat, intlon); if (!continent_dir) { - g_warning(N_("No SRTM data available for %f, %f"), p->lat, p->lon); + if ( p->vdl ) { + gchar *msg = g_strdup_printf ( _("No SRTM data available for %f, %f"), p->lat, p->lon ); + vik_window_statusbar_update ( (VikWindow*)VIK_GTK_WINDOW_FROM_LAYER(p->vdl), msg, VIK_STATUSBAR_INFO ); + g_free ( msg ); + } return; } @@ -844,7 +950,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata (intlon >= 0) ? 'E' : 'W', ABS(intlon) ); - static DownloadOptions options = { 0, NULL, 0, a_check_map_file }; + static DownloadMapOptions options = { FALSE, FALSE, NULL, 0, a_check_map_file, NULL }; a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options, NULL ); g_free ( src_fn ); } @@ -906,7 +1012,7 @@ static void srtm_draw_existence ( VikViewport *vp ) vik_viewport_coord_to_screen ( vp, &ne, &x2, &y2 ); if ( x1 < 0 ) x1 = 0; if ( y2 < 0 ) y2 = 0; - vik_viewport_draw_rectangle ( vp, GTK_WIDGET(vp)->style->black_gc, + vik_viewport_draw_rectangle ( vp, gtk_widget_get_style(GTK_WIDGET(vp))->black_gc, FALSE, x1, y2, x2-x1, y1-y2 ); } } @@ -929,6 +1035,7 @@ static void dem24k_dem_download_thread ( DEMDownloadParams *p, gpointer threadda ceil(p->lon*8)/8 ); /* FIX: don't use system, use execv or something. check for existence */ system(cmdline); + g_free ( cmdline ); } static gchar *dem24k_lat_lon_to_dest_fn ( gdouble lat, gdouble lon ) @@ -983,7 +1090,7 @@ static void dem24k_draw_existence ( VikViewport *vp ) vik_viewport_coord_to_screen ( vp, &ne, &x2, &y2 ); if ( x1 < 0 ) x1 = 0; if ( y2 < 0 ) y2 = 0; - vik_viewport_draw_rectangle ( vp, GTK_WIDGET(vp)->style->black_gc, + vik_viewport_draw_rectangle ( vp, gtk_widget_get_style(GTK_WIDGET(vp))->black_gc, FALSE, x1, y2, x2-x1, y1-y2 ); } } @@ -1005,21 +1112,20 @@ static void weak_ref_cb ( gpointer ptr, GObject * dead_vdl ) } /* Try to add file full_path. - * full_path will be copied. + * filename will be copied. * returns FALSE if file does not exists, TRUE otherwise. */ -static gboolean dem_layer_add_file ( VikDEMLayer *vdl, const gchar *full_path ) +static gboolean dem_layer_add_file ( VikDEMLayer *vdl, const gchar *filename ) { - if ( g_file_test(full_path, G_FILE_TEST_EXISTS ) == TRUE ) { + if ( g_file_test(filename, G_FILE_TEST_EXISTS) == TRUE ) { /* only load if file size is not 0 (not in progress) */ struct stat sb; - stat (full_path, &sb); + stat ( filename, &sb ); if ( sb.st_size ) { - gchar *duped_path = g_strdup(full_path); + gchar *duped_path = g_strdup(filename); vdl->files = g_list_prepend ( vdl->files, duped_path ); a_dems_load ( duped_path ); g_debug("%s: %s", __FUNCTION__, duped_path); - vik_layer_emit_update ( VIK_LAYER(vdl) ); } return TRUE; } else @@ -1034,17 +1140,19 @@ static void dem_download_thread ( DEMDownloadParams *p, gpointer threaddata ) else if ( p->source == DEM_SOURCE_DEM24K ) dem24k_dem_download_thread ( p, threaddata ); #endif + else + return; - gdk_threads_enter(); + //gdk_threads_enter(); g_mutex_lock ( p->mutex ); if ( p->vdl ) { g_object_weak_unref ( G_OBJECT(p->vdl), weak_ref_cb, p ); if ( dem_layer_add_file ( p->vdl, p->dest ) ) - vik_layer_emit_update ( VIK_LAYER(p->vdl) ); + vik_layer_emit_update ( VIK_LAYER(p->vdl) ); // NB update from background thread } g_mutex_unlock ( p->mutex ); - gdk_threads_leave(); + //gdk_threads_leave(); } @@ -1060,18 +1168,71 @@ static gpointer dem_layer_download_create ( VikWindow *vw, VikViewport *vvp) return vvp; } +/** + * Display a simple dialog with information about the DEM file at this location + */ +static void dem_layer_file_info ( GtkWidget *widget, struct LatLon *ll ) +{ + gint intlat, intlon; + const gchar *continent_dir; + + intlat = (int)floor(ll->lat); + intlon = (int)floor(ll->lon); + continent_dir = srtm_continent_dir(intlat, intlon); + + gchar *source = NULL; + if ( continent_dir ) + source = g_strdup_printf ( "http:/%s%s/%c%02d%c%03d.hgt.zip", + SRTM_HTTP_URI, + continent_dir, + (intlat >= 0) ? 'N' : 'S', + ABS(intlat), + (intlon >= 0) ? 'E' : 'W', + ABS(intlon) ); + else + // Probably not over any land... + source = g_strdup ( _("No DEM File Available") ); + + gchar *filename = NULL; + gchar *dem_file = NULL; +#ifdef VIK_CONFIG_DEM24K + dem_file = dem24k_lat_lon_to_dest_fn ( ll->lat, ll->lon ); +#else + dem_file = srtm_lat_lon_to_dest_fn ( ll->lat, ll->lon ); +#endif + gchar *message = NULL; + + filename = g_strdup_printf ( "%s%s", MAPS_CACHE_DIR, dem_file ); + + if ( g_file_test ( filename, G_FILE_TEST_EXISTS ) ) { + // Get some timestamp information of the file + struct stat stat_buf; + if ( g_stat ( filename, &stat_buf ) == 0 ) { + gchar time_buf[64]; + strftime ( time_buf, sizeof(time_buf), "%c", gmtime((const time_t *)&stat_buf.st_mtime) ); + message = g_strdup_printf ( _("\nSource: %s\n\nDEM File: %s\nDEM File Timestamp: %s"), source, filename, time_buf ); + } + } + else + message = g_strdup_printf ( _("Source: %s\n\nNo DEM File!"), source ); + + // Show the info + a_dialog_info_msg ( GTK_WINDOW(gtk_widget_get_toplevel(widget)), message ); + + g_free ( message ); + g_free ( source ); + g_free ( dem_file ); + g_free ( filename ); +} static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *event, VikViewport *vvp ) { VikCoord coord; - struct LatLon ll; + static struct LatLon ll; gchar *full_path; gchar *dem_file = NULL; - if ( vdl->source == DEM_SOURCE_NONE ) - a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vdl), _("No download source selected. Edit layer properties.") ); - vik_viewport_screen_to_coord ( vvp, event->x, event->y, &coord ); vik_coord_to_latlon ( &coord, &ll ); @@ -1090,22 +1251,41 @@ static gboolean dem_layer_download_release ( VikDEMLayer *vdl, GdkEventButton *e g_debug("%s: %s", __FUNCTION__, full_path); - // TODO: check if already in filelist - - if ( ! dem_layer_add_file(vdl, full_path) ) { - gchar *tmp = g_strdup_printf ( _("Downloading DEM %s"), dem_file ); - DEMDownloadParams *p = g_malloc(sizeof(DEMDownloadParams)); - p->dest = g_strdup(full_path); - p->lat = ll.lat; - p->lon = ll.lon; - p->vdl = vdl; - p->mutex = g_mutex_new(); - p->source = vdl->source; - g_object_weak_ref(G_OBJECT(p->vdl), weak_ref_cb, p ); - - a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vdl), tmp, - (vik_thr_func) dem_download_thread, p, - (vik_thr_free_func) free_dem_download_params, NULL, 1 ); + if ( event->button == 1 ) { + // TODO: check if already in filelist + if ( ! dem_layer_add_file(vdl, full_path) ) { + gchar *tmp = g_strdup_printf ( _("Downloading DEM %s"), dem_file ); + DEMDownloadParams *p = g_malloc(sizeof(DEMDownloadParams)); + p->dest = g_strdup(full_path); + p->lat = ll.lat; + p->lon = ll.lon; + p->vdl = vdl; + p->mutex = g_mutex_new(); + p->source = vdl->source; + g_object_weak_ref(G_OBJECT(p->vdl), weak_ref_cb, p ); + + a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vdl), tmp, + (vik_thr_func) dem_download_thread, p, + (vik_thr_free_func) free_dem_download_params, NULL, 1 ); + + g_free ( tmp ); + } + else + vik_layer_emit_update ( VIK_LAYER(vdl) ); + } + else { + if ( !vdl->right_click_menu ) { + GtkWidget *item; + vdl->right_click_menu = GTK_MENU ( gtk_menu_new () ); + + item = gtk_image_menu_item_new_with_mnemonic ( _("_Show DEM File Information") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU) ); + g_signal_connect ( G_OBJECT(item), "activate", G_CALLBACK(dem_layer_file_info), &ll ); + gtk_menu_shell_append (GTK_MENU_SHELL(vdl->right_click_menu), item); + } + + gtk_menu_popup ( vdl->right_click_menu, NULL, NULL, NULL, NULL, event->button, event->time ); + gtk_widget_show_all ( GTK_WIDGET(vdl->right_click_menu) ); } g_free ( dem_file );