![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e2e014eff97162ff9b016c16e8e12a3a35bae381..ce1289faf30adf6a0d73ed97ac6338f937da14b9 100644 (file)
-#define __SP_GUIDELINE_C__
-
/*
* Horizontal/vertical but can also be angled line
*
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* Johan Engelen
+ * Maximilian Albert <maximilian.albert@gmail.com>
*
* Copyright (C) 2000-2002 Lauris Kaplinski
* Copyright (C) 2007 Johan Engelen
+ * Copyright (C) 2009 Maximilian Albert
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include <libnr/nr-pixops.h>
-#include "display-forward.h"
+#include <2geom/transforms.h>
#include "sp-canvas-util.h"
+#include "sp-ctrlpoint.h"
#include "guideline.h"
static void sp_guideline_class_init(SPGuideLineClass *c);
static void sp_guideline_init(SPGuideLine *guideline);
static void sp_guideline_destroy(GtkObject *object);
-static void sp_guideline_update(SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags);
+static void sp_guideline_update(SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags);
static void sp_guideline_render(SPCanvasItem *item, SPCanvasBuf *buf);
-static double sp_guideline_point(SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item);
+static double sp_guideline_point(SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
static void sp_guideline_drawline (SPCanvasBuf *buf, gint x0, gint y0, gint x1, gint y1, guint32 rgba);
gl->angle = 3.14159265358979323846/2;
gl->point_on_line = Geom::Point(0,0);
gl->sensitive = 0;
+
+ gl->origin = NULL;
}
static void sp_guideline_destroy(GtkObject *object)
{
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (SP_IS_GUIDELINE (object));
+ //g_return_if_fail (SP_GUIDELINE(object)->origin != NULL);
+ //g_return_if_fail (SP_IS_CTRLPOINT(SP_GUIDELINE(object)->origin));
+
+ if (SP_GUIDELINE(object)->origin != NULL && SP_IS_CTRLPOINT(SP_GUIDELINE(object)->origin)) {
+ gtk_object_destroy(GTK_OBJECT(SP_GUIDELINE(object)->origin));
+ } else {
+ // FIXME: This branch shouldn't be reached (although it seems to be harmless).
+ //g_error("Why can it be that gl->origin is not a valid SPCtrlPoint?\n");
+ }
+
GTK_OBJECT_CLASS(parent_class)->destroy(object);
}
}
}
-static void sp_guideline_update(SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
+static void sp_guideline_update(SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags)
{
SPGuideLine *gl = SP_GUIDELINE(item);
@@ -179,6 +194,9 @@ static void sp_guideline_update(SPCanvasItem *item, NR::Matrix const &affine, un
gl->point_on_line[Geom::X] = affine[4];
gl->point_on_line[Geom::Y] = affine[5];
+ sp_ctrlpoint_set_coords(gl->origin, gl->point_on_line * affine.inverse());
+ sp_canvas_item_request_update(SP_CANVAS_ITEM (gl->origin));
+
if (gl->is_horizontal()) {
sp_canvas_update_bbox (item, -1000000, (int) Inkscape::round(gl->point_on_line[Geom::Y]), 1000000, (int) Inkscape::round(gl->point_on_line[Geom::Y] + 1));
} else if (gl->is_vertical()) {
@@ -189,7 +207,7 @@ static void sp_guideline_update(SPCanvasItem *item, NR::Matrix const &affine, un
}
// Returns 0.0 if point is on the guideline
-static double sp_guideline_point(SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)
+static double sp_guideline_point(SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item)
{
SPGuideLine *gl = SP_GUIDELINE (item);
@@ -207,21 +225,26 @@ static double sp_guideline_point(SPCanvasItem *item, NR::Point p, SPCanvasItem *
SPCanvasItem *sp_guideline_new(SPCanvasGroup *parent, Geom::Point point_on_line, Geom::Point normal)
{
SPCanvasItem *item = sp_canvas_item_new(parent, SP_TYPE_GUIDELINE, NULL);
+ SPCanvasItem *origin = sp_canvas_item_new(parent, SP_TYPE_CTRLPOINT, NULL);
SPGuideLine *gl = SP_GUIDELINE(item);
+ SPCtrlPoint *cp = SP_CTRLPOINT(origin);
+ gl->origin = cp;
normal.normalize();
gl->normal_to_line = normal;
gl->angle = tan( -gl->normal_to_line[Geom::X] / gl->normal_to_line[Geom::Y]);
sp_guideline_set_position(gl, point_on_line);
+ sp_ctrlpoint_set_coords(cp, point_on_line);
+
return item;
}
void sp_guideline_set_position(SPGuideLine *gl, Geom::Point point_on_line)
{
- sp_canvas_item_affine_absolute(SP_CANVAS_ITEM (gl),
- NR::Matrix(NR::translate(point_on_line)));
+ sp_canvas_item_affine_absolute(SP_CANVAS_ITEM (gl), Geom::Matrix(Geom::Translate(point_on_line)));
+ sp_canvas_item_affine_absolute(SP_CANVAS_ITEM (gl->origin), Geom::Matrix(Geom::Translate(point_on_line)));
}
void sp_guideline_set_normal(SPGuideLine *gl, Geom::Point normal_to_line)
void sp_guideline_set_color(SPGuideLine *gl, unsigned int rgba)
{
gl->rgba = rgba;
+ sp_ctrlpoint_set_color(gl->origin, rgba);
sp_canvas_item_request_update(SP_CANVAS_ITEM(gl));
}
gl->sensitive = sensitive;
}
+void sp_guideline_delete(SPGuideLine *gl)
+{
+ //gtk_object_destroy(GTK_OBJECT(gl->origin));
+ gtk_object_destroy(GTK_OBJECT(gl));
+}
+
//##########################################################
// Line rendering
#define SAFE_SETPIXEL //undefine this when it is certain that setpixel is never called with invalid params
@@ -331,4 +361,4 @@ sp_guideline_drawline (SPCanvasBuf *buf, gint x0, gint y0, gint x1, gint y1, gui
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :