double lat, lon, elev, pan;
gis_viewer_get_location(viewer, &lat, &lon, &elev);
pan = MIN(elev/(EARTH_R/2), 30);
- gdk_threads_leave();
switch (event->keyval) {
case GDK_Left: case GDK_h: gis_viewer_pan(viewer, 0, -pan, 0); break;
case GDK_Down: case GDK_j: gis_viewer_pan(viewer, -pan, 0, 0); break;
case 1: viewer->drag_mode = GIS_DRAG_PAN; break;
case 2: viewer->drag_mode = GIS_DRAG_ZOOM; break;
case 3: viewer->drag_mode = GIS_DRAG_TILT; break;
- defualt: viewer->drag_mode = GIS_DRAG_NONE; break;
+ default: viewer->drag_mode = GIS_DRAG_NONE; break;
}
viewer->drag_x = event->x;
viewer->drag_y = event->y;
static gboolean on_motion_notify(GisViewer *viewer, GdkEventMotion *event, gpointer _)
{
- gdouble x_dist = viewer->drag_x - event->x;
- gdouble y_dist = viewer->drag_y - event->y;
+ gdouble x = viewer->drag_x - event->x;
+ gdouble y = viewer->drag_y - event->y;
gdouble lat, lon, elev, scale;
gis_viewer_get_location(GIS_VIEWER(viewer), &lat, &lon, &elev);
scale = elev/EARTH_R/15;
switch (viewer->drag_mode) {
- case GIS_DRAG_PAN:
- gis_viewer_pan(viewer, -y_dist*scale, x_dist*scale, 0);
- break;
- case GIS_DRAG_ZOOM:
- gis_viewer_zoom(viewer, pow(2, -y_dist/500));
- break;
- case GIS_DRAG_TILT:
- gis_viewer_rotate(viewer, y_dist/10, 0, x_dist/10);
- break;
+ case GIS_DRAG_PAN: gis_viewer_pan(viewer, -y*scale, x*scale, 0); break;
+ case GIS_DRAG_ZOOM: gis_viewer_zoom(viewer, pow(2, -y/500)); break;
+ case GIS_DRAG_TILT: gis_viewer_rotate(viewer, y/10, 0, x/10); break;
}
viewer->drag_x = event->x;
viewer->drag_y = event->y;
gtk_widget_queue_draw(GTK_WIDGET(viewer));
}
+static void on_realize(GisViewer *viewer)
+{
+ GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
+ GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(viewer));
+ gdk_window_set_cursor(window, cursor);
+}
+
/***********
* Methods *
***********/
*
* Set the current time for the view
*/
-void gis_viewer_set_time(GisViewer *viewer, const char *time)
+void gis_viewer_set_time(GisViewer *viewer, time_t time)
{
g_assert(GIS_IS_VIEWER(viewer));
- g_debug("GisViewer: set_time - time=%s", time);
- g_free(viewer->time);
- viewer->time = g_strdup(time);
+ g_debug("GisViewer: set_time - time=%ld", time);
+ viewer->time = time;
_gis_viewer_emit_time_changed(viewer);
}
*
* Returns: the current time
*/
-gchar *gis_viewer_get_time(GisViewer *viewer)
+time_t gis_viewer_get_time(GisViewer *viewer)
{
g_assert(GIS_IS_VIEWER(viewer));
g_debug("GisViewer: get_time");
/**
* gis_viewer_set_height_func:
* @viewer: the viewer
- * @tile: the area to set the height function for
+ * @bounds: the area to set the height function for
* @height_func: the height function
* @user_data: user data to pass to the height function
- * @update: %TRUE if the heights inside the tile should be updated.
+ * @update: %TRUE if the heights inside the bounds should be updated.
*
* Set the height function to be used for a given part of the surface..
*/
-void gis_viewer_set_height_func(GisViewer *viewer, GisTile *tile,
+void gis_viewer_set_height_func(GisViewer *viewer, GisBounds *bounds,
GisHeightFunc height_func, gpointer user_data,
gboolean update)
{
GisViewerClass *klass = GIS_VIEWER_GET_CLASS(viewer);
if (!klass->set_height_func)
g_warning("GisViewer: set_height_func - Unimplemented");
- klass->set_height_func(viewer, tile, height_func, user_data, update);
+ klass->set_height_func(viewer, bounds, height_func, user_data, update);
}
/**
{
g_debug("GisViewer: init");
/* Default values */
- viewer->time = g_strdup("");
+ viewer->time = time(NULL);
viewer->location[0] = 40;
viewer->location[1] = -100;
viewer->location[2] = 1.5*EARTH_R;
g_signal_connect(viewer, "location-changed", G_CALLBACK(on_view_changed), NULL);
g_signal_connect(viewer, "rotation-changed", G_CALLBACK(on_view_changed), NULL);
+
+ g_signal_connect(viewer, "realize", G_CALLBACK(on_realize), NULL);
}
static void gis_viewer_finalize(GObject *gobject)
{
g_debug("GisViewer: finalize");
- GisViewer *viewer = GIS_VIEWER(gobject);
- g_free(viewer->time);
G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject);
}
static void gis_viewer_class_init(GisViewerClass *klass)
/**
* GisViewer::time-changed:
* @viewer: the viewer.
- * @time: a string representation of the time.
+ * @time: the new time.
*
* The ::time-changed signal is emitted when the viewers current time
* changers.
0,
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
+ g_cclosure_marshal_VOID__LONG,
G_TYPE_NONE,
1,
- G_TYPE_STRING);
+ G_TYPE_LONG);
/**
* GisViewer::location-changed: