summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aebbf53)
raw | patch | inline | side by side (parent: aebbf53)
author | cilix42 <cilix42@users.sourceforge.net> | |
Wed, 6 Aug 2008 13:23:09 +0000 (13:23 +0000) | ||
committer | cilix42 <cilix42@users.sourceforge.net> | |
Wed, 6 Aug 2008 13:23:09 +0000 (13:23 +0000) |
diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 4c9ad85b7761a704f916b88fa550c62aedf0b163..889b9ca7494eb7bb1d96bf71770733129145c49d 100644 (file)
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4989"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3292"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
inkscape:guide-bbox="true"
inkscape:window-x="0"
inkscape:window-height="738"
inkscape:window-width="1024"
- inkscape:cy="1186.1064"
- inkscape:cx="987.51245"
- inkscape:zoom="3.3238416"
+ inkscape:cy="1185.651"
+ inkscape:cx="1041.1133"
+ inkscape:zoom="19.900601"
gridtolerance="6"
snaptogrid="false"
showgrid="true"
x="-103.39542"
y="202.62288" />
</g>
+ <g
+ id="paraxial_lines_mode"
+ transform="matrix(0.6666666,0,0,0.6666666,1099.8913,-65.30029)"
+ inkscape:label="paraxial_lines_mode">
+ <rect
+ y="180"
+ x="-110"
+ height="24"
+ width="24"
+ id="rect4983-8-8"
+ style="opacity:1;color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path4985-5-5"
+ d="m -83.374152,197.54326 c 0,0 -20.678308,0 -20.678308,0 0,0 0,-7.85411 0,-7.85411 0,0 8.847416,0 8.847416,0 0,0 0,13.68063 0,13.68063 0,0 5.91443,0 5.91443,0 0,0 0,-19.32317 0,-19.32317"
+ style="fill:none;stroke:#646464;stroke-width:2.25000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <rect
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
+ id="rect4989-9-0"
+ width="2.9951611"
+ height="2.9963975"
+ x="-84.48362"
+ y="196.06723" />
+ <rect
+ y="182.16762"
+ x="-90.81646"
+ height="2.9963975"
+ width="2.9951611"
+ id="rect8372-9"
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline" />
+ <rect
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
+ id="rect8374-6"
+ width="2.9951611"
+ height="2.9963975"
+ x="-96.732529"
+ y="188.15765" />
+ <rect
+ y="188.15765"
+ x="-105.58102"
+ height="2.9963975"
+ width="2.9951611"
+ id="rect8376-3"
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline" />
+ <rect
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
+ id="rect8378-8"
+ width="2.9951611"
+ height="2.9963975"
+ x="-105.58102"
+ y="196.06723" />
+ <rect
+ y="201.77011"
+ x="-96.732529"
+ height="2.9963975"
+ width="2.9951611"
+ id="rect5087"
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline" />
+ <rect
+ style="opacity:1;color:#000000;fill:#6464ff;fill-opacity:0.39215686;fill-rule:evenodd;stroke:#6464ff;stroke-width:0.74915862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;display:inline"
+ id="rect5089"
+ width="2.9951611"
+ height="2.9963975"
+ x="-90.81646"
+ y="201.77011" />
+ </g>
</svg>
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index 2d02677577a7a7d91c17173800d007ed75d6e6dc..b1e97e44bac9c39e7db29906e7eb67ce497e4431 100644 (file)
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
dc->waiting_LPE_type = INVALID_LPE;
}
if (SP_IS_PEN_CONTEXT(dc)) {
- SP_PEN_CONTEXT(dc)->polylines_only = (prefs_get_int_attribute("tools.freehand.pen", "freehand-mode", 0) == 2);
+ sp_pen_context_set_polyline_mode(SP_PEN_CONTEXT(dc));
}
}
}
* \param state keyboard state to check if ctrl was pressed
*/
-void spdc_endpoint_snap_rotation(SPEventContext const *const ec, NR::Point &p, NR::Point const o,
+void spdc_endpoint_snap_rotation(SPEventContext const *const ec, NR::Point &p, NR::Point const &o,
guint state)
{
unsigned const snaps = abs(prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12));
diff --git a/src/draw-context.h b/src/draw-context.h
index afdec1981bd22512f660c9d9a064b040b8a21a63..35f7659deddf2daf6ab1709922e7fca105d36ee8 100644 (file)
--- a/src/draw-context.h
+++ b/src/draw-context.h
GType sp_draw_context_get_type(void);
SPDrawAnchor *spdc_test_inside(SPDrawContext *dc, NR::Point p);
void spdc_concat_colors_and_flush(SPDrawContext *dc, gboolean forceclosed);
-void spdc_endpoint_snap_rotation(SPEventContext const *const ec, NR::Point &p, NR::Point const o, guint state);
+void spdc_endpoint_snap_rotation(SPEventContext const *const ec, NR::Point &p, NR::Point const &o, guint state);
void spdc_endpoint_snap_free(SPEventContext const *ec, NR::Point &p, guint state);
void spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item);
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 4fb7fbc99a2c4f31e9472688dd01e3926769c499..aeddc5ce19ffc2a1c05345759ae3bfe2007a7f19 100644 (file)
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
static gint sp_pen_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event);
static void spdc_pen_set_initial_point(SPPenContext *pc, NR::Point const p);
-static void spdc_pen_set_subsequent_point(SPPenContext *pc, NR::Point const p, bool statusbar);
+static void spdc_pen_set_subsequent_point(SPPenContext *const pc, NR::Point const p, bool statusbar, guint status = 0);
static void spdc_pen_set_ctrl(SPPenContext *pc, NR::Point const p, guint state);
static void spdc_pen_finish_segment(SPPenContext *pc, NR::Point p, guint state);
static SPDrawContextClass *pen_parent_class;
+static int pen_next_paraxial_direction(const SPPenContext *const pc, NR::Point const &pt, NR::Point const &origin, guint state);
+static void pen_set_to_nearest_horiz_vert(const SPPenContext *const pc, NR::Point &pt, guint const state);
+static NR::Point pen_get_intermediate_horiz_vert(const SPPenContext *const pc, NR::Point const &pt, guint const state);
+
+static int pen_last_paraxial_dir = 0; // last used direction in horizontal/vertical mode; 0 = horizontal, 1 = vertical
+
/**
* Register SPPenContext with Gdk and return its type.
*/
pc->events_disabled = 0;
- pc->polylines_only = prefs_get_int_attribute("tools.freehand.pen", "freehand-mode", 0);
+ pc->num_clicks = 0;
pc->waiting_LPE = NULL;
}
}
}
+void
+sp_pen_context_set_polyline_mode(SPPenContext *const pc) {
+ guint mode = prefs_get_int_attribute("tools.freehand.pen", "freehand-mode", 0);
+ pc->polylines_only = (mode == 2 || mode == 3);
+ pc->polylines_paraxial = (mode == 3);
+}
+
/**
* Callback to initialize SPPenContext object.
*/
pc->anchor_statusbar = false;
+ sp_pen_context_set_polyline_mode(pc);
+
if (prefs_get_int_attribute("tools.freehand.pen", "selcue", 0) != 0) {
ec->enableSelectionCue();
}
static void
pen_cancel (SPPenContext *const pc)
{
+ pc->num_clicks = 0;
pc->state = SP_PEN_CONTEXT_STOP;
spdc_reset_colors(pc);
sp_canvas_item_hide(pc->c0);
static void
spdc_endpoint_snap(SPPenContext const *const pc, NR::Point &p, guint const state)
{
-
+ /*** old code: ***/
+ /***
+ if (pc->polylines_paraxial) {
+ pen_set_to_nearest_horiz_vert(pc, p, state);
+ // TODO: another (constrained) snap required?
+ } else {
+ if ((state & GDK_CONTROL_MASK)) { //CTRL enables angular snapping
+ if (pc->npoints > 0) {
+ spdc_endpoint_snap_rotation(pc, p, pc->p[0], state);
+ }
+ } else {
+ if (!(state & GDK_SHIFT_MASK)) { //SHIFT disables all snapping, except the angular snapping above
+ //After all, the user explicitely asked for angular snapping by
+ //pressing CTRL
+ spdc_endpoint_snap_free(pc, p, state);
+ }
+ }
+ }
+ **/
+
if ((state & GDK_CONTROL_MASK)) { //CTRL enables angular snapping
if (pc->npoints > 0) {
spdc_endpoint_snap_rotation(pc, p, pc->p[0], state);
@@ -288,6 +323,10 @@ spdc_endpoint_snap(SPPenContext const *const pc, NR::Point &p, guint const state
spdc_endpoint_snap_free(pc, p, state);
}
}
+ if (pc->polylines_paraxial) {
+ // TODO: must we avoid one of the snaps in the previous case distinction in some situations?
+ pen_set_to_nearest_horiz_vert(pc, p, state);
+ }
}
/**
@@ -476,7 +515,11 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const
/* Create green anchor */
p = event_dt;
- spdc_endpoint_snap(pc, p, bevent.state);
+ if (!pc->polylines_paraxial) {
+ // only snap the starting point if we're not in horizontal/vertical mode
+ // because otherwise it gets shifted; TODO: why do we snap here at all??
+ spdc_endpoint_snap(pc, p, bevent.state);
+ }
pc->green_anchor = sp_draw_anchor_new(pc, pc->green_curve, TRUE, p);
}
spdc_pen_set_initial_point(pc, p);
spdc_endpoint_snap(pc, p, mevent.state);
}
- spdc_pen_set_subsequent_point(pc, p, !anchor);
+ spdc_pen_set_subsequent_point(pc, p, !anchor, mevent.state);
if (anchor && !pc->anchor_statusbar) {
pc->_message_context->set(Inkscape::NORMAL_MESSAGE, _("<b>Click</b> or <b>click and drag</b> to close and finish the path."));
// TODO: can we be sure that the path was created correctly?
// TODO: should we offer an option to collect the clicks in a list?
if (pc->expecting_clicks_for_LPE == 0 && sp_pen_context_has_waiting_LPE(pc)) {
- pc->polylines_only = prefs_get_int_attribute("tools.freehand.pen", "freehand-mode", 0);
+ sp_pen_context_set_polyline_mode(pc);
SPEventContext *ec = SP_EVENT_CONTEXT(pc);
Inkscape::Selection *selection = sp_desktop_selection (ec->desktop);
pc->waiting_LPE->acceptParamPath(SP_PATH(selection->singleItem()));
selection->add(SP_OBJECT(pc->waiting_item));
pc->waiting_LPE = NULL;
- pc->polylines_only = prefs_get_int_attribute("tools.freehand.pen", "freehand-mode", 0);
} else {
// the case that we need to create a new LPE and apply it to the just-drawn path is
// handled in spdc_check_for_and_apply_waiting_LPE() in draw-context.cpp
@@ -1194,7 +1236,7 @@ spdc_pen_set_angle_distance_status_message(SPPenContext *const pc, NR::Point con
}
static void
-spdc_pen_set_subsequent_point(SPPenContext *const pc, NR::Point const p, bool statusbar)
+spdc_pen_set_subsequent_point(SPPenContext *const pc, NR::Point const p, bool statusbar, guint status)
{
g_assert( pc->npoints != 0 );
/* todo: Check callers to see whether 2 <= npoints is guaranteed. */
@@ -1204,15 +1246,25 @@ spdc_pen_set_subsequent_point(SPPenContext *const pc, NR::Point const p, bool st
pc->p[4] = p;
pc->npoints = 5;
pc->red_curve->reset();
- pc->red_curve->moveto(pc->p[0]);
bool is_curve;
- if (pc->p[1] != pc->p[0])
- {
- pc->red_curve->curveto(pc->p[1], p, p);
- is_curve = true;
- } else {
+ pc->red_curve->moveto(pc->p[0]);
+ if (pc->polylines_paraxial && !statusbar) {
+ // we are drawing horizontal/vertical lines and hit an anchor; draw an L-shaped path
+ NR::Point intermed = p;
+ pen_set_to_nearest_horiz_vert(pc, intermed, status);
+ pc->red_curve->lineto(intermed);
pc->red_curve->lineto(p);
is_curve = false;
+ } else {
+ // one of the 'regular' modes
+ if (pc->p[1] != pc->p[0])
+ {
+ pc->red_curve->curveto(pc->p[1], p, p);
+ is_curve = true;
+ } else {
+ pc->red_curve->lineto(p);
+ is_curve = false;
+ }
}
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(pc->red_bpath), pc->red_curve);
@@ -1269,8 +1321,13 @@ spdc_pen_set_ctrl(SPPenContext *const pc, NR::Point const p, guint const state)
}
static void
-spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const /*p*/, guint const /*state*/)
+spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const p, guint const state)
{
+ if (pc->polylines_paraxial) {
+ pen_last_paraxial_dir = pen_next_paraxial_direction(pc, p, pc->p[0], state);
+ }
+ ++pc->num_clicks;
+
if (!pc->red_curve->is_empty()) {
pc->green_curve->append_continuous(pc->red_curve, 0.0625);
SPCurve *curve = pc->red_curve->copy();
return;
}
+ pc->num_clicks = 0;
+
pen_disable_events(pc);
SPDesktop *const desktop = pc->desktop;
@@ -1346,9 +1405,56 @@ sp_pen_context_wait_for_LPE_mouse_clicks(SPPenContext *pc, Inkscape::LivePathEff
Inkscape::LivePathEffect::LPETypeConverter.get_label(effect_type).c_str());
pc->expecting_clicks_for_LPE = num_clicks;
pc->polylines_only = use_polylines;
+ pc->polylines_paraxial = false; // TODO: think if this is correct for all cases
pc->waiting_LPE_type = effect_type;
}
+static int pen_next_paraxial_direction(const SPPenContext *const pc,
+ NR::Point const &pt, NR::Point const &origin, guint state) {
+ /*
+ * after the first mouse click we determine whether the mouse pointer is closest to a
+ * horizontal or vertical segment; for all subsequent mouse clicks, we use the direction
+ * orthogonal to the last one; pressing Shift toggles the direction
+ */
+ if (pc->num_clicks == 0) {
+ // first mouse click
+ double dist_h = fabs(pt[NR::X] - origin[NR::X]);
+ double dist_v = fabs(pt[NR::Y] - origin[NR::Y]);
+ int ret = (dist_h < dist_v) ? 1 : 0; // 0 = horizontal, 1 = vertical
+ pen_last_paraxial_dir = (state & GDK_SHIFT_MASK) ? 1 - ret : ret;
+ return pen_last_paraxial_dir;
+ } else {
+ // subsequent mouse click
+ return (state & GDK_SHIFT_MASK) ? pen_last_paraxial_dir : 1 - pen_last_paraxial_dir;
+ }
+}
+
+void pen_set_to_nearest_horiz_vert(const SPPenContext *const pc, NR::Point &pt, guint const state)
+{
+ NR::Point const &origin = pc->p[0];
+
+ int next_dir = pen_next_paraxial_direction(pc, pt, origin, state);
+
+ if (next_dir == 0) {
+ // line is forced to be horizontal
+ pt[NR::Y] = origin[NR::Y];
+ } else {
+ // line is forced to be vertical
+ pt[NR::X] = origin[NR::X];
+ }
+}
+
+NR::Point pen_get_intermediate_horiz_vert(const SPPenContext *const pc, NR::Point const &pt)
+{
+ NR::Point const &origin = pc->p[0];
+
+ if (pen_last_paraxial_dir == 0) {
+ return NR::Point (origin[NR::X], pt[NR::Y]);
+ } else {
+ return NR::Point (pt[NR::X], origin[NR::Y]);
+ }
+}
+
/*
Local Variables:
mode:c++
diff --git a/src/pen-context.h b/src/pen-context.h
index 7c189934cf2185617b7c1f40a13c598e336c363e..24afa701c609230f4914bb78a2e2720513c41270 100644 (file)
--- a/src/pen-context.h
+++ b/src/pen-context.h
NR::Point p[5];
/** \invar npoints in {0, 2, 5}. */
+ // npoints somehow determines the type of the node (what does it mean, exactly? the number of Bezier handles?)
gint npoints;
unsigned int mode : 1;
unsigned int state : 2;
bool polylines_only;
+ bool polylines_paraxial;
+ int num_clicks;
unsigned int expecting_clicks_for_LPE; // if positive, finish the path after this many clicks
Inkscape::LivePathEffect::Effect *waiting_LPE; // if NULL, waiting_LPE_type in SPDrawContext is taken into account
pc->waiting_LPE_type != Inkscape::LivePathEffect::INVALID_LPE);
}
+void sp_pen_context_set_polyline_mode(SPPenContext *const pc);
void sp_pen_context_wait_for_LPE_mouse_clicks(SPPenContext *pc, Inkscape::LivePathEffect::EffectType effect_type,
unsigned int num_clicks, bool use_polylines = true);
index 07b388d140127087fdd2283e75babdc92a200168..ba35f7a3d5f590a4da2fdf3dd008f0f07ce21214 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
// preparatory work here
if (SP_IS_PEN_CONTEXT(desktop->event_context)) {
SPPenContext *pc = SP_PEN_CONTEXT(desktop->event_context);
- pc->polylines_only = (mode == 2);
+ sp_pen_context_set_polyline_mode(pc);
}
}
@@ -3326,6 +3326,13 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho
1, _("Create a sequence of straight line segments"),
2, "polylines_mode",
-1 );
+
+ gtk_list_store_append( model, &iter );
+ gtk_list_store_set( model, &iter,
+ 0, _("Paraxial"),
+ 1, _("Create a sequence of paraxial line segments"),
+ 2, "paraxial_lines_mode",
+ -1 );
}
EgeSelectOneAction* act = ege_select_one_action_new(tool_is_pencil ?