diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 4fe1130bcd48347c66afe8cffcf501f33bfb61c4..1b81e1a83acbefdda643ae52a4ad912ffea62500 100644 (file)
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
#include "desktop.h"
#include "desktop-handles.h"
#include "knotholder.h"
-#include "live_effects/parameter/pointparam-knotholder.h"
+#include "live_effects/parameter/point.h"
#include "nodepath.h"
#include "xml/node-event-vector.h"
-#include "prefs-utils.h"
+#include "preferences.h"
#include "object-edit.h"
#include "style.h"
#include "display/curve.h"
}
this->grab_node = -1;
- sp_nodepath_destroy(this->nodepath);
+ delete this->nodepath;
this->nodepath = NULL;
}
break;
return false;
}
-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)
{
gboolean changed_np = FALSE;
gboolean changed_kh = FALSE;
- g_assert(data);
- ShapeEditor *sh = ((ShapeEditor *) data);
-
- if (sh->has_nodepath() && sh->nodepath_edits_repr_key(name))
+ if (has_nodepath() && nodepath_edits_repr_key(name))
{
- changed_np = !sh->has_local_change(SH_NODEPATH);
- sh->decrement_local_change(SH_NODEPATH);
-
+ changed_np = !has_local_change(SH_NODEPATH);
+ decrement_local_change(SH_NODEPATH);
}
if (changed_np) {
GList *saved = NULL;
- if (sh->has_nodepath()) {
- saved = sh->save_nodepath_selection();
+ if (has_nodepath()) {
+ saved = save_nodepath_selection();
}
- sh->reset_item(SH_NODEPATH);
+ reset_item(SH_NODEPATH);
- if (sh->has_nodepath() && saved) {
- sh->restore_nodepath_selection(saved);
+ if (has_nodepath() && saved) {
+ restore_nodepath_selection(saved);
g_list_free (saved);
}
}
-
- if (sh->has_knotholder())
+ if (has_knotholder())
{
- changed_kh = !sh->has_local_change(SH_KNOTHOLDER);
- sh->decrement_local_change(SH_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
- sh->reset_item(SH_KNOTHOLDER, !strcmp(name, "d"));
+ reset_item(SH_KNOTHOLDER, !strcmp(name, "d"));
}
}
- sh->update_statusbar(); //TODO: sh->get_container()->update_statusbar();
+ update_statusbar(); //TODO: get_container()->update_statusbar();
+}
+
+
+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->shapeeditor_event_attr_changed(name);
}
static Inkscape::XML::NodeEventVector shapeeditor_repr_events = {
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
+ // 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);
this->grab_node = -1;
switch(type) {
case SH_NODEPATH:
if (SP_IS_LPE_ITEM(item)) {
- this->nodepath = sp_nodepath_new(desktop, item, (prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0));
+ 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;
@@ -286,8 +293,9 @@ void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, SPObject *lpeobject,
this->grab_node = -1;
if (lpeobject) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
this->nodepath = sp_nodepath_new( desktop, lpeobject,
- (prefs_get_int_attribute("tools.nodes", "show_handles", 1) != 0),
+ (prefs->getInt("/tools/nodes/show_handles", true)),
key, item);
if (this->nodepath) {
this->nodepath->shape_editor = this;
@@ -303,23 +311,8 @@ void ShapeEditor::set_item_lpe_path_parameter(SPItem *item, SPObject *lpeobject,
}
}
-/**
-* pass a new knotholder to ShapeEditor to manage (and delete)
-*/
-void
-ShapeEditor::set_knotholder(KnotHolder * knot_holder)
-{
- unset_item(SH_KNOTHOLDER);
-
- 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?
+/** 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)
{
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_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100)) / to_2geom(sp_item_i2d_affine(item)).descrim();
+ + 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) {