![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 98ca6609294a6f441fbcb0823c38e7021dcd43f9..4fc5a0f85a474e996a34a3ea38dec4218b1d57b3 100644 (file)
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* Peter Moulder <pmoulder@mail.csse.monash.edu.au>
+ * Johan Engelen
*
* Copyright (C) 2000-2002 authors
* Copyright (C) 2004 Monash University
+ * Copyright (C) 2007 Johan Engelen
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
GType sp_guide_get_type(void)
{
static GType guide_type = 0;
-
+
if (!guide_type) {
GTypeInfo guide_info = {
sizeof(SPGuideClass),
};
guide_type = g_type_register_static(SP_TYPE_OBJECT, "SPGuide", &guide_info, (GTypeFlags) 0);
}
-
+
return guide_type;
}
{
GObjectClass *gobject_class = (GObjectClass *) gc;
SPObjectClass *sp_object_class = (SPObjectClass *) gc;
-
+
parent_class = (SPObjectClass*) g_type_class_ref(SP_TYPE_OBJECT);
-
+
gobject_class->set_property = sp_guide_set_property;
gobject_class->get_property = sp_guide_get_property;
-
+
sp_object_class->build = sp_guide_build;
sp_object_class->release = sp_guide_release;
sp_object_class->set = sp_guide_set;
0xffffffff,
0xff000000,
(GParamFlags) G_PARAM_READWRITE));
-
+
g_object_class_install_property(gobject_class,
PROP_HICOLOR,
g_param_spec_uint("hicolor", "HiColor", "HiColor",
guide->hicolor = 0xff00007f;
}
-static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+static void sp_guide_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec */*pspec*/)
{
SPGuide &guide = *SP_GUIDE(object);
switch (prop_id) {
- case PROP_COLOR:
+ case PROP_COLOR:
guide.color = g_value_get_uint(value);
for (GSList *l = guide.views; l != NULL; l = l->next) {
sp_guideline_set_color(SP_GUIDELINE(l->data), guide.color);
}
break;
- case PROP_HICOLOR:
+ case PROP_HICOLOR:
guide.hicolor = g_value_get_uint(value);
break;
}
}
-static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+static void sp_guide_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec */*pspec*/)
{
SPGuide const &guide = *SP_GUIDE(object);
switch (prop_id) {
- case PROP_COLOR:
+ case PROP_COLOR:
g_value_set_uint(value, guide.color);
break;
- case PROP_HICOLOR:
+ case PROP_HICOLOR:
g_value_set_uint(value, guide.hicolor);
break;
}
@@ -144,7 +146,7 @@ static void sp_guide_build(SPObject *object, SPDocument *document, Inkscape::XML
if (((SPObjectClass *) (parent_class))->build) {
(* ((SPObjectClass *) (parent_class))->build)(object, document, repr);
}
-
+
sp_object_read_attr(object, "orientation");
sp_object_read_attr(object, "position");
}
@@ -152,12 +154,12 @@ static void sp_guide_build(SPObject *object, SPDocument *document, Inkscape::XML
static void sp_guide_release(SPObject *object)
{
SPGuide *guide = (SPGuide *) object;
-
+
while (guide->views) {
gtk_object_destroy(GTK_OBJECT(guide->views->data));
guide->views = g_slist_remove(guide->views, guide->views->data);
}
-
+
if (((SPObjectClass *) parent_class)->release) {
((SPObjectClass *) parent_class)->release(object);
}
@@ -172,7 +174,24 @@ static void sp_guide_set(SPObject *object, unsigned int key, const gchar *value)
if (value && !strcmp(value, "horizontal")) {
/* Visual representation of a horizontal line, constrain vertically (y coordinate). */
guide->normal = component_vectors[NR::Y];
+ } else if (value && !strcmp(value, "vertical")) {
+ guide->normal = component_vectors[NR::X];
+ } else if (value) {
+ gchar ** strarray = g_strsplit(value, ",", 2);
+ double newx, newy;
+ unsigned int success = sp_svg_number_read_d(strarray[0], &newx);
+ success += sp_svg_number_read_d(strarray[1], &newy);
+ g_strfreev (strarray);
+ if (success == 2) {
+ Geom::Point direction(newx, newy);
+ direction.normalize();
+ guide->normal = direction;
+ } else {
+ // default to vertical line for bad arguments
+ guide->normal = component_vectors[NR::X];
+ }
} else {
+ // default to vertical line for bad arguments
guide->normal = component_vectors[NR::X];
}
break;
bool const vertical_line_p = ( guide->normal == component_vectors[NR::X] );
g_assert(( guide->normal == component_vectors[NR::X] ) ||
( guide->normal == component_vectors[NR::Y] ) );
- SPCanvasItem *item = sp_guideline_new(group, guide->position, vertical_line_p);
+ SPCanvasItem *item = sp_guideline_new(group, guide->position, vertical_line_p ? Geom::Point(1.,0.) : Geom::Point(0.,1.));
sp_guideline_set_color(SP_GUIDELINE(item), guide->color);
-
+
g_signal_connect(G_OBJECT(item), "event", G_CALLBACK(handler), guide);
guide->views = g_slist_prepend(guide->views, item);
g_assert(SP_IS_GUIDE(guide));
g_assert(canvas != NULL);
g_assert(SP_IS_CANVAS(canvas));
-
+
for (GSList *l = guide->views; l != NULL; l = l->next) {
if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
gtk_object_destroy(GTK_OBJECT(l->data));
return;
}
}
-
+
g_assert_not_reached();
}
g_assert(SP_IS_GUIDE(guide));
g_assert(canvas != NULL);
g_assert(SP_IS_CANVAS(canvas));
-
+
for (GSList *l = guide->views; l != NULL; l = l->next) {
if (canvas == SP_CANVAS_ITEM(l->data)->canvas) {
sp_guideline_set_sensitive(SP_GUIDELINE(l->data), sensitive);
return;
}
}
-
+
g_assert_not_reached();
}
@@ -263,7 +282,7 @@ void sp_guide_moveto(SPGuide const &guide, gdouble const position, bool const co
sp_repr_set_svg_double(SP_OBJECT(&guide)->repr,
"position", position);
}
-
+
for (vector<SPGuideAttachment>::const_iterator i(guide.attached_items.begin()),
iEnd(guide.attached_items.end());
i != iEnd; ++i)
{
using NR::X;
using NR::Y;
-
+
if ( guide->normal == component_vectors[X] ) {
return g_strdup(_("vertical guideline"));
} else if ( guide->normal == component_vectors[Y] ) {
void sp_guide_remove(SPGuide *guide)
{
g_assert(SP_IS_GUIDE(guide));
-
+
for (vector<SPGuideAttachment>::const_iterator i(guide->attached_items.begin()),
iEnd(guide->attached_items.end());
i != iEnd; ++i)
remove_last(att.item->constraints, SPGuideConstraint(guide, att.snappoint_ix));
}
guide->attached_items.clear();
-
+
sp_repr_unparent(SP_OBJECT(guide)->repr);
}