![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 1e7379dea2e68097d5c35345c8e5adc3ad78eb13..d2ec3d3c0f4c80e23c2b78be9a78c0ab94c92b1c 100644 (file)
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
* tweaking paths without node editing
*
* Authors:
- * bulia byak
+ * bulia byak
*
* Copyright (C) 2007 authors
*
#include "isnan.h"
#include "prefs-utils.h"
#include "style.h"
+#include "box3d.h"
#include "tweak-context.h"
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) {
+ ec->enableSelectionCue();
+ }
+
+ if (prefs_get_int_attribute("tools.tweak", "gradientdrag", 0) != 0) {
+ ec->enableGrDrag();
+ }
}
static void
tc->do_l = (val && strcmp(val, "0"));
} else if (!strcmp(key, "doo")) {
tc->do_o = (val && strcmp(val, "0"));
- }
+ }
}
static void
get_dilate_radius (SPTweakContext *tc)
{
// 10 times the pen width:
- return 500 * tc->width/SP_EVENT_CONTEXT(tc)->desktop->current_zoom();
+ return 500 * tc->width/SP_EVENT_CONTEXT(tc)->desktop->current_zoom();
}
double
get_dilate_force (SPTweakContext *tc)
{
double force = 8 * (tc->usepressure? tc->pressure : TC_DEFAULT_PRESSURE)
- /sqrt(SP_EVENT_CONTEXT(tc)->desktop->current_zoom());
+ /sqrt(SP_EVENT_CONTEXT(tc)->desktop->current_zoom());
if (force > 3) {
force += 4 * (force - 3);
}
@@ -328,6 +337,12 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
{
bool did = false;
+ if (SP_IS_BOX3D(item)) {
+ // convert 3D boxes to ordinary groups before tweaking their shapes
+ item = SP_ITEM(box3d_convert_to_group(SP_BOX3D(item)));
+ selection->add(item);
+ }
+
if (SP_IS_GROUP(item)) {
for (SPObject *child = sp_object_first_child(SP_OBJECT(item)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child)) {
@@ -369,13 +384,15 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
if (orig == NULL) {
return false;
}
+
Path *res = new Path;
res->SetBackData(false);
Shape *theShape = new Shape;
Shape *theRes = new Shape;
+ NR::Matrix i2doc(sp_item_i2doc_affine(item));
- orig->ConvertWithBackData(0.08 - (0.07 * fidelity)); // default 0.059
+ orig->ConvertWithBackData((0.08 - (0.07 * fidelity)) / NR::expansion(i2doc)); // default 0.059
orig->Fill(theShape, 0);
SPCSSAttr *css = sp_repr_css_attr(SP_OBJECT_REPR(item), "style");
@@ -397,28 +414,29 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
vector = 1/NR::L2(vector) * vector;
bool did_this = false;
- NR::Matrix i2doc(sp_item_i2doc_affine(item));
if (mode == TWEAK_MODE_SHRINK || mode == TWEAK_MODE_GROW) {
- if (theShape->MakeOffset(theRes,
+ if (theShape->MakeTweak(tweak_mode_grow, theRes,
mode == TWEAK_MODE_GROW? force : -force,
join_straight, 4.0,
- true, p[NR::X], p[NR::Y], radius, &i2doc) == 0) // 0 means the shape was actually changed
+ true, p, NR::Point(0,0), radius, &i2doc) == 0) // 0 means the shape was actually changed
did_this = true;
} else if (mode == TWEAK_MODE_ATTRACT || mode == TWEAK_MODE_REPEL) {
- if (theShape->MakeRepel(theRes,
+ if (theShape->MakeTweak(tweak_mode_repel, theRes,
mode == TWEAK_MODE_REPEL? force : -force,
join_straight, 4.0,
- true, p[NR::X], p[NR::Y], radius, &i2doc) == 0)
+ true, p, NR::Point(0,0), radius, &i2doc) == 0)
did_this = true;
} else if (mode == TWEAK_MODE_PUSH) {
- if (theShape->MakePush(theRes,
+ if (theShape->MakeTweak(tweak_mode_push, theRes,
+ 1.0,
join_straight, 4.0,
true, p, force*2*vector, radius, &i2doc) == 0)
did_this = true;
} else if (mode == TWEAK_MODE_ROUGHEN) {
- if (theShape->MakeJitter(theRes,
+ if (theShape->MakeTweak(tweak_mode_roughen, theRes,
+ force,
join_straight, 4.0,
- true, p, force, radius, &i2doc) == 0)
+ true, p, NR::Point(0,0), radius, &i2doc) == 0)
did_this = true;
}
@@ -429,10 +447,10 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
res->Reset();
theRes->ConvertToForme(res);
- double th_max = 0.6 - 0.59*sqrt(fidelity);
+ double th_max = (0.6 - 0.59*sqrt(fidelity)) / NR::expansion(i2doc);
double threshold = MAX(th_max, th_max*force);
res->ConvertEvenLines(threshold);
- res->Simplify(threshold);
+ res->Simplify(threshold / (SP_ACTIVE_DESKTOP->current_zoom()));
if (newrepr) { // converting to path, need to replace the repr
bool is_selected = selection->includes(item);
@@ -453,12 +471,17 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
selection->add(newrepr);
}
- if (res->descr_cmd.size() > 1) {
+ if (res->descr_cmd.size() > 1) {
gchar *str = res->svg_dump_path();
- if (newrepr)
+ if (newrepr) {
newrepr->setAttribute("d", str);
- else
- SP_OBJECT_REPR(item)->setAttribute("d", str);
+ } else {
+ if (SP_IS_SHAPE(item) && SP_SHAPE(item)->path_effect_href) {
+ SP_OBJECT_REPR(item)->setAttribute("inkscape:original-d", str);
+ } else {
+ SP_OBJECT_REPR(item)->setAttribute("d", str);
+ }
+ }
g_free(str);
} else {
// TODO: if there's 0 or 1 node left, delete this path altogether
@@ -475,15 +498,15 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
delete orig;
delete res;
- if (did_this)
+ if (did_this)
did = true;
}
return did;
}
-void
-tweak_colorpaint (float *color, guint32 goal, double force, bool do_h, bool do_s, bool do_l)
+void
+tweak_colorpaint (float *color, guint32 goal, double force, bool do_h, bool do_s, bool do_l)
{
float rgb_g[3];
@@ -492,11 +515,11 @@ tweak_colorpaint (float *color, guint32 goal, double force, bool do_h, bool do_s
sp_color_rgb_to_hsl_floatv (hsl_g, SP_RGBA32_R_F(goal), SP_RGBA32_G_F(goal), SP_RGBA32_B_F(goal));
float hsl_c[3];
sp_color_rgb_to_hsl_floatv (hsl_c, color[0], color[1], color[2]);
- if (!do_h)
+ if (!do_h)
hsl_g[0] = hsl_c[0];
- if (!do_s)
+ if (!do_s)
hsl_g[1] = hsl_c[1];
- if (!do_l)
+ if (!do_l)
hsl_g[2] = hsl_c[2];
sp_color_hsl_to_rgb_floatv (rgb_g, hsl_g[0], hsl_g[1], hsl_g[2]);
} else {
@@ -511,11 +534,9 @@ tweak_colorpaint (float *color, guint32 goal, double force, bool do_h, bool do_s
}
}
-void
-tweak_colorjitter (float *color, double force, bool do_h, bool do_s, bool do_l)
+void
+tweak_colorjitter (float *color, double force, bool do_h, bool do_s, bool do_l)
{
- force = force*force; // in [0..1], this makes finer adjustments easier
-
float hsl_c[3];
sp_color_rgb_to_hsl_floatv (hsl_c, color[0], color[1], color[2]);
sp_color_hsl_to_rgb_floatv (color, hsl_c[0], hsl_c[1], hsl_c[2]);
}
-void
-tweak_color (guint mode, float *color, guint32 goal, double force, bool do_h, bool do_s, bool do_l)
+void
+tweak_color (guint mode, float *color, guint32 goal, double force, bool do_h, bool do_s, bool do_l)
{
if (mode == TWEAK_MODE_COLORPAINT) {
tweak_colorpaint (color, goal, force, do_h, do_s, do_l);
@@ -563,7 +584,7 @@ tweak_opacity (guint mode, SPIScale24 *style_opacity, double opacity_goal, doubl
double
-tweak_profile (double dist, double radius)
+tweak_profile (double dist, double radius)
{
if (radius == 0)
return 0;
}
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,
- bool do_h, bool do_s, bool do_l, bool do_o)
+tweak_colors_in_gradient (SPItem *item, bool fill_or_stroke,
+ guint32 const rgb_goal, NR::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 (pos > 1 || pos < 0) {
bool odd = ((int)(floor(pos)) % 2 == 1);
pos_e = pos - floor(pos);
- if (odd)
+ if (odd)
pos_e = 1 - pos_e;
}
}
// so it only affects the ends of this interstop;
// distribute the force between the two endstops so that they
// get all the painting even if they are not touched by the brush
- tweak_color (mode, stop->specified_color.v.c, rgb_goal,
- force * (pos_e - offset_l) / (offset_h - offset_l),
+ tweak_color (mode, stop->specified_color.v.c, rgb_goal,
+ force * (pos_e - offset_l) / (offset_h - offset_l),
do_h, do_s, do_l);
- tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
- force * (offset_h - pos_e) / (offset_h - offset_l),
+ tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
+ force * (offset_h - pos_e) / (offset_h - offset_l),
do_h, do_s, do_l);
SP_OBJECT(stop)->updateRepr();
child_prev->updateRepr();
break;
} else {
- // wide brush, may affect more than 2 stops,
+ // wide brush, may affect more than 2 stops,
// paint each stop by the force from the profile curve
- if (offset_l <= pos_e && offset_l > pos_e - r) {
- tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
+ if (offset_l <= pos_e && offset_l > pos_e - r) {
+ tweak_color (mode, SP_STOP(child_prev)->specified_color.v.c, rgb_goal,
force * tweak_profile (fabs (pos_e - offset_l), r),
do_h, do_s, do_l);
child_prev->updateRepr();
- }
+ }
- if (offset_h >= pos_e && offset_h < pos_e + r) {
- tweak_color (mode, stop->specified_color.v.c, rgb_goal,
+ if (offset_h >= pos_e && offset_h < pos_e + r) {
+ tweak_color (mode, stop->specified_color.v.c, rgb_goal,
force * tweak_profile (fabs (pos_e - offset_h), r),
do_h, do_s, do_l);
SP_OBJECT(stop)->updateRepr();
}
bool
-sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
+sp_tweak_color_recursive (guint mode, SPItem *item, SPItem *item_at_point,
guint32 fill_goal, bool do_fill,
guint32 stroke_goal, bool do_stroke,
float opacity_goal, bool do_opacity,
- NR::Point p, double radius, double force,
+ NR::Point p, double radius, double force,
bool do_h, bool do_s, bool do_l, bool do_o)
{
bool did = false;
if (SP_IS_GROUP(item)) {
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_color_recursive (mode, SP_ITEM(child), item_at_point,
+ if (sp_tweak_color_recursive (mode, SP_ITEM(child), item_at_point,
fill_goal, do_fill,
stroke_goal, do_stroke,
opacity_goal, do_opacity,
} else {
this_force = force * tweak_profile (NR::L2 (p - center), radius);
}
-
+
if (this_force > 0.002) {
if (do_fill) {
- if (style->fill.type == SP_PAINT_TYPE_COLOR) {
+ if (style->fill.isPaintserver()) {
+ tweak_colors_in_gradient (item, true, fill_goal, p, radius, this_force, mode, do_h, do_s, do_l, do_o);
+ did = true;
+ } else if (style->fill.isColor()) {
tweak_color (mode, style->fill.value.color.v.c, fill_goal, this_force, do_h, do_s, do_l);
item->updateRepr();
did = true;
- } else if (style->fill.type == SP_PAINT_TYPE_PAINTSERVER) {
- tweak_colors_in_gradient (item, true, fill_goal, p, radius, this_force, mode, do_h, do_s, do_l, do_o);
- did = true;
}
}
if (do_stroke) {
- if (style->stroke.type == SP_PAINT_TYPE_COLOR) {
+ if (style->stroke.isPaintserver()) {
+ tweak_colors_in_gradient (item, false, stroke_goal, p, radius, this_force, mode, do_h, do_s, do_l, do_o);
+ did = true;
+ } else if (style->stroke.isColor()) {
tweak_color (mode, style->stroke.value.color.v.c, stroke_goal, this_force, do_h, do_s, do_l);
item->updateRepr();
did = true;
- } else if (style->stroke.type == SP_PAINT_TYPE_PAINTSERVER) {
- tweak_colors_in_gradient (item, false, stroke_goal, p, radius, this_force, mode, do_h, do_s, do_l, do_o);
- did = true;
}
}
if (do_opacity && do_o) {
@@ -790,8 +811,8 @@ sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point v
}
bool did = false;
- double radius = get_dilate_radius(tc);
- double force = get_dilate_force(tc);
+ double radius = get_dilate_radius(tc);
+ double force = get_dilate_force(tc);
if (radius == 0 || force == 0) {
return false;
}
@@ -800,7 +821,7 @@ 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);
Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, "tools.tweak");
SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style");
- if (tc->mode == TWEAK_MODE_COLORPAINT && !css)
+ if (tc->mode == TWEAK_MODE_COLORPAINT && !css)
return false;
bool do_fill = false, do_stroke = false, do_opacity = false;
@@ -831,7 +852,7 @@ sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point v
if (tc->mode == TWEAK_MODE_COLORPAINT || tc->mode == TWEAK_MODE_COLORJITTER) {
if (do_fill || do_stroke || do_opacity) {
- if (sp_tweak_color_recursive (tc->mode, item, item_at_point,
+ if (sp_tweak_color_recursive (tc->mode, item, item_at_point,
fill_goal, do_fill,
stroke_goal, do_stroke,
opacity_goal, do_opacity,
num = g_slist_length((GSList *) desktop->selection->itemList());
}
if (num == 0) {
- tc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Select objects</b> to tweak"));
+ tc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Nothing selected!</b> Select objects to tweak."));
} else {
switch (tc->mode) {
case TWEAK_MODE_PUSH:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Pushing %d</b> selected object",
+ ngettext("<b>Pushing %d</b> selected object",
"<b>Pushing %d</b> selected objects", num), num);
break;
case TWEAK_MODE_SHRINK:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Shrinking %d</b> selected object",
+ ngettext("<b>Shrinking %d</b> selected object",
"<b>Shrinking %d</b> selected objects", num), num);
break;
case TWEAK_MODE_GROW:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Growing %d</b> selected object",
+ ngettext("<b>Growing %d</b> selected object",
"<b>Growing %d</b> selected objects", num), num);
break;
case TWEAK_MODE_ATTRACT:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Attracting %d</b> selected object",
+ ngettext("<b>Attracting %d</b> selected object",
"<b>Attracting %d</b> selected objects", num), num);
break;
case TWEAK_MODE_REPEL:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Repelling %d</b> selected object",
+ ngettext("<b>Repelling %d</b> selected object",
"<b>Repelling %d</b> selected objects", num), num);
break;
case TWEAK_MODE_ROUGHEN:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Roughening %d</b> selected object",
+ ngettext("<b>Roughening %d</b> selected object",
"<b>Roughening %d</b> selected objects", num), num);
case TWEAK_MODE_COLORPAINT:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Painting %d</b> selected object",
+ ngettext("<b>Painting %d</b> selected object",
"<b>Painting %d</b> selected objects", num), num);
break;
case TWEAK_MODE_COLORJITTER:
tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
- ngettext("<b>Jittering colors in %d</b> selected object",
+ ngettext("<b>Jittering colors in %d</b> selected object",
"<b>Jittering colors in %d</b> selected objects", num), num);
break;
}
// dilating:
- if (tc->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK )) {
+ if (tc->is_drawing && ( event->motion.state & GDK_BUTTON1_MASK )) {
sp_tweak_dilate (tc, motion_w, motion_doc, motion_doc - tc->last_push);
//tc->last_push = motion_doc;
tc->has_dilated = true;
tc->has_dilated = false;
switch (tc->mode) {
case TWEAK_MODE_PUSH:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Push tweak"));
break;
case TWEAK_MODE_SHRINK:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Shrink tweak"));
break;
case TWEAK_MODE_GROW:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Grow tweak"));
break;
case TWEAK_MODE_ATTRACT:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Attract tweak"));
break;
case TWEAK_MODE_REPEL:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Repel tweak"));
break;
case TWEAK_MODE_ROUGHEN:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Roughen tweak"));
break;
case TWEAK_MODE_COLORPAINT:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Color paint tweak"));
case TWEAK_MODE_COLORJITTER:
- sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
+ sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
SP_VERB_CONTEXT_TWEAK, _("Color jitter tweak"));
break;
}
- }
+ }
break;
}