diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index df10ca7a1605a391bdc332ebf021c920314e2753..3f55d040bc426a0f806c2d0f37617da34c167395 100644 (file)
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
#include "svg/svg.h"
#include "display/canvas-bpath.h"
-#include "display/bezier-utils.h"
#include <glib/gmem.h>
#include "macros.h"
#include "desktop.h"
#include "desktop-events.h"
#include "desktop-handles.h"
-#include "desktop-affine.h"
#include "desktop-style.h"
#include "message-context.h"
#include "pixmaps/cursor-tweak-move.xpm"
#include "livarot/Shape.h"
#include <2geom/isnan.h>
#include <2geom/transforms.h>
-#include "prefs-utils.h"
+#include "preferences.h"
#include "style.h"
#include "box3d.h"
#include "sp-item-transform.h"
static void sp_tweak_context_dispose(GObject *object);
static void sp_tweak_context_setup(SPEventContext *ec);
-static void sp_tweak_context_set(SPEventContext *ec, gchar const *key, gchar const *val);
+static void sp_tweak_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val);
static gint sp_tweak_context_root_handler(SPEventContext *ec, GdkEvent *event);
static SPEventContextClass *parent_class;
switch (tc->mode) {
case TWEAK_MODE_MOVE:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag to <b>move</b>."), sel_message);
- break;
event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_MOVE_IN_OUT:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>move in</b>; with Shift to <b>move out</b>."), sel_message);
+ event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_MOVE_JITTER:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>move randomly</b>."), sel_message);
+ event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_SCALE:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>scale down</b>; with Shift to <b>scale up</b>."), sel_message);
+ event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_ROTATE:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>rotate clockwise</b>; with Shift, <b>counterclockwise</b>."), sel_message);
+ event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_MORELESS:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>duplicate</b>; with Shift, <b>delete</b>."), sel_message);
+ event_context->cursor_shape = cursor_tweak_move_xpm;
break;
case TWEAK_MODE_PUSH:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag to <b>push paths</b>."), sel_message);
break;
case TWEAK_MODE_COLORPAINT:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>paint objects</b> with color."), sel_message);
+ event_context->cursor_shape = cursor_color_xpm;
break;
case TWEAK_MODE_COLORJITTER:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE, _("%s. Drag or click to <b>randomize colors</b>."), sel_message);
if (tc->mode == TWEAK_MODE_COLORPAINT) { // intercept color setting only in this mode
// we cannot store properties with uris
css = sp_css_attr_unset_uris ((SPCSSAttr *) css);
-
- sp_repr_css_change (inkscape_get_repr (INKSCAPE, "tools.tweak"), (SPCSSAttr *) css, "style");
-
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ prefs->setStyle("/tools/tweak/style", const_cast<SPCSSAttr*>(css));
return true;
}
return false;
tc->style_set_connection = ec->desktop->connectSetStyle( // catch style-setting signal in this tool
sigc::bind(sigc::ptr_fun(&sp_tweak_context_style_set), tc)
);
-
- if (prefs_get_int_attribute("tools.tweak", "selcue", 0) != 0) {
+
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ if (prefs->getBool("/tools/tweak/selcue")) {
ec->enableSelectionCue();
}
- if (prefs_get_int_attribute("tools.tweak", "gradientdrag", 0) != 0) {
+ if (prefs->getBool("/tools/tweak/gradientdrag")) {
ec->enableGrDrag();
}
}
static void
-sp_tweak_context_set(SPEventContext *ec, gchar const *key, gchar const *val)
+sp_tweak_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val)
{
SPTweakContext *tc = SP_TWEAK_CONTEXT(ec);
+ Glib::ustring path = val->getEntryName();
- if (!strcmp(key, "width")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.1 );
- tc->width = CLAMP(dval, -1000.0, 1000.0);
- } else if (!strcmp(key, "mode")) {
- gint64 const dval = ( val ? g_ascii_strtoll (val, NULL, 10) : 0 );
- tc->mode = dval;
+ if (path == "width") {
+ tc->width = CLAMP(val->getDouble(0.1), -1000.0, 1000.0);
+ } else if (path == "mode") {
+ tc->mode = val->getInt();
sp_tweak_update_cursor(tc, false);
- } else if (!strcmp(key, "fidelity")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 0.0 );
- tc->fidelity = CLAMP(dval, 0.0, 1.0);
- } else if (!strcmp(key, "force")) {
- double const dval = ( val ? g_ascii_strtod (val, NULL) : 1.0 );
- tc->force = CLAMP(dval, 0, 1.0);
- } else if (!strcmp(key, "usepressure")) {
- tc->usepressure = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "doh")) {
- tc->do_h = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "dos")) {
- tc->do_s = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "dol")) {
- tc->do_l = (val && strcmp(val, "0"));
- } else if (!strcmp(key, "doo")) {
- tc->do_o = (val && strcmp(val, "0"));
+ } else if (path == "fidelity") {
+ tc->fidelity = CLAMP(val->getDouble(), 0.0, 1.0);
+ } else if (path == "force") {
+ tc->force = CLAMP(val->getDouble(1.0), 0, 1.0);
+ } else if (path == "usepressure") {
+ tc->usepressure = val->getBool();
+ } else if (path == "doh") {
+ tc->do_h = val->getBool();
+ } else if (path == "dos") {
+ tc->do_s = val->getBool();
+ } else if (path == "dol") {
+ tc->do_l = val->getBool();
+ } else if (path == "doo") {
+ tc->do_o = val->getBool();
}
}
@@ -411,18 +411,39 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
selection->add(item);
}
+ if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
+ GSList *items = g_slist_prepend (NULL, item);
+ GSList *selected = NULL;
+ GSList *to_select = NULL;
+ SPDocument *doc = SP_OBJECT_DOCUMENT(item);
+ sp_item_list_to_curves (items, &selected, &to_select);
+ g_slist_free (items);
+ SPObject* newObj = doc->getObjectByRepr((Inkscape::XML::Node *) to_select->data);
+ g_slist_free (to_select);
+ item = (SPItem *) newObj;
+ selection->add(item);
+ }
+
if (SP_IS_GROUP(item) && !SP_IS_BOX3D(item)) {
+ GSList *children = NULL;
for (SPObject *child = sp_object_first_child(SP_OBJECT(item)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child)) {
- if (sp_tweak_dilate_recursive (selection, SP_ITEM(child), p, vector, mode, radius, force, fidelity, reverse))
- did = true;
+ children = g_slist_prepend(children, child);
}
}
+ for (GSList *i = children; i; i = i->next) {
+ SPItem *child = SP_ITEM(i->data);
+ if (sp_tweak_dilate_recursive (selection, SP_ITEM(child), p, vector, mode, radius, force, fidelity, reverse))
+ did = true;
+ }
+
+ g_slist_free(children);
+
} else {
if (mode == TWEAK_MODE_MOVE) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double x = Geom::L2(a->midpoint() - p)/radius;
if (a->contains(p)) x = 0;
@@ -435,7 +456,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
} else if (mode == TWEAK_MODE_MOVE_IN_OUT) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double x = Geom::L2(a->midpoint() - p)/radius;
if (a->contains(p)) x = 0;
@@ -449,7 +470,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
} else if (mode == TWEAK_MODE_MOVE_JITTER) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double dp = g_random_double_range(0, M_PI*2);
double dr = g_random_double_range(0, radius);
@@ -464,7 +485,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
} else if (mode == TWEAK_MODE_SCALE) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double x = Geom::L2(a->midpoint() - p)/radius;
if (a->contains(p)) x = 0;
@@ -477,7 +498,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
} else if (mode == TWEAK_MODE_ROTATE) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double x = Geom::L2(a->midpoint() - p)/radius;
if (a->contains(p)) x = 0;
@@ -490,7 +511,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
} else if (mode == TWEAK_MODE_MORELESS) {
- boost::optional<Geom::Rect> a = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect a = item->getBounds(sp_item_i2doc_affine(item));
if (a) {
double x = Geom::L2(a->midpoint() - p)/radius;
if (a->contains(p)) x = 0;
@@ -516,11 +537,12 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
}
Inkscape::GC::release(copy);
}
+ did = true;
}
}
}
- } else if (SP_IS_PATH(item) || SP_IS_SHAPE(item) || SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
+ } else if (SP_IS_PATH(item) || SP_IS_SHAPE(item)) {
Inkscape::XML::Node *newrepr = NULL;
gint pos = 0;
@@ -541,7 +563,7 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P
// skip those paths whose bboxes are entirely out of reach with our radius
- boost::optional<Geom::Rect> bbox = item->getBounds(sp_item_i2doc_affine(item));
+ Geom::OptRect bbox = item->getBounds(sp_item_i2doc_affine(item));
if (bbox) {
bbox->expandBy(radius);
if (!bbox->contains(p)) {
void
tweak_colors_in_gradient (SPItem *item, bool fill_or_stroke,
- guint32 const rgb_goal, NR::Point p_w, double radius, double force, guint mode,
+ guint32 const rgb_goal, Geom::Point p_w, double radius, double force, guint mode,
bool do_h, bool do_s, bool do_l, bool /*do_o*/)
{
SPGradient *gradient = sp_item_gradient (item, fill_or_stroke);
if (!gradient || !SP_IS_GRADIENT(gradient))
return;
- NR::Matrix i2d (sp_item_i2doc_affine (item));
- NR::Point p = p_w * i2d.inverse();
+ Geom::Matrix i2d (sp_item_i2doc_affine (item));
+ Geom::Point p = p_w * i2d.inverse();
p *= (gradient->gradientTransform).inverse();
// now p is in gradient's original coordinates
if (SP_IS_LINEARGRADIENT(gradient)) {
SPLinearGradient *lg = SP_LINEARGRADIENT(gradient);
- NR::Point p1(lg->x1.computed, lg->y1.computed);
- NR::Point p2(lg->x2.computed, lg->y2.computed);
- NR::Point pdiff(p2 - p1);
- double vl = NR::L2(pdiff);
+ Geom::Point p1(lg->x1.computed, lg->y1.computed);
+ Geom::Point p2(lg->x2.computed, lg->y2.computed);
+ Geom::Point pdiff(p2 - p1);
+ double vl = Geom::L2(pdiff);
// This is the matrix which moves and rotates the gradient line
// so it's oriented along the X axis:
- NR::Matrix norm = NR::Matrix(Geom::Translate(-p1)) * NR::Matrix(Geom::Rotate(-atan2(pdiff[NR::Y], pdiff[NR::X])));
+ Geom::Matrix norm = Geom::Matrix(Geom::Translate(-p1)) * Geom::Matrix(Geom::Rotate(-atan2(pdiff[Geom::Y], pdiff[Geom::X])));
// Transform the mouse point by it to find out its projection onto the gradient line:
- NR::Point pnorm = p * norm;
+ Geom::Point pnorm = p * norm;
// Scale its X coordinate to match the length of the gradient line:
- pos = pnorm[NR::X] / vl;
+ pos = pnorm[Geom::X] / vl;
// Calculate radius in lenfth-of-gradient-line units
r = radius / vl;
} else if (SP_IS_RADIALGRADIENT(gradient)) {
SPRadialGradient *rg = SP_RADIALGRADIENT(gradient);
- NR::Point c (rg->cx.computed, rg->cy.computed);
- pos = NR::L2(p - c) / rg->r.computed;
+ Geom::Point c (rg->cx.computed, rg->cy.computed);
+ pos = Geom::L2(p - c) / rg->r.computed;
r = radius / rg->r.computed;
}
guint32 stroke_goal, bool do_stroke,
float opacity_goal, bool do_opacity,
bool do_blur, bool reverse,
- NR::Point p, double radius, double force,
+ Geom::Point p, double radius, double force,
bool do_h, bool do_s, bool do_l, bool do_o)
{
bool did = false;
if (!style) {
return false;
}
- boost::optional<Geom::Rect> bbox = item->getBounds(sp_item_i2doc_affine(item),
+ Geom::OptRect bbox = item->getBounds(sp_item_i2doc_affine(item),
SPItem::GEOMETRIC_BBOX);
if (!bbox) {
return false;
Geom::Rect brush(p - Geom::Point(radius, radius), p + Geom::Point(radius, radius));
- NR::Point center = bbox->midpoint();
+ Geom::Point center = bbox->midpoint();
double this_force;
// if item == item_at_point, use max force
// else if object > 0.5 brush: test 4 corners of bbox and center on being in the brush, choose max
// else if still smaller, then check only the object center:
} else {
- this_force = force * tweak_profile (NR::L2 (p - center), radius);
+ this_force = force * tweak_profile (Geom::L2 (p - center), radius);
}
if (this_force > 0.002) {
if (do_blur) {
- boost::optional<Geom::Rect> bbox = item->getBounds(sp_item_i2doc_affine(item),
+ Geom::OptRect bbox = item->getBounds(sp_item_i2doc_affine(item),
SPItem::GEOMETRIC_BBOX);
if (!bbox) {
return did;
bool
-sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point vector, bool reverse)
+sp_tweak_dilate (SPTweakContext *tc, Geom::Point event_p, Geom::Point p, Geom::Point vector, bool reverse)
{
Inkscape::Selection *selection = sp_desktop_selection(SP_EVENT_CONTEXT(tc)->desktop);
SPDesktop *desktop = SP_EVENT_CONTEXT(tc)->desktop;
@@ -1038,10 +1060,28 @@ sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point v
SPItem *item_at_point = SP_EVENT_CONTEXT(tc)->desktop->item_at_point(event_p, TRUE);
bool do_fill = false, do_stroke = false, do_opacity = false;
- guint32 fill_goal = sp_desktop_get_color_tool(desktop, "tools.tweak", true, &do_fill);
- guint32 stroke_goal = sp_desktop_get_color_tool(desktop, "tools.tweak", false, &do_stroke);
- double opacity_goal = sp_desktop_get_master_opacity_tool(desktop, "tools.tweak", &do_opacity);
+ guint32 fill_goal = sp_desktop_get_color_tool(desktop, "/tools/tweak", true, &do_fill);
+ guint32 stroke_goal = sp_desktop_get_color_tool(desktop, "/tools/tweak", false, &do_stroke);
+ double opacity_goal = sp_desktop_get_master_opacity_tool(desktop, "/tools/tweak", &do_opacity);
if (reverse) {
+#if 0
+ // HSL inversion
+ float hsv[3];
+ float rgb[3];
+ sp_color_rgb_to_hsv_floatv (hsv,
+ SP_RGBA32_R_F(fill_goal),
+ SP_RGBA32_G_F(fill_goal),
+ SP_RGBA32_B_F(fill_goal));
+ sp_color_hsv_to_rgb_floatv (rgb, hsv[0]<.5? hsv[0]+.5 : hsv[0]-.5, 1 - hsv[1], 1 - hsv[2]);
+ fill_goal = SP_RGBA32_F_COMPOSE(rgb[0], rgb[1], rgb[2], 1);
+ sp_color_rgb_to_hsv_floatv (hsv,
+ SP_RGBA32_R_F(stroke_goal),
+ SP_RGBA32_G_F(stroke_goal),
+ SP_RGBA32_B_F(stroke_goal));
+ sp_color_hsv_to_rgb_floatv (rgb, hsv[0]<.5? hsv[0]+.5 : hsv[0]-.5, 1 - hsv[1], 1 - hsv[2]);
+ stroke_goal = SP_RGBA32_F_COMPOSE(rgb[0], rgb[1], rgb[2], 1);
+#else
+ // RGB inversion
fill_goal = SP_RGBA32_U_COMPOSE(
(255 - SP_RGBA32_R_U(fill_goal)),
(255 - SP_RGBA32_G_U(fill_goal)),
@@ -1052,6 +1092,7 @@ sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point v
(255 - SP_RGBA32_G_U(stroke_goal)),
(255 - SP_RGBA32_B_U(stroke_goal)),
(255 - SP_RGBA32_A_U(stroke_goal)));
+#endif
opacity_goal = 1 - opacity_goal;
}
sp_tweak_update_area (SPTweakContext *tc)
{
double radius = get_dilate_radius(tc);
- NR::Matrix const sm (Geom::Scale(radius, radius) * Geom::Translate(SP_EVENT_CONTEXT(tc)->desktop->point()));
+ Geom::Matrix const sm (Geom::Scale(radius, radius) * Geom::Translate(SP_EVENT_CONTEXT(tc)->desktop->point()));
sp_canvas_item_affine_absolute(tc->dilate_area, sm);
sp_canvas_item_show(tc->dilate_area);
}
void
sp_tweak_switch_mode_temporarily (SPTweakContext *tc, gint mode, bool with_shift)
{
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
// Juggling about so that prefs have the old value but tc->mode and the button show new mode:
- gint now_mode = prefs_get_int_attribute("tools.tweak", "mode", 0);
+ gint now_mode = prefs->getInt("/tools/tweak/mode", 0);
SP_EVENT_CONTEXT(tc)->desktop->setToolboxSelectOneValue ("tweak_tool_mode", mode);
// button has changed prefs, restore
- prefs_set_int_attribute("tools.tweak", "mode", now_mode);
+ prefs->setInt("/tools/tweak/mode", now_mode);
// changing prefs changed tc->mode, restore back :)
tc->mode = mode;
sp_tweak_update_cursor (tc, with_shift);
return TRUE;
}
- NR::Point const button_w(event->button.x,
+ Geom::Point const button_w(event->button.x,
event->button.y);
- NR::Point const button_dt(desktop->w2d(button_w));
+ Geom::Point const button_dt(desktop->w2d(button_w));
tc->last_push = desktop->dt2doc(button_dt);
sp_tweak_extinput(tc, event);
break;
case GDK_MOTION_NOTIFY:
{
- NR::Point const motion_w(event->motion.x,
+ Geom::Point const motion_w(event->motion.x,
event->motion.y);
- NR::Point motion_dt(desktop->w2d(motion_w));
- NR::Point motion_doc(desktop->dt2doc(motion_dt));
+ Geom::Point motion_dt(desktop->w2d(motion_w));
+ Geom::Point motion_doc(desktop->dt2doc(motion_dt));
sp_tweak_extinput(tc, event);
// draw the dilating cursor
double radius = get_dilate_radius(tc);
- NR::Matrix const sm (Geom::Scale(radius, radius) * Geom::Translate(desktop->w2d(motion_w)));
+ Geom::Matrix const sm (Geom::Scale(radius, radius) * Geom::Translate(desktop->w2d(motion_w)));
sp_canvas_item_affine_absolute(tc->dilate_area, sm);
sp_canvas_item_show(tc->dilate_area);
case GDK_BUTTON_RELEASE:
{
- NR::Point const motion_w(event->button.x, event->button.y);
- NR::Point const motion_dt(desktop->w2d(motion_w));
+ Geom::Point const motion_w(event->button.x, event->button.y);
+ Geom::Point const motion_dt(desktop->w2d(motion_w));
sp_canvas_end_forced_full_redraws(desktop->canvas);
tc->is_drawing = false;
if (!tc->has_dilated) {
// if we did not rub, do a light tap
tc->pressure = 0.03;
- sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), NR::Point(0,0), MOD__SHIFT);
+ sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT);
}
tc->is_dilating = false;
tc->has_dilated = false;
}
break;
- case GDK_KEY_RELEASE:
+ case GDK_KEY_RELEASE: {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
switch (get_group0_keyval(&event->key)) {
case GDK_Shift_L:
case GDK_Shift_R:
break;
case GDK_Control_L:
case GDK_Control_R:
- sp_tweak_switch_mode (tc, prefs_get_int_attribute("tools.tweak", "mode", 0), MOD__SHIFT);
+ sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
tc->_message_context->clear();
break;
default:
- sp_tweak_switch_mode (tc, prefs_get_int_attribute("tools.tweak", "mode", 0), MOD__SHIFT);
+ sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
break;
}
+ }
default:
break;