#define UNUSED_LINE_THICKNESS 3
+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 );
#ifdef VIK_CONFIG_DEM24K
"USA 10m (USGS 24k)",
#endif
- "None",
NULL
};
#ifdef VIK_CONFIG_DEM24K
DEM_SOURCE_DEM24K,
#endif
- DEM_SOURCE_NONE,
};
enum { DEM_TYPE_HEIGHT = 0,
};
static VikLayerParam dem_layer_params[] = {
- { "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, N_("DEM Files:"), VIK_LAYER_WIDGET_FILELIST },
+ { "files", VIK_LAYER_PARAM_STRING_LIST, VIK_LAYER_GROUP_NONE, N_("DEM Files:"), VIK_LAYER_WIDGET_FILELIST, NULL, NULL, NULL },
{ "source", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Download Source:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_source, NULL },
- { "color", VIK_LAYER_PARAM_COLOR, VIK_LAYER_GROUP_NONE, N_("Min Elev Color:"), VIK_LAYER_WIDGET_COLOR, 0 },
- { "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 },
+ { "color", VIK_LAYER_PARAM_COLOR, VIK_LAYER_GROUP_NONE, N_("Min Elev Color:"), VIK_LAYER_WIDGET_COLOR, NULL, NULL, NULL },
+ { "type", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Type:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_type, NULL, NULL },
+ { "min_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Min Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, ¶m_scales[0], NULL, NULL },
+ { "max_elev", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Max Elev:"), VIK_LAYER_WIDGET_SPINBUTTON, ¶m_scales[0], NULL, NULL },
};
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 },
};
*/
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",
VikLayerInterface vik_dem_layer_interface = {
"DEM",
+ N_("DEM"),
+ "<control><shift>D",
&vikdemlayer_pixbuf,
dem_tools,
(VikLayerFuncSublayerRenameRequest) NULL,
(VikLayerFuncSublayerToggleVisible) NULL,
+ (VikLayerFuncSublayerTooltip) NULL,
+ (VikLayerFuncLayerTooltip) dem_layer_tooltip,
+ (VikLayerFuncLayerSelected) NULL,
(VikLayerFuncMarshall) dem_layer_marshall,
(VikLayerFuncUnmarshall) dem_layer_unmarshall,
(VikLayerFuncWriteFileData) NULL,
(VikLayerFuncDeleteItem) NULL,
+ (VikLayerFuncCutItem) NULL,
(VikLayerFuncCopyItem) NULL,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
(VikLayerFuncDragDropRequest) NULL,
+
+ (VikLayerFuncSelectClick) NULL,
+ (VikLayerFuncSelectMove) NULL,
+ (VikLayerFuncSelectRelease) NULL,
+ (VikLayerFuncSelectedViewportMenu) NULL,
};
struct _VikDEMLayer {
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 );
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), TRUE ); // Yes 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
+}
+
gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation )
{
switch ( id )
else
vdl->max_elev = data.d;
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;
+ // 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;
}
{
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;
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 )
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
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), TRUE ); // Yes update from background thread
}
g_mutex_unlock ( p->mutex );
- gdk_threads_leave();
+ //gdk_threads_leave();
}
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 );
g_free ( tmp );
}
+ else
+ vik_layer_emit_update ( VIK_LAYER(vdl), FALSE );
g_free ( dem_file );
g_free ( full_path );
projects / andy / viking.git / blobdiff