![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-femerge.cpp b/src/sp-femerge.cpp
index 6904f5b52db541e6a867ba4678b4fe961de5d040..9e45d44ab29821707d83c353aac9ef1042a6b908 100644 (file)
--- a/src/sp-femerge.cpp
+++ b/src/sp-femerge.cpp
#include "attributes.h"
#include "svg/svg.h"
-#include "sp-femerge.h"
#include "xml/repr.h"
-//#define SP_MACROS_SILENT
-//#include "macros.h"
-
-#define DEBUG_FEMERGE
-#ifdef DEBUG_FEMERGE
-# 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 "sp-femerge.h"
+#include "sp-femergenode.h"
+#include "display/nr-filter-merge.h"
/* FeMerge base class */
static void sp_feMerge_release(SPObject *object);
static void sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags);
-static Inkscape::XML::Node *sp_feMerge_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_feMerge_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+static void sp_feMerge_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
-static SPObjectClass *feMerge_parent_class;
+static SPFilterPrimitiveClass *feMerge_parent_class;
GType
sp_feMerge_get_type()
(GInstanceInitFunc) sp_feMerge_init,
NULL, /* value_table */
};
- feMerge_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeMerge", &feMerge_info, (GTypeFlags)0);
+ feMerge_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeMerge", &feMerge_info, (GTypeFlags)0);
}
return feMerge_type;
}
sp_feMerge_class_init(SPFeMergeClass *klass)
{
SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+ SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
- feMerge_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+ feMerge_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
sp_object_class->build = sp_feMerge_build;
sp_object_class->release = sp_feMerge_release;
sp_object_class->write = sp_feMerge_write;
sp_object_class->set = sp_feMerge_set;
sp_object_class->update = sp_feMerge_update;
+
+ sp_primitive_class->build_renderer = sp_feMerge_build_renderer;
}
static void
-sp_feMerge_init(SPFeMerge *feMerge)
+sp_feMerge_init(SPFeMerge */*feMerge*/)
{
- debug("0x%p",feMerge);
}
/**
static void
sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- debug("0x%p",object);
if (((SPObjectClass *) feMerge_parent_class)->build) {
((SPObjectClass *) feMerge_parent_class)->build(object, document, repr);
}
@@ -112,8 +103,6 @@ sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
static void
sp_feMerge_release(SPObject *object)
{
- debug("0x%p",object);
-
if (((SPObjectClass *) feMerge_parent_class)->release)
((SPObjectClass *) feMerge_parent_class)->release(object);
}
static void
sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value)
{
- debug("0x%p %s(%u): '%s'",object,
- sp_attribute_name(key),key,value);
SPFeMerge *feMerge = SP_FEMERGE(object);
+ (void)feMerge;
- switch(key) {\r
+ switch(key) {
/*DEAL WITH SETTING ATTRIBUTES HERE*/
default:
if (((SPObjectClass *) feMerge_parent_class)->set)
static void
sp_feMerge_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) {
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
if (((SPObjectClass *) feMerge_parent_class)->update) {
* Writes its settings to an incoming repr object, if any.
*/
static Inkscape::XML::Node *
-sp_feMerge_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_feMerge_write(SPObject *object, Inkscape::XML::Document *doc, 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");
+ //repr->mergeFrom(SP_OBJECT_REPR(object), "id");
} else {
- repr = SP_OBJECT_REPR(object)->duplicate();
+ repr = SP_OBJECT_REPR(object)->duplicate(doc);
}
}
if (((SPObjectClass *) feMerge_parent_class)->write) {
- ((SPObjectClass *) feMerge_parent_class)->write(object, repr, flags);
+ ((SPObjectClass *) feMerge_parent_class)->write(object, doc, repr, flags);
}
return repr;
}
+static void sp_feMerge_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
+ g_assert(primitive != NULL);
+ g_assert(filter != NULL);
+
+ SPFeMerge *sp_merge = SP_FEMERGE(primitive);
+ (void)sp_merge;
+
+ int primitive_n = filter->add_primitive(NR::NR_FILTER_MERGE);
+ NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n);
+ NR::FilterMerge *nr_merge = dynamic_cast<NR::FilterMerge*>(nr_primitive);
+ g_assert(nr_merge != NULL);
+
+ sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+ SPObject *input = primitive->children;
+ int in_nr = 0;
+ while (input) {
+ if (SP_IS_FEMERGENODE(input)) {
+ SPFeMergeNode *node = SP_FEMERGENODE(input);
+ nr_merge->set_input(in_nr, node->input);
+ in_nr++;
+ }
+ input = input->next;
+ }
+}
+
/*
Local Variables: