![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 07e512e064aa6d85d0a3f9ac7eb08156b1cf298a..5e2cdc2b80612d7dbd36a44a684f76c2f50e210a 100644 (file)
#include "sp-namedview.h"
#include "sp-text.h"
#include "sp-flowtext.h"
-
+#include "display/curve.h"
static void sp_connector_context_class_init(SPConnectorContextClass *klass);
static void sp_connector_context_init(SPConnectorContext *conn_context);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cc->red_bpath), 0x00000000,
SP_WIND_RULE_NONZERO);
/* Create red curve */
- cc->red_curve = new SPCurve(4);
+ cc->red_curve = new SPCurve();
/* Create green curve */
- cc->green_curve = new SPCurve(64);
+ cc->green_curve = new SPCurve();
// Notice the initial selection.
cc_selection_changed(cc->selection, (gpointer) cc);
@@ -532,7 +532,7 @@ connector_handle_button_press(SPConnectorContext *const cc, GdkEventButton const
// as there's no other points to go off.
SnapManager &m = cc->desktop->namedview->snap_manager;
m.setup(cc->desktop);
- p = m.freeSnap(Inkscape::Snapper::SNAPPOINT_NODE, p).getPoint();
+ m.freeSnapReturnByRef(Inkscape::Snapper::SNAPPOINT_NODE, p);
}
spcc_connector_set_initial_point(cc, p);
@@ -613,7 +613,7 @@ connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion cons
SPDesktop *const dt = cc->desktop;
/* Find desktop coordinates */
- NR::Point p = dt->w2d(event_w);
+ Geom::Point p = to_2geom(dt->w2d(event_w));
switch (cc->state) {
case SP_CONNECTOR_CONTEXT_DRAGGING:
@@ -622,7 +622,7 @@ connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion cons
if ( cc->npoints > 0 ) {
cc->selection->clear();
- spcc_connector_set_subsequent_point(cc, p);
+ spcc_connector_set_subsequent_point(cc, from_2geom(p));
ret = TRUE;
}
break;
@@ -632,16 +632,16 @@ connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion cons
g_assert( SP_IS_PATH(cc->clickeditem));
// Update the hidden path
- NR::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
- NR::Matrix d2i = i2d.inverse();
+ Geom::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
+ Geom::Matrix d2i = i2d.inverse();
SPPath *path = SP_PATH(cc->clickeditem);
SPCurve *curve = (SP_SHAPE(path))->curve;
if (cc->clickedhandle == cc->endpt_handle[0]) {
- NR::Point o = cc->endpt_handle[1]->pos;
+ Geom::Point o = to_2geom(cc->endpt_handle[1]->pos);
curve->stretch_endpoints(p * d2i, o * d2i);
}
else {
- NR::Point o = cc->endpt_handle[0]->pos;
+ Geom::Point o = to_2geom(cc->endpt_handle[0]->pos);
curve->stretch_endpoints(o * d2i, p * d2i);
}
sp_conn_adjust_path(path);
@@ -857,7 +857,7 @@ spcc_connector_set_subsequent_point(SPConnectorContext *const cc, NR::Point cons
NR::Point p(route.ps[i].x, route.ps[i].y);
cc->red_curve->lineto(p);
}
- cc->red_curve->transform(dt->doc2dt());
+ cc->red_curve->transform(to_2geom(dt->doc2dt()));
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
}
spcc_concat_colors_and_flush(SPConnectorContext *cc)
{
SPCurve *c = cc->green_curve;
- cc->green_curve = new SPCurve(64);
+ cc->green_curve = new SPCurve();
cc->red_curve->reset();
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
}
/* Now we have to go back to item coordinates at last */
- c->transform(sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(cc)));
+ c->transform(to_2geom(sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(cc))));
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
SPDocument *doc = sp_desktop_document(desktop);
/* Set style */
sp_desktop_apply_style_tool(desktop, repr, "tools.connector", false);
- gchar *str = sp_svg_write_path(SP_CURVE_BPATH(c));
+ gchar *str = sp_svg_write_path( c->get_pathvector() );
g_assert( str != NULL );
repr->setAttribute("d", str);
g_free(str);
cc->newconn = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
cc->selection->set(repr);
Inkscape::GC::release(repr);
- cc->newconn->transform = i2i_affine(desktop->currentRoot(), desktop->currentLayer());
+ cc->newconn->transform = from_2geom(i2i_affine(desktop->currentRoot(), desktop->currentLayer()));
cc->newconn->updateRepr();
bool connection = false;
// Show the red path for dragging.
cc->red_curve = SP_PATH(cc->clickeditem)->curve->copy();
- NR::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
+ Geom::Matrix i2d = sp_item_i2d_affine(cc->clickeditem);
cc->red_curve->transform(i2d);
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), cc->red_curve);
}
- NR::Maybe<NR::Rect> bbox = sp_item_bbox_desktop(cc->active_shape);
+ boost::optional<NR::Rect> bbox = sp_item_bbox_desktop(cc->active_shape);
if (bbox) {
NR::Point center = bbox->midpoint();
- sp_knot_set_position(cc->connpthandle, ¢er, 0);
+ sp_knot_set_position(cc->connpthandle, center, 0);
sp_knot_show(cc->connpthandle);
} else {
sp_knot_hide(cc->connpthandle);
g_assert( SP_IS_PATH(item) );
SPCurve *curve = SP_SHAPE(SP_PATH(item))->curve;
- NR::Matrix i2d = sp_item_i2d_affine(item);
+ NR::Matrix i2d = from_2geom(sp_item_i2d_affine(item));
if (cc->active_conn == item)
{
// Just adjust handle positions.
NR::Point startpt = curve->first_point() * i2d;
- sp_knot_set_position(cc->endpt_handle[0], &startpt, 0);
+ sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
NR::Point endpt = curve->last_point() * i2d;
- sp_knot_set_position(cc->endpt_handle[1], &endpt, 0);
+ sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
return;
}
}
NR::Point startpt = curve->first_point() * i2d;
- sp_knot_set_position(cc->endpt_handle[0], &startpt, 0);
+ sp_knot_set_position(cc->endpt_handle[0], startpt, 0);
NR::Point endpt = curve->last_point() * i2d;
- sp_knot_set_position(cc->endpt_handle[1], &endpt, 0);
+ sp_knot_set_position(cc->endpt_handle[1], endpt, 0);
sp_knot_show(cc->endpt_handle[0]);
sp_knot_show(cc->endpt_handle[1]);
{
if (SP_IS_PATH(item)) {
SPCurve *curve = (SP_SHAPE(item))->curve;
- if ( curve && !(curve->closed) ) {
+ if ( curve && !(curve->is_closed()) ) {
// Open paths are connectors.
return false;
}
{
if (SP_IS_PATH(item)) {
if (SP_PATH(item)->connEndPair.isAutoRoutingConn()) {
- g_assert( !(SP_SHAPE(item)->curve->closed) );
+ g_assert( !(SP_SHAPE(item)->curve->is_closed()) );
return true;
}
}