![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 19b9ea64dc18239d2fc12969bbed9f29a5050ae9..1962b710ca1ad6accb7a02ad6611ad1228361b8b 100644 (file)
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
-#define __SHAPE_EDITOR_CPP__
-
/*
* Inkscape::ShapeEditor
*
* Authors:
* bulia byak <buliabyak@users.sf.net>
+ * Krzysztof Kosiński <tweenk.pl@gmail.com>
*
*/
#include "config.h"
#endif
+#include <string.h>
#include <glibmm/i18n.h>
#include "sp-object.h"
#include "sp-item.h"
+#include "sp-lpe-item.h"
+#include "live_effects/lpeobject.h"
#include "selection.h"
#include "desktop.h"
+#include "document.h"
#include "desktop-handles.h"
#include "knotholder.h"
-#include "node-context.h"
+#include "live_effects/parameter/point.h"
#include "xml/node-event-vector.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "object-edit.h"
-#include "splivarot.h"
#include "style.h"
+#include "display/curve.h"
+#include <2geom/pathvector.h>
#include "shape-editor.h"
-
-ShapeEditorsCollective::ShapeEditorsCollective(SPDesktop *dt) {
-}
-
-ShapeEditorsCollective::~ShapeEditorsCollective() {
-}
-
-
-void ShapeEditorsCollective::update_statusbar() {
-
-//!!! move from nodepath: sp_nodepath_update_statusbar but summing for all nodepaths
-
-}
-
ShapeEditor::ShapeEditor(SPDesktop *dt) {
this->desktop = dt;
- this->grab_node = -1;
- this->nodepath = NULL;
this->knotholder = NULL;
- this->hit = false;
+ this->knotholder_listener_attached_for = NULL;
}
ShapeEditor::~ShapeEditor() {
- unset_item();
+ unset_item(SH_KNOTHOLDER);
}
-void ShapeEditor::unset_item() {
-
+void ShapeEditor::unset_item(SubType type, bool keep_knotholder) {
Inkscape::XML::Node *old_repr = NULL;
- if (this->nodepath) {
- old_repr = this->nodepath->repr;
- }
-
- if (!old_repr && this->knotholder) {
- old_repr = this->knotholder->repr;
- }
-
- if (old_repr) { // remove old listener
- sp_repr_remove_listener_by_data(old_repr, this);
- Inkscape::GC::release(old_repr);
- }
-
- if (this->nodepath) {
- this->grab_node = -1;
- sp_nodepath_destroy(this->nodepath);
- this->nodepath = NULL;
- }
-
- if (this->knotholder) {
- sp_knot_holder_destroy(this->knotholder);
- this->knotholder = NULL;
+ switch (type) {
+ case SH_NODEPATH:
+ // defunct
+ break;
+ case SH_KNOTHOLDER:
+ if (this->knotholder) {
+ old_repr = this->knotholder->repr;
+ if (old_repr && old_repr == knotholder_listener_attached_for) {
+ sp_repr_remove_listener_by_data(old_repr, this);
+ Inkscape::GC::release(old_repr);
+ knotholder_listener_attached_for = NULL;
+ }
+
+ if (!keep_knotholder) {
+ delete this->knotholder;
+ this->knotholder = NULL;
+ }
+ }
+ break;
}
}
bool ShapeEditor::has_nodepath () {
- return (this->nodepath != NULL);
+ return false;
}
bool ShapeEditor::has_knotholder () {
return (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;
+void ShapeEditor::update_knotholder () {
+ if (this->knotholder)
+ this->knotholder->update_knots();
+}
+
+bool ShapeEditor::has_local_change (SubType type) {
+ switch (type) {
+ case SH_NODEPATH:
+ // defunct
+ return false;
+ case SH_KNOTHOLDER:
+ return (this->knotholder && this->knotholder->local_change != 0);
+ default:
+ g_assert_not_reached();
+ }
}
-void ShapeEditor::decrement_local_change () {
- if (this->nodepath) {
- if (this->nodepath->local_change > 0)
- this->nodepath->local_change--;
- } else if (this->knotholder) {
- this->knotholder->local_change = FALSE;
+void ShapeEditor::decrement_local_change (SubType type) {
+ switch (type) {
+ case SH_NODEPATH:
+ // defunct
+ break;
+ case SH_KNOTHOLDER:
+ if (this->knotholder) {
+ this->knotholder->local_change = FALSE;
+ }
+ break;
+ default:
+ g_assert_not_reached();
}
}
-SPItem *ShapeEditor::get_item () {
- SPItem *item = NULL;
- if (this->has_nodepath()) {
- item = SP_ITEM(this->nodepath->path);
- } else if (this->has_knotholder()) {
- item = SP_ITEM(this->knotholder->item);
+const SPItem *ShapeEditor::get_item (SubType type) {
+ const SPItem *item = NULL;
+ switch (type) {
+ case SH_NODEPATH:
+ // defunct
+ break;
+ case SH_KNOTHOLDER:
+ if (this->has_knotholder()) {
+ item = this->knotholder->getItem();
+ }
+ break;
}
return item;
}
GList *ShapeEditor::save_nodepath_selection () {
- if (this->nodepath)
- return ::save_nodepath_selection (this->nodepath);
+ // defunct stub
return NULL;
}
-void ShapeEditor::restore_nodepath_selection (GList *saved) {
- if (this->nodepath && saved)
- ::restore_nodepath_selection (this->nodepath, saved);
+void ShapeEditor::restore_nodepath_selection (GList */*saved*/) {
+ // defunct stub
}
-
-static void shapeeditor_event_attr_changed(Inkscape::XML::Node *repr, gchar const *name,
- gchar const *old_value, gchar const *new_value,
- bool is_interactive, gpointer data)
+void ShapeEditor::shapeeditor_event_attr_changed(gchar const *name)
{
- SPItem *item = NULL;
- gboolean changed = FALSE;
-
- g_assert(data);
- ShapeEditor *sh = ((ShapeEditor *) data);
-
- item = sh->get_item();
-
- if (
- ((sh->has_nodepath()) && (!strcmp(name, "d") || !strcmp(name, "sodipodi:nodetypes"))) // With paths, we only need to act if one of the path-affecting attributes has changed.
- || sh->has_knotholder()) {
- changed = !sh->has_local_change();
- sh->decrement_local_change();
- }
-
- if (changed) {
- GList *saved = NULL;
- if (sh->has_nodepath()) {
- saved = sh->save_nodepath_selection();
+ gboolean changed_kh = FALSE;
+
+ if (has_knotholder())
+ {
+ changed_kh = !has_local_change(SH_KNOTHOLDER);
+ decrement_local_change(SH_KNOTHOLDER);
+ if (changed_kh) {
+ // this can happen if an LPEItem's knotholder handle was dragged, in which case we want
+ // to keep the knotholder; in all other cases (e.g., if the LPE itself changes) we delete it
+ reset_item(SH_KNOTHOLDER, !strcmp(name, "d"));
}
+ }
+}
- sh->set_item (item);
- if (sh->has_nodepath() && saved) {
- sh->restore_nodepath_selection(saved);
- g_list_free (saved);
- }
- }
+static void shapeeditor_event_attr_changed(Inkscape::XML::Node */*repr*/, gchar const *name,
+ gchar const */*old_value*/, gchar const */*new_value*/,
+ bool /*is_interactive*/, gpointer data)
+{
+ g_assert(data);
+ ShapeEditor *sh = ((ShapeEditor *) data);
- sh->update_statusbar(); //TODO: sh->get_container()->update_statusbar();
+ sh->shapeeditor_event_attr_changed(name);
}
static Inkscape::XML::NodeEventVector shapeeditor_repr_events = {
};
-void ShapeEditor::set_item(SPItem *item) {
-
- unset_item();
-
- this->grab_node = -1;
+void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
+ // this happens (and should only happen) when for an LPEItem having both knotholder and
+ // nodepath the knotholder is adapted; in this case we don't want to delete the knotholder
+ // since this freezes the handles
+ unset_item(type, keep_knotholder);
if (item) {
- this->nodepath = sp_nodepath_new(desktop, item, (prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0));
- if (this->nodepath) {
- this->nodepath->shape_editor = this;
+ Inkscape::XML::Node *repr;
+ switch(type) {
+ case SH_NODEPATH:
+ // defunct
+ break;
+
+ case SH_KNOTHOLDER:
+ if (!this->knotholder) {
+ // only recreate knotholder if none is present
+ this->knotholder = sp_item_knot_holder(item, desktop);
+ }
+ if (this->knotholder) {
+ this->knotholder->update_knots();
+ // setting new listener
+ repr = this->knotholder->repr;
+ if (repr != knotholder_listener_attached_for) {
+ Inkscape::GC::anchor(repr);
+ sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
+ knotholder_listener_attached_for = repr;
+ }
+ }
+ break;
}
- this->knotholder = sp_item_knot_holder(item, desktop);
-
- if (this->nodepath || this->knotholder) {
- // setting new listener
- Inkscape::XML::Node *repr;
- if (this->knotholder)
- repr = this->knotholder->repr;
- else
- repr = SP_OBJECT_REPR(item);
- if (repr) {
- Inkscape::GC::anchor(repr);
- sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- }
- }
- }
-}
-
-void ShapeEditor::nodepath_destroyed () {
- this->nodepath = NULL;
-}
-
-void ShapeEditor::update_statusbar () {
- if (this->nodepath)
- sp_nodepath_update_statusbar(this->nodepath);
-}
-
-bool ShapeEditor::is_over_stroke (NR::Point event_p, bool remember) {
-
- if (!this->nodepath)
- return false; // no stroke in knotholder
-
- 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 *= sp_item_i2doc_affine(item);
-
- sp_nodepath_ensure_livarot_path(this->nodepath);
-
- NR::Maybe<Path::cut_position> position = get_nearest_position_on_Path(this->nodepath->livarot_path, this->curvepoint_doc);
- NR::Point nearest = get_point_on_Path(this->nodepath->livarot_path, position.assume().piece, position.assume().t);
- NR::Point delta = nearest - this->curvepoint_doc;
-
- delta = desktop->d2w(delta);
-
- double stroke_tolerance =
- (SP_OBJECT_STYLE (item)->stroke.type != SP_PAINT_TYPE_NONE?
- desktop->current_zoom() *
- SP_OBJECT_STYLE (item)->stroke_width.computed *
- sp_item_i2d_affine (item).expansion() * 0.5
- : 0.0)
- + prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); //(double) SP_EVENT_CONTEXT(nc)->tolerance;
-
- bool close = (NR::L2 (delta) < stroke_tolerance);
-
- if (remember && close) {
- this->curvepoint_event[NR::X] = (gint) event_p [NR::X];
- this->curvepoint_event[NR::Y] = (gint) event_p [NR::Y];
- this->hit = true;
- this->grab_t = position.assume().t;
- this->grab_node = position.assume().piece;
- }
-
- return close;
-}
-
-void ShapeEditor::add_node_near_point() {
- if (this->nodepath) {
- sp_nodepath_add_node_near_point(this->nodepath, this->curvepoint_doc);
- } else if (this->knotholder) {
- // we do not add nodes in knotholder... yet
- }
-}
-
-void ShapeEditor::select_segment_near_point(bool toggle) {
- if (this->nodepath) {
- sp_nodepath_select_segment_near_point(this->nodepath, this->curvepoint_doc, toggle);
- } else if (this->knotholder) {
- // we do not select segments in knotholder... yet?
}
}
-void ShapeEditor::cancel_hit() {
- this->hit = false;
-}
-
-bool ShapeEditor::hits_curve() {
- return (this->hit);
-}
-
-
-void ShapeEditor::curve_drag(gdouble eventx, gdouble eventy) {
- if (this->nodepath) {
-
- if (this->grab_node == -1) // don't know which segment to drag
- return;
-
- // We round off the extra precision in the motion coordinates provided
- // by some input devices (like tablets). As we'll store the coordinates
- // as integers in curvepoint_event we need to do this rounding before
- // comparing them with the last coordinates from curvepoint_event.
- // See bug #1593499 for details.
-
- gint x = (gint) Inkscape::round(eventx);
- gint y = (gint) Inkscape::round(eventy);
-
-
- // The coordinates hasn't changed since the last motion event, abort
- if (this->curvepoint_event[NR::X] == x &&
- this->curvepoint_event[NR::Y] == y)
- return;
- NR::Point const delta_w(eventx - this->curvepoint_event[NR::X],
- eventy - this->curvepoint_event[NR::Y]);
- NR::Point const delta_dt(this->desktop->w2d(delta_w));
-
- sp_nodepath_curve_drag (this->grab_node, this->grab_t, delta_dt); //!!! FIXME: which nodepath?!!! also uses current!!!
- this->curvepoint_event[NR::X] = x;
- this->curvepoint_event[NR::Y] = y;
-
- } else if (this->knotholder) {
- // we do not drag curve in knotholder
- }
-
-}
-
-void ShapeEditor::finish_drag() {
- if (this->nodepath && this->hit) {
- sp_nodepath_update_repr (this->nodepath, _("Drag curve"));
+/** FIXME: This thing is only called when the item needs to be updated in response to repr change.
+ Why not make a reload function in NodePath and in KnotHolder? */
+void ShapeEditor::reset_item (SubType type, bool keep_knotholder)
+{
+ switch (type) {
+ case SH_NODEPATH:
+ // defunct
+ break;
+ case SH_KNOTHOLDER:
+ if ( knotholder ) {
+ SPObject *obj = sp_desktop_document(desktop)->getObjectByRepr(knotholder_listener_attached_for); /// note that it is not certain that this is an SPItem; it could be a LivePathEffectObject.
+ set_item(SP_ITEM(obj), SH_KNOTHOLDER, keep_knotholder);
+ }
+ break;
}
}
-void ShapeEditor::select_rect(NR::Rect const &rect, bool add) {
- if (this->nodepath) {
- sp_nodepath_select_rect(this->nodepath, rect, add);
- }
+void ShapeEditor::nodepath_destroyed () {
}
bool ShapeEditor::has_selection() {
- if (this->nodepath)
- return this->nodepath->selected;
return false; // so far, knotholder cannot have selection
}
-void ShapeEditor::deselect() {
- if (this->nodepath)
- sp_nodepath_deselect(this->nodepath);
-}
-
-void ShapeEditor::add_node () {
- sp_node_selected_add_node(); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::delete_nodes () {
- sp_node_selected_delete(); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::delete_nodes_preserving_shape () {
- if (this->nodepath && this->nodepath->selected) {
- sp_node_delete_preserve(g_list_copy(this->nodepath->selected));
+/**
+ * \brief Returns true if this ShapeEditor has a knot above which the mouse currently hovers
+ */
+bool ShapeEditor::knot_mouseover()
+{
+ if (this->knotholder) {
+ return knotholder->knot_mouseover();
}
+ return false;
}
-void ShapeEditor::set_node_type(Inkscape::NodePath::NodeType type) {
- sp_node_selected_set_type(type); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::break_at_nodes() {
- sp_node_selected_break(); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::join_nodes() {
- sp_node_selected_join(); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::duplicate_nodes() {
- sp_node_selected_duplicate(); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::set_type_of_segments(NRPathcode code) {
- sp_node_selected_set_line_type(code); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::move_nodes_screen(gdouble dx, gdouble dy) {
- sp_node_selected_move_screen(dx, dy); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-void ShapeEditor::move_nodes(gdouble dx, gdouble dy) {
- sp_node_selected_move(dx, dy); // FIXME fix that function by removing nodepath_current lookup, and pass it this->nodepath instead (needs fixing verbs/buttons first)
-}
-
-void ShapeEditor::rotate_nodes(gdouble angle, int which, bool screen) {
- if (this->nodepath)
- sp_nodepath_selected_nodes_rotate (this->nodepath, angle, which, screen);
-}
-
-void ShapeEditor::scale_nodes(gdouble const grow, int const which) {
- sp_nodepath_selected_nodes_scale(this->nodepath, grow, which);
-}
-void ShapeEditor::scale_nodes_screen(gdouble const grow, int const which) {
- sp_nodepath_selected_nodes_scale_screen(this->nodepath, grow, which);
-}
-
-void ShapeEditor::select_all (bool invert) {
- if (this->nodepath)
- sp_nodepath_select_all (this->nodepath, invert);
-}
-void ShapeEditor::select_all_from_subpath (bool invert) {
- if (this->nodepath)
- sp_nodepath_select_all_from_subpath (this->nodepath, invert);
-}
-void ShapeEditor::select_next () {
- if (this->nodepath)
- sp_nodepath_select_next (this->nodepath);
-}
-void ShapeEditor::select_prev () {
- if (this->nodepath)
- sp_nodepath_select_prev (this->nodepath);
-}
-
-void ShapeEditor::flip (NR::Dim2 axis) {
- if (this->nodepath)
- sp_nodepath_flip (this->nodepath, axis);
-}
-
-void ShapeEditor::distribute (NR::Dim2 axis) {
- if (this->nodepath)
- sp_nodepath_selected_distribute (this->nodepath, axis);
-}
-void ShapeEditor::align (NR::Dim2 axis) {
- if (this->nodepath)
- sp_nodepath_selected_align (this->nodepath, axis);
-}
-
-
/*
Local Variables:
mode:c++