* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MATH_H
#include <math.h>
+#endif
+#include <glib/gi18n.h>
#include "viking.h"
-#include "vikcoordlayer_pixmap.h"
+#include "icons/icons.h"
-static VikCoordLayer *coord_layer_copy ( VikCoordLayer *vcl, gpointer vp );
static void coord_layer_marshall( VikCoordLayer *vcl, guint8 **data, gint *len );
static VikCoordLayer *coord_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp );
-static gboolean coord_layer_set_param ( VikCoordLayer *vcl, guint16 id, VikLayerParamData data, VikViewport *vp );
-static VikLayerParamData coord_layer_get_param ( VikCoordLayer *vcl, guint16 id );
+static gboolean coord_layer_set_param ( VikCoordLayer *vcl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation );
+static VikLayerParamData coord_layer_get_param ( VikCoordLayer *vcl, guint16 id, gboolean is_file_operation );
static void coord_layer_update_gc ( VikCoordLayer *vcl, VikViewport *vp, const gchar *color );
static void coord_layer_post_read ( VikLayer *vl, VikViewport *vp, gboolean from_file );
};
static VikLayerParam coord_layer_params[] = {
- { "color", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, "Color:", VIK_LAYER_WIDGET_ENTRY },
- { "min_inc", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, "Minutes Width:", VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 0 },
- { "line_thickness", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, "Line Thickness:", VIK_LAYER_WIDGET_SPINBUTTON, param_scales + 1 },
+ { "color", VIK_LAYER_PARAM_COLOR, VIK_LAYER_GROUP_NONE, N_("Color:"), VIK_LAYER_WIDGET_COLOR, 0 },
+ { "min_inc", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Minutes Width:"), 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 },
};
VikLayerInterface vik_coord_layer_interface = {
"Coord",
- &coordlayer_pixbuf,
+ N_("Coordinate"),
+ NULL,
+ &vikcoordlayer_pixbuf,
NULL,
0,
(VikLayerFuncCreate) vik_coord_layer_create,
(VikLayerFuncRealize) NULL,
- coord_layer_post_read,
+ (VikLayerFuncPostRead) coord_layer_post_read,
(VikLayerFuncFree) vik_coord_layer_free,
(VikLayerFuncProperties) NULL,
(VikLayerFuncSublayerRenameRequest) NULL,
(VikLayerFuncSublayerToggleVisible) NULL,
+ (VikLayerFuncSublayerTooltip) NULL,
+ (VikLayerFuncLayerTooltip) NULL,
+ (VikLayerFuncLayerSelected) NULL,
- (VikLayerFuncCopy) coord_layer_copy,
(VikLayerFuncMarshall) coord_layer_marshall,
(VikLayerFuncUnmarshall) coord_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 _VikCoordLayer {
GdkGC *gc;
gdouble deg_inc;
guint8 line_thickness;
- gchar *color;
+ GdkColor *color;
};
GType vik_coord_layer_get_type ()
return vcl_type;
}
-static VikCoordLayer *coord_layer_copy ( VikCoordLayer *vcl, gpointer vp )
-{
- VikCoordLayer *rv = vik_coord_layer_new ( );
-
- rv->color = g_strdup ( vcl->color );
- rv->deg_inc = vcl->deg_inc;
- rv->line_thickness = vcl->line_thickness;
- rv->gc = vcl->gc;
- g_object_ref ( rv->gc );
- return rv;
-}
-
static void coord_layer_marshall( VikCoordLayer *vcl, guint8 **data, gint *len )
{
vik_layer_marshall_params ( VIK_LAYER(vcl), data, len );
static VikCoordLayer *coord_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp )
{
- VikCoordLayer *rv = vik_coord_layer_new ( vvp );
+ VikCoordLayer *rv = vik_coord_layer_new ();
vik_layer_unmarshall_params ( VIK_LAYER(rv), data, len, vvp );
return rv;
}
-gboolean coord_layer_set_param ( VikCoordLayer *vcl, guint16 id, VikLayerParamData data, VikViewport *vp )
+gboolean coord_layer_set_param ( VikCoordLayer *vcl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation )
{
switch ( id )
{
- case PARAM_COLOR: if ( vcl->color ) g_free ( vcl->color ); vcl->color = g_strdup ( data.s ); break;
+ case PARAM_COLOR: if ( vcl->color ) gdk_color_free ( vcl->color ); vcl->color = gdk_color_copy( &(data.c)); break;
case PARAM_MIN_INC: vcl->deg_inc = data.d / 60.0; break;
case PARAM_LINE_THICKNESS: if ( data.u >= 1 && data.u <= 15 ) vcl->line_thickness = data.u; break;
}
return TRUE;
}
-static VikLayerParamData coord_layer_get_param ( VikCoordLayer *vcl, guint16 id )
+static VikLayerParamData coord_layer_get_param ( VikCoordLayer *vcl, guint16 id, gboolean is_file_operation )
{
VikLayerParamData rv;
switch ( id )
{
- case PARAM_COLOR: rv.s = vcl->color ? vcl->color : ""; break;
+ case PARAM_COLOR:
+ if (vcl->color)
+ {
+ rv.c.pixel = vcl->color->pixel;
+ rv.c.red = vcl->color->red;
+ rv.c.green = vcl->color->green;
+ rv.c.blue = vcl->color->blue;
+ }
+ break;
case PARAM_MIN_INC: rv.d = vcl->deg_inc * 60.0; break;
case PARAM_LINE_THICKNESS: rv.i = vcl->line_thickness; break;
}
if ( vcl->gc )
g_object_unref ( G_OBJECT(vcl->gc) );
- vcl->gc = vik_viewport_new_gc ( vp, vcl->color, vcl->line_thickness );
+ vcl->gc = vik_viewport_new_gc_from_color ( vp, vcl->color, vcl->line_thickness );
+
}
VikCoordLayer *vik_coord_layer_new ( )
{
+ GdkColor InitColor;
+
VikCoordLayer *vcl = VIK_COORD_LAYER ( g_object_new ( VIK_COORD_LAYER_TYPE, NULL ) );
- vik_layer_init ( VIK_LAYER(vcl), VIK_LAYER_COORD );
+ vik_layer_set_type ( VIK_LAYER(vcl), VIK_LAYER_COORD );
+
+ InitColor.pixel = 0;
+ InitColor.red = 65535;
+ InitColor.green = 65535;
+ InitColor.blue = 65535;
vcl->gc = NULL;
vcl->deg_inc = 1.0/60.0;
vcl->line_thickness = 3;
- vcl->color = NULL;
+ vcl->color = gdk_color_copy (&InitColor);
return vcl;
}
gdouble l, r, i, j;
gint x1, y1, x2, y2, smod = 1, mmod = 1;
gboolean mins = FALSE, secs = FALSE;
- GdkGC *dgc = vik_viewport_new_gc(vp, vcl->color, vcl->line_thickness);
- GdkGC *mgc = vik_viewport_new_gc(vp, vcl->color, MAX(vcl->line_thickness/2, 1));
- GdkGC *sgc = vik_viewport_new_gc(vp, vcl->color, MAX(vcl->line_thickness/5, 1));
+ GdkGC *dgc = vik_viewport_new_gc_from_color(vp, vcl->color, vcl->line_thickness);
+ GdkGC *mgc = vik_viewport_new_gc_from_color(vp, vcl->color, MAX(vcl->line_thickness/2, 1));
+ GdkGC *sgc = vik_viewport_new_gc_from_color(vp, vcl->color, MAX(vcl->line_thickness/5, 1));
vik_viewport_screen_to_coord ( vp, 0, 0, &left );
vik_viewport_screen_to_coord ( vp, vik_viewport_get_width(vp), 0, &right );
max.lat = (topleft.lat > topright.lat) ? topleft.lat : topright.lat;
}
+ /* Can zoom out more than whole world and so the above can give invalid positions */
+ /* Restrict values properly so drawing doesn't go into a near 'infinite' loop */
+ if ( min.lon < -180.0 )
+ min.lon = -180.0;
+ if ( max.lon > 180.0 )
+ max.lon = 180.0;
+ if ( min.lat < -90.0 )
+ min.lat = -90.0;
+ if ( max.lat > 90.0 )
+ max.lat = 90.0;
+
lon = ((double) ((long) ((min.lon)/ vcl->deg_inc))) * vcl->deg_inc;
ll.lon = ll2.lon = lon;
g_object_unref ( G_OBJECT(vcl->gc) );
if ( vcl->color != NULL )
- g_free ( vcl->color );
+ gdk_color_free ( vcl->color );
}
static void coord_layer_update_gc ( VikCoordLayer *vcl, VikViewport *vp, const gchar *color )
{
+ GdkColor InitColor;
+
if ( vcl->color )
- g_free ( vcl->color );
+ gdk_color_free ( vcl->color );
- vcl->color = g_strdup ( color );
+ gdk_color_parse( color, &InitColor);
+ vcl->color = gdk_color_copy( &InitColor );
if ( vcl->gc )
g_object_unref ( G_OBJECT(vcl->gc) );
- vcl->gc = vik_viewport_new_gc ( vp, vcl->color, vcl->line_thickness );
+ vcl->gc = vik_viewport_new_gc_from_color ( vp, vcl->color, vcl->line_thickness );
}
VikCoordLayer *vik_coord_layer_create ( VikViewport *vp )
projects / andy / viking.git / blobdiff