![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 44ad9dc9e9cf32addeff77e79348da8bfe0abffd..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 "desktop-handles.h"
#include "knotholder.h"
#include "live_effects/parameter/point.h"
-#include "nodepath.h"
#include "xml/node-event-vector.h"
#include "preferences.h"
#include "object-edit.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;
- this->nodepath_listener_attached_for = NULL;
}
ShapeEditor::~ShapeEditor() {
unset_item(SH_KNOTHOLDER);
- unset_item(SH_NODEPATH);
}
void ShapeEditor::unset_item(SubType type, bool keep_knotholder) {
switch (type) {
case SH_NODEPATH:
- if (this->nodepath) {
- old_repr = this->nodepath->repr;
- if (old_repr && old_repr == nodepath_listener_attached_for) {
- sp_repr_remove_listener_by_data(old_repr, this);
- Inkscape::GC::release(old_repr);
- nodepath_listener_attached_for = NULL;
- }
-
- this->grab_node = -1;
- delete this->nodepath;
- this->nodepath = NULL;
- }
+ // defunct
break;
case SH_KNOTHOLDER:
if (this->knotholder) {
}
bool ShapeEditor::has_nodepath () {
- return (this->nodepath != NULL);
+ return false;
}
bool ShapeEditor::has_knotholder () {
bool ShapeEditor::has_local_change (SubType type) {
switch (type) {
case SH_NODEPATH:
- return (this->nodepath && this->nodepath->local_change);
+ // defunct
+ return false;
case SH_KNOTHOLDER:
return (this->knotholder && this->knotholder->local_change != 0);
default:
void ShapeEditor::decrement_local_change (SubType type) {
switch (type) {
case SH_NODEPATH:
- if (this->nodepath && this->nodepath->local_change > 0) {
- this->nodepath->local_change--;
- }
+ // defunct
break;
case SH_KNOTHOLDER:
if (this->knotholder) {
const SPItem *item = NULL;
switch (type) {
case SH_NODEPATH:
- if (this->has_nodepath()) {
- item = this->nodepath->item;
- }
+ // defunct
break;
case SH_KNOTHOLDER:
if (this->has_knotholder()) {
}
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
}
-bool ShapeEditor::nodepath_edits_repr_key(gchar const *name) {
- if (nodepath && name) {
- return ( !strcmp(name, nodepath->repr_key) || !strcmp(name, nodepath->repr_nodetypes_key) );
- }
-
- return false;
-}
-
-
void ShapeEditor::shapeeditor_event_attr_changed(gchar const *name)
{
- gboolean changed_np = FALSE;
gboolean changed_kh = FALSE;
- if (has_nodepath() && nodepath_edits_repr_key(name))
- {
- changed_np = !has_local_change(SH_NODEPATH);
- decrement_local_change(SH_NODEPATH);
- }
-
- if (changed_np) {
- GList *saved = NULL;
- if (has_nodepath()) {
- saved = save_nodepath_selection();
- }
-
- reset_item(SH_NODEPATH);
-
- if (has_nodepath() && saved) {
- restore_nodepath_selection(saved);
- g_list_free (saved);
- }
- }
-
if (has_knotholder())
{
changed_kh = !has_local_change(SH_KNOTHOLDER);
reset_item(SH_KNOTHOLDER, !strcmp(name, "d"));
}
}
-
- update_statusbar(); //TODO: get_container()->update_statusbar();
}
@@ -243,27 +174,11 @@ void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
// since this freezes the handles
unset_item(type, keep_knotholder);
- this->grab_node = -1;
-
if (item) {
Inkscape::XML::Node *repr;
switch(type) {
case SH_NODEPATH:
- if (SP_IS_LPE_ITEM(item)) {
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- this->nodepath = sp_nodepath_new(desktop, item, (prefs->getBool("/tools/nodes/show_handles", true)));
- }
- if (this->nodepath) {
- this->nodepath->shape_editor = this;
-
- // setting new listener
- repr = SP_OBJECT_REPR(item);
- if (repr != nodepath_listener_attached_for) {
- Inkscape::GC::anchor(repr);
- sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- nodepath_listener_attached_for = repr;
- }
- }
+ // defunct
break;
case SH_KNOTHOLDER:
}
}
-/** Please note that this function only works for path parameters.
-* All other parameters probably will crash Inkscape!
-*/
-void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, LivePathEffectObject *lpeobject, const char * key)
-{
- unset_item(SH_NODEPATH);
-
- this->grab_node = -1;
-
- if (lpeobject) {
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- this->nodepath = sp_nodepath_new( desktop, lpeobject,
- (prefs->getInt("/tools/nodes/show_handles", true)),
- key, item);
- if (this->nodepath) {
- this->nodepath->shape_editor = this;
-
- // setting new listener
- Inkscape::XML::Node *repr = SP_OBJECT_REPR(lpeobject);
- if (repr && repr != nodepath_listener_attached_for) {
- Inkscape::GC::anchor(repr);
- sp_repr_add_listener(repr, &shapeeditor_repr_events, this);
- nodepath_listener_attached_for = repr;
- }
- }
- }
-}
-
/** 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? */
{
switch (type) {
case SH_NODEPATH:
- if ( (nodepath) && (IS_LIVEPATHEFFECT(nodepath->object)) ) {
- char * key = g_strdup(nodepath->repr_key);
- set_item_lpe_path_parameter(nodepath->item, LIVEPATHEFFECT(nodepath->object), key); // the above checks for nodepath, so it is indeed a path that we are editing
- g_free(key);
- } else {
- SPObject *obj = sp_desktop_document(desktop)->getObjectByRepr(nodepath_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_NODEPATH);
- }
+ // defunct
break;
case SH_KNOTHOLDER:
if ( knotholder ) {
}
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 (Geom::Point event_p, bool remember) {
- if (!this->nodepath)
- return false; // no stroke in knotholder
-
- const SPItem *item = get_item(SH_NODEPATH);
-
- if (!item || !SP_IS_ITEM(item))
- return false;
-
- //Translate click point into proper coord system
- this->curvepoint_doc = desktop->w2d(event_p);
- this->curvepoint_doc *= sp_item_dt2i_affine(item);
-
- SPCurve *curve = this->nodepath->curve; // not sure if np->curve is always up to date...
- Geom::PathVector const &pathv = curve->get_pathvector();
- boost::optional<Geom::PathVectorPosition> pvpos = Geom::nearestPoint(pathv, this->curvepoint_doc);
- if (!pvpos) {
- g_print("Warning! Possible error?\n");
- return false;
- }
-
- Geom::Point nearest = pathv[pvpos->path_nr].pointAt(pvpos->t);
- Geom::Point delta = nearest - this->curvepoint_doc;
-
- delta = desktop->d2w(delta);
-
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- double stroke_tolerance =
- (( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
- desktop->current_zoom() *
- SP_OBJECT_STYLE (item)->stroke_width.computed * 0.5 *
- to_2geom(sp_item_i2d_affine(item)).descrim()
- : 0.0)
- + prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100)) / to_2geom(sp_item_i2d_affine(item)).descrim();
- bool close = (Geom::L2 (delta) < stroke_tolerance);
-
- if (remember && close) {
- // calculate index for nodepath's representation.
- double int_part;
- double t = std::modf(pvpos->t, &int_part);
- unsigned int segment_index = (unsigned int)int_part + 1;
- for (unsigned int i = 0; i < pvpos->path_nr; ++i) {
- segment_index += pathv[i].size() + 1;
- if (pathv[i].closed())
- segment_index += 1;
- }
-
- this->curvepoint_event[Geom::X] = (gint) event_p [Geom::X];
- this->curvepoint_event[Geom::Y] = (gint) event_p [Geom::Y];
- this->hit = true;
- this->grab_t = t;
- this->grab_node = segment_index;
- }
-
- 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);
- }
- 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 && !this->nodepath->straight_path) {
-
- 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[Geom::X] == x &&
- this->curvepoint_event[Geom::Y] == y)
- return;
-
- Geom::Point const delta_w(eventx - this->curvepoint_event[Geom::X],
- eventy - this->curvepoint_event[Geom::Y]);
- Geom::Point const delta_dt(this->desktop->w2d(delta_w));
-
- sp_nodepath_curve_drag (this->nodepath, this->grab_node, this->grab_t, delta_dt);
- this->curvepoint_event[Geom::X] = x;
- this->curvepoint_event[Geom::Y] = y;
-
- }
- 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"));
- }
-}
-
-void ShapeEditor::select_rect(Geom::Rect const &rect, bool add) {
- if (this->nodepath) {
- sp_nodepath_select_rect(this->nodepath, rect, add);
- }
}
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(this->nodepath);
-}
-
-void ShapeEditor::delete_nodes () {
- sp_node_selected_delete(this->nodepath);
-}
-
-void ShapeEditor::delete_nodes_preserving_shape () {
- if (this->nodepath && this->nodepath->selected) {
- sp_node_delete_preserve(g_list_copy(this->nodepath->selected));
- }
-}
-
-void ShapeEditor::delete_segment () {
- sp_node_selected_delete_segment(this->nodepath);
-}
-
-void ShapeEditor::set_node_type(int type) {
- sp_node_selected_set_type(this->nodepath, (Inkscape::NodePath::NodeType) type);
-}
-
-void ShapeEditor::break_at_nodes() {
- sp_node_selected_break(this->nodepath);
-}
-
-void ShapeEditor::join_nodes() {
- sp_node_selected_join(this->nodepath);
-}
-
-void ShapeEditor::join_segments() {
- sp_node_selected_join_segment(this->nodepath);
-}
-
-void ShapeEditor::duplicate_nodes() {
- sp_node_selected_duplicate(this->nodepath);
-}
-
-void ShapeEditor::set_type_of_segments(NRPathcode code) {
- sp_node_selected_set_line_type(this->nodepath, code);
-}
-
-void ShapeEditor::move_nodes_screen(SPDesktop *desktop, gdouble dx, gdouble dy) {
- sp_node_selected_move_screen(desktop, this->nodepath, dx, dy);
-}
-void ShapeEditor::move_nodes(gdouble dx, gdouble dy) {
- sp_node_selected_move(this->nodepath, dx, dy);
-}
-
-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);
- if (this->nodepath->numSelected() >= 1) {
- this->desktop->scroll_to_point(this->nodepath->singleSelectedCoords(), 1.0);
- }
- }
-}
-void ShapeEditor::select_prev () {
- if (this->nodepath) {
- sp_nodepath_select_prev (this->nodepath);
- if (this->nodepath->numSelected() >= 1) {
- this->desktop->scroll_to_point(this->nodepath->singleSelectedCoords(), 1.0);
- }
+/**
+ * \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::show_handles (bool show) {
- if (this->nodepath && !this->nodepath->straight_path)
- 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 (Geom::Dim2 axis, boost::optional<Geom::Point> center) {
- if (this->nodepath)
- sp_nodepath_flip (this->nodepath, axis, center);
-}
-
-void ShapeEditor::distribute (Geom::Dim2 axis) {
- if (this->nodepath)
- sp_nodepath_selected_distribute (this->nodepath, axis);
-}
-void ShapeEditor::align (Geom::Dim2 axis) {
- if (this->nodepath)
- sp_nodepath_selected_align (this->nodepath, axis);
-}
-
-
/*
Local Variables:
mode:c++