![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/live_effects/parameter/pointparam-knotholder.cpp b/src/live_effects/parameter/pointparam-knotholder.cpp
index fa042be5ad6323c272d08abf98ffd5cd838417ea..55cb812093a6b9bdc2a4e90f60aa7f5594f663d4 100644 (file)
-<<<<<<< .mine\r
-#define INKSCAPE_LPE_POINTPARAM_KNOTHOLDER_C\r
-\r
-/*\r
- * Container for PointParamKnotHolder visual handles\r
- *\r
- * Authors:\r
- * Johan Engelen <goejendaagh@zonnet.nl>\r
- *\r
- * Copyright (C) 2008 authors\r
- *\r
- * Released under GNU GPL, read the file 'COPYING' for more information\r
- */\r
-\r
-#include "live_effects/parameter/pointparam-knotholder.h"\r
-#include "live_effects/lpeobject.h"\r
-#include "document.h"\r
-#include "sp-shape.h"\r
-#include "knot.h"\r
-#include "knotholder.h"\r
-#include "knot-holder-entity.h"\r
-\r
-#include <libnr/nr-matrix-div.h>\r
-#include <glibmm/i18n.h>\r
-#include <2geom/point.h>\r
-#include <2geom/matrix.h>\r
-#include "svg/stringstream.h"\r
-#include "xml/repr.h"\r
-\r
-class SPDesktop;\r
-\r
-namespace Inkscape {\r
-\r
-static void pointparam_knot_clicked_handler (SPKnot *knot, guint state, PointParamKnotHolder *kh);\r
-static void pointparam_knot_moved_handler(SPKnot *knot, NR::Point const *p, guint state, PointParamKnotHolder *kh);\r
-static void pointparam_knot_ungrabbed_handler (SPKnot *knot, unsigned int state, PointParamKnotHolder *kh);\r
-static void pointparam_knot_holder_class_init(PointParamKnotHolderClass *klass);\r
-\r
-void pointparam_knot_holder_dispose(GObject *object);\r
-\r
-static SPKnotHolderClass *parent_class;\r
-\r
-/**\r
- * Registers PointParamKnotHolder class and returns its type number.\r
- */\r
-GType pointparam_knot_holder_get_type()\r
-{\r
- static GType type = 0;\r
- if (!type) {\r
- GTypeInfo info = {\r
- sizeof(PointParamKnotHolderClass),\r
- NULL, /* base_init */\r
- NULL, /* base_finalize */\r
- (GClassInitFunc) pointparam_knot_holder_class_init,\r
- NULL, /* class_finalize */\r
- NULL, /* class_data */\r
- sizeof (PointParamKnotHolder),\r
- 16, /* n_preallocs */\r
- NULL,\r
- NULL\r
- };\r
- type = g_type_register_static (G_TYPE_OBJECT, "InkscapePointParamKnotHolder", &info, (GTypeFlags) 0);\r
- }\r
- return type;\r
-}\r
-\r
-/**\r
- * PointParamKnotHolder vtable initialization.\r
- */\r
-static void pointparam_knot_holder_class_init(PointParamKnotHolderClass *klass)\r
-{\r
- GObjectClass *gobject_class;\r
- gobject_class = (GObjectClass *) klass;\r
-\r
- parent_class = (SPKnotHolderClass*) g_type_class_peek_parent(klass);\r
- gobject_class->dispose = pointparam_knot_holder_dispose;\r
-}\r
-\r
-PointParamKnotHolder *pointparam_knot_holder_new(SPDesktop *desktop, SPObject *lpeobject, const gchar * key, SPItem *item)\r
-{\r
- g_return_val_if_fail(desktop != NULL, NULL);\r
- g_return_val_if_fail(item != NULL, NULL);\r
- g_return_val_if_fail(SP_IS_ITEM(item), NULL);\r
-\r
- PointParamKnotHolder *knot_holder = (PointParamKnotHolder*)g_object_new (INKSCAPE_TYPE_POINTPARAM_KNOT_HOLDER, 0);\r
- knot_holder->desktop = desktop;\r
- knot_holder->item = item;\r
- knot_holder->lpeobject = LIVEPATHEFFECT(lpeobject);\r
- g_object_ref(G_OBJECT(item));\r
- g_object_ref(G_OBJECT(lpeobject));\r
- knot_holder->entity = NULL;\r
-\r
- knot_holder->released = NULL;\r
-\r
- knot_holder->repr = lpeobject->repr;\r
- knot_holder->repr_key = key;\r
-\r
- knot_holder->local_change = FALSE;\r
-\r
- return knot_holder;\r
-}\r
-\r
-void pointparam_knot_holder_dispose(GObject *object) {\r
- PointParamKnotHolder *kh = G_TYPE_CHECK_INSTANCE_CAST((object), INKSCAPE_TYPE_POINTPARAM_KNOT_HOLDER, PointParamKnotHolder);\r
-\r
- g_object_unref(G_OBJECT(kh->item));\r
- g_object_unref(G_OBJECT(kh->lpeobject));\r
- while (kh->entity) {\r
- SPKnotHolderEntity *e = (SPKnotHolderEntity *) kh->entity->data;\r
- g_signal_handler_disconnect(e->knot, e->_click_handler_id);\r
- g_signal_handler_disconnect(e->knot, e->_ungrab_handler_id);\r
- /* unref should call destroy */\r
- g_object_unref(e->knot);\r
- g_free(e);\r
- kh->entity = g_slist_remove(kh->entity, e);\r
- }\r
-}\r
-\r
-void\r
-PointParamKnotHolder::add_knot (\r
- Geom::Point & p,\r
- PointParamKnotHolderClickedFunc knot_click,\r
- SPKnotShapeType shape,\r
- SPKnotModeType mode,\r
- guint32 color,\r
- const gchar *tip )\r
-{\r
- /* create new SPKnotHolderEntry */\r
- SPKnotHolderEntity *e = g_new(SPKnotHolderEntity, 1);\r
- e->knot = sp_knot_new(desktop, tip);\r
- e->knot_set = NULL;\r
- e->knot_get = NULL;\r
- if (knot_click) {\r
- e->knot_click = knot_click;\r
- } else {\r
- e->knot_click = NULL;\r
- }\r
-\r
- g_object_set(G_OBJECT (e->knot->item), "shape", shape, NULL);\r
- g_object_set(G_OBJECT (e->knot->item), "mode", mode, NULL);\r
-\r
- e->knot->fill [SP_KNOT_STATE_NORMAL] = color;\r
- g_object_set (G_OBJECT (e->knot->item), "fill_color", color, NULL);\r
-\r
- entity = g_slist_append(entity, e);\r
-\r
- /* Move to current point. */\r
- NR::Point dp = p * sp_item_i2d_affine(item);\r
- sp_knot_set_position(e->knot, &dp, SP_KNOT_STATE_NORMAL);\r
-\r
- e->handler_id = g_signal_connect(e->knot, "moved", G_CALLBACK(pointparam_knot_moved_handler), this);\r
- e->_click_handler_id = g_signal_connect(e->knot, "clicked", G_CALLBACK(pointparam_knot_clicked_handler), this);\r
- e->_ungrab_handler_id = g_signal_connect(e->knot, "ungrabbed", G_CALLBACK(pointparam_knot_ungrabbed_handler), this);\r
-\r
- sp_knot_show(e->knot);\r
-}\r
-\r
-static void pointparam_knot_clicked_handler(SPKnot */*knot*/, guint /*state*/, PointParamKnotHolder */*kh*/)\r
-{\r
-\r
-}\r
-\r
-/**\r
- * \param p In desktop coordinates.\r
- * This function does not write to XML, but tries to write directly to the PointParam to quickly live update the effect\r
- */\r
-static void pointparam_knot_moved_handler(SPKnot */*knot*/, NR::Point const *p, guint /*state*/, PointParamKnotHolder *kh)\r
-{\r
- NR::Matrix const i2d(sp_item_i2d_affine(kh->item));\r
- NR::Point pos = (*p) / i2d;\r
-\r
- Inkscape::SVGOStringStream os;\r
- os << pos.to_2geom();\r
-\r
- kh->lpeobject->lpe->setParameter(kh->repr_key, os.str().c_str());\r
-}\r
-\r
-static void pointparam_knot_ungrabbed_handler(SPKnot *knot, unsigned int /*state*/, PointParamKnotHolder *kh)\r
-{\r
- NR::Matrix const i2d(sp_item_i2d_affine(kh->item));\r
- NR::Point pos = sp_knot_position(knot) / i2d;\r
-\r
- Inkscape::SVGOStringStream os;\r
- os << pos.to_2geom();\r
-\r
- kh->repr->setAttribute(kh->repr_key , os.str().c_str());\r
-\r
- sp_document_done(SP_OBJECT_DOCUMENT (kh->lpeobject), SP_VERB_CONTEXT_LPE, _("Change LPE point parameter"));\r
-}\r
-\r
-} // namespace Inkscape\r
-\r
-/*\r
- Local Variables:\r
- mode:c++\r
- c-file-style:"stroustrup"\r
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))\r
- indent-tabs-mode:nil\r
- fill-column:99\r
- End:\r
-*/\r
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :\r
-=======\r
#define INKSCAPE_LPE_POINTPARAM_KNOTHOLDER_C
/*
NR::Point pos = (*p) / i2d;
Inkscape::SVGOStringStream os;
- os << pos[0] << "," << pos[1];
+ os << pos.to_2geom();
kh->lpeobject->lpe->setParameter(kh->repr_key, os.str().c_str());
}
@@ -383,11 +180,11 @@ static void pointparam_knot_ungrabbed_handler(SPKnot *knot, unsigned int /*state
NR::Point pos = sp_knot_position(knot) / i2d;
Inkscape::SVGOStringStream os;
- os << pos[0] << "," << pos[1];
+ os << pos.to_2geom();
kh->repr->setAttribute(kh->repr_key , os.str().c_str());
- sp_document_done(SP_OBJECT_DOCUMENT (kh->lpeobject), SP_VERB_CONTEXT_NODE, _("Change LPE point parameter"));
+ sp_document_done(SP_OBJECT_DOCUMENT (kh->lpeobject), SP_VERB_CONTEXT_LPE, _("Change LPE point parameter"));
}
} // namespace Inkscape
@@ -402,4 +199,3 @@ static void pointparam_knot_ungrabbed_handler(SPKnot *knot, unsigned int /*state
End:
*/
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
->>>>>>> .r17984\r