#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#include "coords.h"
-#include "vikcoord.h"
-#include "viktrack.h"
#include "viktrwlayer.h"
#include "viktrwlayer_propwin.h"
-#include "vikwaypoint.h"
-#include "dialog.h"
-#include "globals.h"
#include "dems.h"
-
+#include "viking.h"
#include "vikviewport.h" /* ugh */
-#include "viktreeview.h" /* ugh */
#include <gdk-pixbuf/gdk-pixdata.h>
-#include "viklayer.h" /* ugh */
-#include "vikaggregatelayer.h"
-#include "viklayerspanel.h" /* ugh */
-
-#define PROPWIN_PROFILE_WIDTH 600
-#define PROPWIN_PROFILE_HEIGHT 300
typedef enum {
PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE,
static const gdouble chunksg[] = {1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0,
12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 75.0,
100.0, 150.0, 200.0, 250.0, 375.0, 500.0,
- 750.0, 1000.0, 10000.0};
+ 750.0, 1000.0, 10000.0, 100000.0};
+// Normally gradients should range up to couple hundred precent at most,
+// however there are possibilities of having points with no altitude after a point with a big altitude
+// (such as places with invalid DEM values in otherwise mountainous regions) - thus giving huge negative gradients.
/* (Hopefully!) Human friendly grid sizes - note no fixed 'ratio' just numbers that look nice...*/
/* As need to cover walking speeds - have many low numbers (but also may go up to airplane speeds!) */
#define MARGIN 70
#define LINES 5
/**
+ * get_new_min_and_chunk_index:
* Returns via pointers:
- * the new minimum value to be used for the altitude graph
- * the index in to the altitudes chunk sizes array (ci = Chunk Index)
+ * the new minimum value to be used for the graph
+ * the index in to the chunk sizes array (ci = Chunk Index)
*/
-static void get_new_min_and_chunk_index_altitude (gdouble mina, gdouble maxa, gdouble *new_min, gint *ci)
+static void get_new_min_and_chunk_index (gdouble mina, gdouble maxa, const gdouble *chunks, size_t chunky, gdouble *new_min, gint *ci)
{
/* Get unitized chunk */
/* Find suitable chunk index */
*ci = 0;
- gdouble diffa_chunk = (maxa - mina)/LINES;
+ gdouble diff_chunk = (maxa - mina)/LINES;
/* Loop through to find best match */
- while (diffa_chunk > chunksa[*ci]) {
+ while (diff_chunk > chunks[*ci]) {
(*ci)++;
/* Last Resort Check */
- if ( *ci == sizeof(chunksa)/sizeof(chunksa[0]) )
+ if ( *ci == chunky ) {
+ // Use previous value and exit loop
+ (*ci)--;
break;
- }
-
- /* Ensure adjusted minimum .. maximum covers mina->maxa */
-
- // Now work out adjusted minimum point to the nearest lowest chunk divisor value
- // When negative ensure logic uses lowest value
- if ( mina < 0 )
- *new_min = (gdouble) ( ( (gint)(mina - chunksa[*ci]) / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] );
- else
- *new_min = (gdouble) ( ( (gint)mina / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] );
-
- // Range not big enough - as new minimum has lowered
- if ((*new_min + (chunksa[*ci] * LINES) < maxa)) {
- // Next chunk should cover it
- if ( *ci < sizeof(chunksa)/sizeof(chunksa[0]) ) {
- (*ci)++;
- // Remember to adjust the minimum too...
- if ( mina < 0 )
- *new_min = (gdouble) ( ( (gint)(mina - chunksa[*ci]) / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] );
- else
- *new_min = (gdouble) ( ( (gint)mina / (gint)chunksa[*ci] ) * (gint)chunksa[*ci] );
}
}
-}
-
-/**
- * Returns via pointers:
- * the new minimum value to be used for the altitude graph
- * the index in to the altitudes chunk sizes array (ci = Chunk Index)
- */
-static void get_new_min_and_chunk_index_gradient (gdouble mina, gdouble maxa, gdouble *new_min, gint *ci)
-{
- /* Get unitized chunk */
- /* Find suitable chunk index */
- *ci = 0;
- gdouble diffa_chunk = (maxa - mina)/LINES;
-
- /* Loop through to find best match */
- while (diffa_chunk > chunksg[*ci]) {
- (*ci)++;
- /* Last Resort Check */
- if ( *ci == sizeof(chunksg)/sizeof(chunksg[0]) )
- break;
- }
/* Ensure adjusted minimum .. maximum covers mina->maxa */
// Now work out adjusted minimum point to the nearest lowest chunk divisor value
// When negative ensure logic uses lowest value
if ( mina < 0 )
- *new_min = (gdouble) ( ( (gint)(mina - chunksg[*ci]) / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] );
+ *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] );
else
- *new_min = (gdouble) ( ( (gint)mina / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] );
+ *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] );
// Range not big enough - as new minimum has lowered
- if ((*new_min + (chunksg[*ci] * LINES) < maxa)) {
+ if ((*new_min + (chunks[*ci] * LINES) < maxa)) {
// Next chunk should cover it
- if ( *ci < sizeof(chunksg)/sizeof(chunksg[0]) ) {
+ if ( *ci < chunky-1 ) {
(*ci)++;
// Remember to adjust the minimum too...
if ( mina < 0 )
- *new_min = (gdouble) ( ( (gint)(mina - chunksg[*ci]) / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] );
+ *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] );
else
- *new_min = (gdouble) ( ( (gint)mina / (gint)chunksg[*ci] ) * (gint)chunksg[*ci] );
+ *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] );
}
}
}
-/**
- * Returns via pointers:
- * the new minimum value to be used for the appropriate graph
- * the index in to that array (ci = Chunk Index)
- */
-static void get_new_min_and_chunk_index (gdouble mins, gdouble maxs, const gdouble *chunks, size_t chunky, gdouble *new_min, gint *ci)
-{
- *ci = 0;
- gdouble diff_chunk = (maxs - mins)/LINES;
-
- /* Loop through to find best match */
- while (diff_chunk > chunks[*ci]) {
- (*ci)++;
- /* Last Resort Check */
- if ( *ci == chunky )
- break;
- }
- *new_min = (gdouble) ( (gint)((mins / chunks[*ci] ) * chunks[*ci]) );
-
- // Speeds are never negative so don't need to worry about a negative new minimum
-}
-
static VikTrackpoint *set_center_at_graph_position(gdouble event_x,
gint img_width,
VikTrwLayer *vtl,
minmax_array(widgets->altitudes, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width);
- get_new_min_and_chunk_index_altitude (widgets->min_altitude, widgets->max_altitude, &widgets->draw_min_altitude, &widgets->cia);
+ get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude, &widgets->cia);
// Assign locally
mina = widgets->draw_min_altitude;
minmax_array(widgets->gradients, &widgets->min_gradient, &widgets->max_gradient, TRUE, widgets->profile_width);
- get_new_min_and_chunk_index_gradient (widgets->min_gradient, widgets->max_gradient, &widgets->draw_min_gradient, &widgets->cig);
+ get_new_min_and_chunk_index (widgets->min_gradient, widgets->max_gradient, chunksg, G_N_ELEMENTS(chunksg), &widgets->draw_min_gradient, &widgets->cig);
// Assign locally
mina = widgets->draw_min_gradient;
widgets->min_speed = 0; /* splines sometimes give negative speeds */
/* Find suitable chunk index */
- get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed, chunkss, sizeof(chunkss)/sizeof(chunkss[0]), &widgets->draw_min_speed, &widgets->cis);
+ get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cis);
// Assign locally
mins = widgets->draw_min_speed;
/* Find suitable chunk index */
gdouble dummy = 0.0; // expect this to remain the same! (not that it's used)
- get_new_min_and_chunk_index (0, maxd, chunksd, sizeof(chunksd)/sizeof(chunksd[0]), &dummy, &widgets->cid);
+ get_new_min_and_chunk_index (0, maxd, chunksd, G_N_ELEMENTS(chunksd), &dummy, &widgets->cid);
/* clear the image */
gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->bg_gc[0],
minmax_array(widgets->ats, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width);
- get_new_min_and_chunk_index_altitude (widgets->min_altitude, widgets->max_altitude, &widgets->draw_min_altitude_time, &widgets->ciat);
+ get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude_time, &widgets->ciat);
// Assign locally
mina = widgets->draw_min_altitude_time;
widgets->min_speed = 0; /* splines sometimes give negative speeds */
/* Find suitable chunk index */
- get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed_dist, chunkss, sizeof(chunkss)/sizeof(chunkss[0]), &widgets->draw_min_speed, &widgets->cisd);
+ get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed_dist, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cisd);
// Assign locally
mins = widgets->draw_min_speed;
widgets->configure_dialog = FALSE;
// Without this the settting, the dialog will only grow in vertical size - one can not then make it smaller!
- gtk_widget_set_size_request ( widget, widgets->profile_width+widgets->profile_width_offset, widgets->profile_height );
- // In fact this allows one to compress it a bit more vertically as I don't add on the height offset
+ gtk_widget_set_size_request ( widget, widgets->profile_width+widgets->profile_width_offset, widgets->profile_height+widgets->profile_height_offset );
+
+ // Allow resizing back down to a minimal size (especially useful if the initial size has been made bigger after restoring from the saved settings)
+ GdkGeometry geom = { 600+widgets->profile_width_offset, 300+widgets->profile_height_offset, 0, 0, 0, 0, 0, 0, 0, 0, GDK_GRAVITY_STATIC };
+ gdk_window_set_geometry_hints ( gtk_widget_get_window(widget), &geom, GDK_HINT_MIN_SIZE );
}
else {
widgets->profile_width_old = widgets->profile_width;
}
#undef MARGIN
+#define VIK_SETTINGS_TRACK_PROFILE_WIDTH "track_profile_display_width"
+#define VIK_SETTINGS_TRACK_PROFILE_HEIGHT "track_profile_display_height"
+
+static void save_values ( PropWidgets *widgets )
+{
+ a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, widgets->profile_width );
+ a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, widgets->profile_height );
+}
+
static void destroy_cb ( GtkDialog *dialog, PropWidgets *widgets )
{
+ save_values(widgets);
prop_widgets_free(widgets);
}
widgets->vlp = vlp;
widgets->tr = tr;
widgets->trk_id = trk_id;
- widgets->profile_width = PROPWIN_PROFILE_WIDTH;
- widgets->profile_height = PROPWIN_PROFILE_HEIGHT;
+
+ gint profile_size_value;
+ // Ensure minimum values
+ widgets->profile_width = 600;
+ if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, &profile_size_value ) )
+ if ( profile_size_value > widgets->profile_width )
+ widgets->profile_width = profile_size_value;
+
+ widgets->profile_height = 300;
+ if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, &profile_size_value ) )
+ if ( profile_size_value > widgets->profile_height )
+ widgets->profile_height = profile_size_value;
+
gchar *title = g_strdup_printf(_("%s - Track Properties"), tr->name);
GtkWidget *dialog = gtk_dialog_new_with_buttons (title,
parent,
if (vik_track_get_dup_point_count(tr) <= 0)
gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE);
- // On dialog realization configure_event casues the graphs to be initially drawn
+ // On dialog realization configure_event causes the graphs to be initially drawn
widgets->configure_dialog = TRUE;
g_signal_connect ( G_OBJECT(dialog), "configure-event", G_CALLBACK (configure_event), widgets );