![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-feoffset.cpp b/src/sp-feoffset.cpp
index 3429ceb185261c220cc93a8ebc10fcae6a3e63bb..03d8b6227502b7a21831c7a46cd37ff7fdccc74c 100644 (file)
--- a/src/sp-feoffset.cpp
+++ b/src/sp-feoffset.cpp
/*
* Authors:
* hugo Rodrigues <haa.rodrigues@gmail.com>
+ * Niko Kiirala <niko@kiirala.com>
*
- * Copyright (C) 2006 Hugo Rodrigues
+ * Copyright (C) 2006,2007 authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "svg/svg.h"
#include "sp-feoffset.h"
#include "xml/repr.h"
-
-//#define SP_MACROS_SILENT
-//#include "macros.h"
-
-#define DEBUG_FEOFFSET
-#ifdef DEBUG_FEOFFSET
-# define debug(f, a...) { g_print("%s(%d) %s:", \
- __FILE__,__LINE__,__FUNCTION__); \
- g_print(f, ## a); \
- g_print("\n"); \
- }
-#else
-# define debug(f, a...) /**/
-#endif
+#include "display/nr-filter-offset.h"
/* FeOffset base class */
static void sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags);
static Inkscape::XML::Node *sp_feOffset_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static void sp_feOffset_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
-static SPObjectClass *feOffset_parent_class;
+static SPFilterPrimitiveClass *feOffset_parent_class;
GType
sp_feOffset_get_type()
(GInstanceInitFunc) sp_feOffset_init,
NULL, /* value_table */
};
- feOffset_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeOffset", &feOffset_info, (GTypeFlags)0);
+ feOffset_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeOffset", &feOffset_info, (GTypeFlags)0);
}
return feOffset_type;
}
sp_feOffset_class_init(SPFeOffsetClass *klass)
{
SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+ SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
- feOffset_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+ feOffset_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
sp_object_class->build = sp_feOffset_build;
sp_object_class->release = sp_feOffset_release;
sp_object_class->write = sp_feOffset_write;
sp_object_class->set = sp_feOffset_set;
sp_object_class->update = sp_feOffset_update;
+
+ sp_primitive_class->build_renderer = sp_feOffset_build_renderer;
}
static void
sp_feOffset_init(SPFeOffset *feOffset)
{
- debug("0x%p",feOffset);
+ feOffset->dx = 0;
+ feOffset->dy = 0;
}
/**
static void
sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- debug("0x%p",object);
if (((SPObjectClass *) feOffset_parent_class)->build) {
((SPObjectClass *) feOffset_parent_class)->build(object, document, repr);
}
- /*LOAD ATTRIBUTES FROM REPR HERE*/
+ sp_object_read_attr(object, "dx");
+ sp_object_read_attr(object, "dy");
}
/**
@@ -112,23 +105,49 @@ sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *r
static void
sp_feOffset_release(SPObject *object)
{
- debug("0x%p",object);
-
if (((SPObjectClass *) feOffset_parent_class)->release)
((SPObjectClass *) feOffset_parent_class)->release(object);
}
+static double
+sp_feOffset_read_number(gchar const *value) {
+ if (!value) return 0;
+ char *end;
+ double ret = g_ascii_strtod(value, &end);
+ if (*end) {
+ g_warning("Unable to convert \"%s\" to number", value);
+ // We could leave this out, too. If strtod can't convert
+ // anything, it will return zero.
+ ret = 0;
+ }
+ return ret;
+}
+
/**
* Sets a specific value in the SPFeOffset.
*/
static void
sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value)
{
- debug("0x%p %s(%u): '%s'",object,
- sp_attribute_name(key),key,value);
SPFeOffset *feOffset = SP_FEOFFSET(object);
- switch(key) {\r
+ double read_num;
+ switch(key) {
+ case SP_ATTR_DX:
+ read_num = sp_feOffset_read_number(value);
+ if (read_num != feOffset->dx) {
+ feOffset->dx = read_num;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+ case SP_ATTR_DY:
+ read_num = sp_feOffset_read_number(value);
+ if (read_num != feOffset->dy) {
+ feOffset->dy = read_num;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+
/*DEAL WITH SETTING ATTRIBUTES HERE*/
default:
if (((SPObjectClass *) feOffset_parent_class)->set)
static void
sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags)
{
- debug("0x%p",object);
-
- if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
- SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
-
- /* do something to trigger redisplay, updates? */
-
+ if (flags & SP_OBJECT_MODIFIED_FLAG) {
+ sp_object_read_attr(object, "dx");
+ sp_object_read_attr(object, "dy");
}
if (((SPObjectClass *) feOffset_parent_class)->update) {
static Inkscape::XML::Node *
sp_feOffset_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
{
- debug("0x%p",object);
-
// Inkscape-only object, not copied during an "plain SVG" dump:
if (flags & SP_OBJECT_WRITE_EXT) {
if (repr) {
// is this sane?
- repr->mergeFrom(SP_OBJECT_REPR(object), "id");
+ // Not. Causes coredumps.
+ // repr->mergeFrom(SP_OBJECT_REPR(object), "id");
} else {
- repr = SP_OBJECT_REPR(object)->duplicate();
+ repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
}
}
return repr;
}
+static void sp_feOffset_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
+ g_assert(primitive != NULL);
+ g_assert(filter != NULL);
+
+ SPFeOffset *sp_offset = SP_FEOFFSET(primitive);
+
+ int primitive_n = filter->add_primitive(NR::NR_FILTER_OFFSET);
+ NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n);
+ NR::FilterOffset *nr_offset = dynamic_cast<NR::FilterOffset*>(nr_primitive);
+ g_assert(nr_offset != NULL);
+
+ sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+ nr_offset->set_dx(sp_offset->dx);
+ nr_offset->set_dy(sp_offset->dy);
+}
+
/*
Local Variables: