![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index c597f3a265f7b748912b3e55a938386af825f698..487caa09c503923bce9a949f5abdb701814e46cf 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
#define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
static SPKnotHolder *sp_rect_knot_holder(SPItem *item, SPDesktop *desktop);
-static SPKnotHolder *sp_3dbox_knot_holder(SPItem *item, SPDesktop *desktop);
+//static
+SPKnotHolder *sp_3dbox_knot_holder(SPItem *item, SPDesktop *desktop, guint number_of_handles);
static SPKnotHolder *sp_arc_knot_holder(SPItem *item, SPDesktop *desktop);
static SPKnotHolder *sp_star_knot_holder(SPItem *item, SPDesktop *desktop);
static SPKnotHolder *sp_spiral_knot_holder(SPItem *item, SPDesktop *desktop);
static SPKnotHolder *sp_offset_knot_holder(SPItem *item, SPDesktop *desktop);
-static SPKnotHolder *sp_path_knot_holder(SPItem *item, SPDesktop *desktop);
+static SPKnotHolder *sp_misc_knot_holder(SPItem *item, SPDesktop *desktop);
static SPKnotHolder *sp_flowtext_knot_holder(SPItem *item, SPDesktop *desktop);
static void sp_pat_knot_holder(SPItem *item, SPKnotHolder *knot_holder);
if (SP_IS_RECT(item)) {
return sp_rect_knot_holder(item, desktop);
} else if (SP_IS_3DBOX(item)) {
- return sp_3dbox_knot_holder(item, desktop);
+ return sp_3dbox_knot_holder(item, desktop, SP3DBoxContext::number_of_handles);
} else if (SP_IS_ARC(item)) {
return sp_arc_knot_holder(item, desktop);
} else if (SP_IS_STAR(item)) {
return sp_spiral_knot_holder(item, desktop);
} else if (SP_IS_OFFSET(item)) {
return sp_offset_knot_holder(item, desktop);
- } else if (SP_IS_PATH(item)) {
- return sp_path_knot_holder(item, desktop);
} else if (SP_IS_FLOWTEXT(item) && SP_FLOWTEXT(item)->has_internal_frame()) {
return sp_flowtext_knot_holder(item, desktop);
+ } else {
+ return sp_misc_knot_holder(item, desktop);
}
return NULL;
/* 3D Box */
static void sp_3dbox_knot_set(SPItem *item, guint knot_id, Box3D::Axis direction,
- NR::Point const &new_pos, NR::Point const &origin, guint state)
+ NR::Point const &new_pos, NR::Point const &origin, guint state)
{
g_assert(item != NULL);
SP3DBox *box = SP_3DBOX(item);
@@ -538,11 +539,11 @@ static void sp_3dbox_knot_set(SPItem *item, guint knot_id, Box3D::Axis direction
SPDocument *doc = SP_OBJECT_DOCUMENT(box);
gdouble height = sp_document_height(doc);
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
if (direction == Box3D::Z) {
- sp_3dbox_move_corner_in_constrained_Z_direction (box, knot_id,
- NR::Point (new_pos[NR::X], height - new_pos[NR::Y]));
+ sp_3dbox_move_corner_in_Z_direction (box, knot_id, new_pos * i2d, !(state & GDK_SHIFT_MASK));
} else {
- sp_3dbox_move_corner_in_XY_plane (box, knot_id, NR::Point (new_pos[NR::X], height - new_pos[NR::Y]));
+ sp_3dbox_move_corner_in_XY_plane (box, knot_id, new_pos * i2d, (state & GDK_SHIFT_MASK) ? direction : Box3D::XY);
}
sp_3dbox_update_curves (box);
}
g_assert(item != NULL);
SP3DBox *box = SP_3DBOX(item);
- // FIXME: Why must the coordinates be flipped vertically???
- SPDocument *doc = SP_OBJECT_DOCUMENT(box);
- gdouble height = sp_document_height(doc);
-
- return NR::Point(sp_3dbox_get_corner(box, knot_id)[NR::X], height - sp_3dbox_get_corner(box, knot_id)[NR::Y]);
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
+ return sp_3dbox_get_corner(box, knot_id) * i2d;
}
static void sp_3dbox_knot1_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
{
- sp_3dbox_knot_set (item, 1, Box3D::XY, new_pos, origin, state);
+ sp_3dbox_knot_set (item, 1, Box3D::Y, new_pos, origin, state);
}
-static NR::Point sp_3dbox_knot1_get(SPItem *item)
+/*
+static void sp_3dbox_knot1_set_constrained(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
{
- return sp_3dbox_knot_get(item, 1);
+ sp_3dbox_knot_set (item, 1, Box3D::Y, new_pos, origin, state ^ GDK_SHIFT_MASK);
}
+*/
static void sp_3dbox_knot2_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
{
- sp_3dbox_knot_set (item, 2, Box3D::XY, new_pos, origin, state);
+ sp_3dbox_knot_set (item, 2, Box3D::X, new_pos, origin, state);
}
-static NR::Point sp_3dbox_knot2_get(SPItem *item)
+/*
+static void sp_3dbox_knot2_set_constrained(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
{
- return sp_3dbox_knot_get(item, 2);
+ sp_3dbox_knot_set (item, 2, Box3D::X, new_pos, origin, state ^ GDK_SHIFT_MASK);
}
+static void sp_3dbox_knot3_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ if (!(state & GDK_SHIFT_MASK)) {
+ sp_3dbox_knot_set (item, 3, Box3D::Y, new_pos, origin, state);
+ } else {
+ sp_3dbox_knot_set (item, 3, Box3D::Z, new_pos, origin, state ^ GDK_SHIFT_MASK);
+ }
+}
+*/
+
static void sp_3dbox_knot5_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
{
sp_3dbox_knot_set (item, 5, Box3D::Z, new_pos, origin, state);
}
+/*
+static void sp_3dbox_knot7_set(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set (item, 7, Box3D::Z, new_pos, origin, state);
+}
+*/
+
+// defined a uniform behaviour for all knots
+static void sp_3dbox_knot_set_uniformly(SPItem *item, guint knot_id, Box3D::Axis direction, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ g_assert(item != NULL);
+ SP3DBox *box = SP_3DBOX(item);
+
+ NR::Matrix const i2d (sp_item_i2d_affine (item));
+ if (direction == Box3D::Z) {
+ sp_3dbox_move_corner_in_Z_direction (box, knot_id, new_pos * i2d, !(state & GDK_SHIFT_MASK));
+ } else {
+ sp_3dbox_move_corner_in_Z_direction (box, knot_id, new_pos * i2d, (state & GDK_SHIFT_MASK));
+ }
+ sp_3dbox_update_curves (box);
+}
+
+static void sp_3dbox_knot0_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 0, Box3D::XY, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot1_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 1, Box3D::XY, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot2_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 2, Box3D::XY, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot3_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 3, Box3D::XY, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot4_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 4, Box3D::Z, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot5_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 5, Box3D::Z, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot6_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 6, Box3D::Z, new_pos, origin, state);
+}
+
+static void sp_3dbox_knot7_set_uniformly(SPItem *item, NR::Point const &new_pos, NR::Point const &origin, guint state)
+{
+ sp_3dbox_knot_set_uniformly(item, 7, Box3D::Z, new_pos, origin, state);
+}
+
+static NR::Point sp_3dbox_knot0_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 0);
+}
+
+static NR::Point sp_3dbox_knot1_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 1);
+}
+
+static NR::Point sp_3dbox_knot2_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 2);
+}
+
+static NR::Point sp_3dbox_knot3_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 3);
+}
+
+static NR::Point sp_3dbox_knot4_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 4);
+}
+
static NR::Point sp_3dbox_knot5_get(SPItem *item)
{
return sp_3dbox_knot_get(item, 5);
}
-static SPKnotHolder *
-sp_3dbox_knot_holder(SPItem *item, SPDesktop *desktop)
+static NR::Point sp_3dbox_knot6_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 6);
+}
+
+static NR::Point sp_3dbox_knot7_get(SPItem *item)
+{
+ return sp_3dbox_knot_get(item, 7);
+}
+
+
+//static
+SPKnotHolder *
+sp_3dbox_knot_holder(SPItem *item, SPDesktop *desktop, guint number_of_handles)
{
g_assert(item != NULL);
SPKnotHolder *knot_holder = sp_knot_holder_new(desktop, item, NULL);
- sp_knot_holder_add(knot_holder, sp_3dbox_knot1_set, sp_3dbox_knot1_get, NULL,_("Resize box in X/Y direction"));
- sp_knot_holder_add(knot_holder, sp_3dbox_knot2_set, sp_3dbox_knot2_get, NULL,_("Resize box in X/Y direction"));
- sp_knot_holder_add(knot_holder, sp_3dbox_knot5_set, sp_3dbox_knot5_get, NULL,_("Resize box in Z direction"));
- sp_pat_knot_holder(item, knot_holder);
+ switch (number_of_handles) {
+ case 3:
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot1_set, sp_3dbox_knot1_get, NULL,_("Resize box in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot2_set, sp_3dbox_knot2_get, NULL,_("Resize box in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot5_set, sp_3dbox_knot5_get, NULL,_("Resize box in Z direction"));
+ sp_pat_knot_holder(item, knot_holder);
+ break;
+ case 4:
+ /***
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot1_set_constrained, sp_3dbox_knot1_get, NULL,_("Resize box in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot2_set_constrained, sp_3dbox_knot2_get, NULL,_("Resize box in X/Y direction"));
+ sp_knot_holder_add_full(knot_holder, sp_3dbox_knot3_set, sp_3dbox_knot3_get, NULL,
+ SP_KNOT_SHAPE_CIRCLE, SP_KNOT_MODE_XOR, _("Resize box in Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot7_set, sp_3dbox_knot7_get, NULL,_("Resize box in Z direction"));
+ ***/
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot0_set_uniformly, sp_3dbox_knot0_get, NULL,
+ _("Resize box in X/Y direction; with <b>Shift</b> along the Z axis"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot1_set_uniformly, sp_3dbox_knot1_get, NULL,
+ _("Resize box in X/Y direction; with <b>Shift</b> along the Z axis"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot2_set_uniformly, sp_3dbox_knot2_get, NULL,
+ _("Resize box in X/Y direction; with <b>Shift</b> along the Z axis"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot3_set_uniformly, sp_3dbox_knot3_get, NULL,
+ _("Resize box in X/Y direction; with <b>Shift</b> along the Z axis"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot4_set_uniformly, sp_3dbox_knot4_get, NULL,
+ _("Resize box along the Z axis; with <b>Shift</b> in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot5_set_uniformly, sp_3dbox_knot5_get, NULL,
+ _("Resize box along the Z axis; with <b>Shift</b> in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot6_set_uniformly, sp_3dbox_knot6_get, NULL,
+ _("Resize box along the Z axis; with <b>Shift</b> in X/Y direction"));
+ sp_knot_holder_add(knot_holder, sp_3dbox_knot7_set_uniformly, sp_3dbox_knot7_get, NULL,
+ _("Resize box along the Z axis; with <b>Shift</b> in X/Y direction"));
+ sp_pat_knot_holder(item, knot_holder);
+ break;
+ default:
+ g_print ("Wrong number of handles (%d): Not implemented yet.\n", number_of_handles);
+ break;
+ }
return knot_holder;
}
}
static SPKnotHolder *
-sp_path_knot_holder(SPItem *item, SPDesktop *desktop) // FIXME: eliminate, instead make a pattern-drag similar to gradient-drag
+sp_misc_knot_holder(SPItem *item, SPDesktop *desktop) // FIXME: eliminate, instead make a pattern-drag similar to gradient-drag
{
if ((SP_OBJECT(item)->style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
&& SP_IS_PATTERN(SP_STYLE_FILL_SERVER(SP_OBJECT(item)->style)))