diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index a2a9a86ebb38952f289c40dea12371aace0d548f..91909d8505fdae651ef80a5a552d3d7c4c972889 100644 (file)
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
#include "config.h"
#endif
+#include <string.h>
#include <glibmm/i18n.h>
#include "sp-object.h"
#include "desktop.h"
#include "desktop-handles.h"
#include "knotholder.h"
+#include "live_effects/parameter/pointparam-knotholder.h"
#include "node-context.h"
#include "xml/node-event-vector.h"
#include "prefs-utils.h"
}
if (this->knotholder) {
- sp_knot_holder_destroy(this->knotholder);
+ delete this->knotholder;
this->knotholder = NULL;
}
}
}
bool ShapeEditor::has_local_change () {
- if (this->nodepath)
- return (this->nodepath->local_change != 0);
- else if (this->knotholder)
- return (this->knotholder->local_change != 0);
- else
- return false;
+ return ((this->nodepath && this->nodepath->local_change) ||
+ (this->knotholder && this->knotholder->local_change != 0));
}
void ShapeEditor::decrement_local_change () {
- if (this->nodepath) {
- if (this->nodepath->local_change > 0)
- this->nodepath->local_change--;
+ if (this->nodepath && this->nodepath->local_change > 0) {
+ this->nodepath->local_change--;
} else if (this->knotholder) {
this->knotholder->local_change = FALSE;
}
this->grab_node = -1;
if (item) {
- this->nodepath = sp_nodepath_new(desktop, item, (prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0));
+ if (SP_IS_LPE_ITEM(item)) {
+ SPLPEItem *lpeitem = SP_LPE_ITEM(item);
+ Inkscape::LivePathEffect::Effect *lpe = sp_lpe_item_get_current_lpe(lpeitem);
+ if (!(lpe && lpe->isVisible() && lpe->providesKnotholder())) {
+ // only create nodepath if the item either doesn't have an LPE
+ // or the LPE is invisible or it doesn't provide a knotholder itself
+ this->nodepath = sp_nodepath_new(desktop, item,
+ (prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0));
+ } else if (lpe && lpe->isVisible()) {
+ sp_lpe_item_add_temporary_canvasitems(lpeitem, desktop);
+ }
+ }
+
if (this->nodepath) {
this->nodepath->shape_editor = this;
}
/** Please note that this function only works for path parameters.
* All other parameters probably will crash Inkscape!
-* Fortunately, there are no other on-canvas edittable objects at this moment :)
*/
-void ShapeEditor::set_item_livepatheffect_parameter(SPItem *item, SPObject *lpeobject, const char * key) {
-
+void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, SPObject *lpeobject, const char * key)
+{
unset_item();
this->grab_node = -1;
if (lpeobject) {
- this->knotholder = NULL; // it's a path, no special knotholder needed.
this->nodepath = sp_nodepath_new( desktop, lpeobject,
(prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0),
key, item);
@@ -237,6 +244,22 @@ void ShapeEditor::set_item_livepatheffect_parameter(SPItem *item, SPObject *lpeo
}
}
+/**
+* pass a new knotholder to ShapeEditor to manage (and delete)
+*/
+void
+ShapeEditor::set_knotholder(KnotHolder * knot_holder)
+{
+ unset_item();
+
+ this->grab_node = -1;
+
+ if (knot_holder) {
+ this->knotholder = knot_holder;
+ }
+}
+
+
/** FIXME: think about this. Is this thing only called when the item needs to be updated?
Why not make a reload function in NodePath and in KnotHolder? */
void ShapeEditor::reset_item ()
SPItem * item = this->nodepath->item;
SPObject *obj = this->nodepath->object;
char * key = g_strdup(this->nodepath->repr_key);
- set_item_livepatheffect_parameter(item, obj, key);
+ set_item_lpe_path_parameter(item, obj, key); // the above checks for nodepath, so it is indeed a path that we are editing
g_free(key);
} else {
SPItem * item = get_item();
//Translate click point into proper coord system
this->curvepoint_doc = desktop->w2d(event_p);
- this->curvepoint_doc *= sp_item_dt2i_affine(item);
+ this->curvepoint_doc *= from_2geom(sp_item_dt2i_affine(item));
sp_nodepath_ensure_livarot_path(this->nodepath);
(( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
desktop->current_zoom() *
SP_OBJECT_STYLE (item)->stroke_width.computed * 0.5 *
- sp_item_i2d_affine (item).expansion()
+ NR::expansion(from_2geom(sp_item_i2d_affine(item)))
: 0.0)
- + prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100)) /sp_item_i2d_affine (item).expansion();
+ + prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100)) /NR::expansion(from_2geom(sp_item_i2d_affine(item)));
bool close = (NR::L2 (delta) < stroke_tolerance);
if (remember && close) {
sp_nodepath_show_handles (this->nodepath, show);
}
+void ShapeEditor::show_helperpath (bool show) {
+ if (this->nodepath)
+ sp_nodepath_show_helperpath (this->nodepath, show);
+}
void ShapeEditor::flip (NR::Dim2 axis, NR::Maybe<NR::Point> center) {
if (this->nodepath)