![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0e26fbbf4ef13a623a854752c255636f8ec453db..1c28fb76fdf7513c548ffbfcd16feb3ae36bfe81 100644 (file)
--- a/src/sp-gaussian-blur.cpp
+++ b/src/sp-gaussian-blur.cpp
-#define __SP_GAUSSIANBLUR_CPP__
-
/** \file
* SVG <gaussianBlur> implementation.
*
*/
/*
* Authors:
- * hugo Rodrigues <haa.rodrigues@gmail.com>
+ * Hugo Rodrigues <haa.rodrigues@gmail.com>
+ * Niko Kiirala <niko@kiirala.com>
+ * Abhishek Sharma
*
- * Copyright (C) 2006 Hugo Rodrigues
+ * Copyright (C) 2006,2007 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "sp-gaussian-blur.h"
#include "xml/repr.h"
+#include "display/nr-filter.h"
+#include "display/nr-filter-primitive.h"
+#include "display/nr-filter-gaussian.h"
+#include "display/nr-filter-types.h"
+
//#define SP_MACROS_SILENT
//#include "macros.h"
-#define DEBUG_GAUSSIANBLUR
-#ifdef DEBUG_GAUSSIANBLUR
-# 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
-
/* GaussianBlur base class */
static void sp_gaussianBlur_class_init(SPGaussianBlurClass *klass);
static void sp_gaussianBlur_release(SPObject *object);
static void sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_gaussianBlur_update(SPObject *object, SPCtx *ctx, guint flags);
-static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter);
-static SPObjectClass *gaussianBlur_parent_class;
+static SPFilterPrimitiveClass *gaussianBlur_parent_class;
GType
sp_gaussianBlur_get_type()
(GInstanceInitFunc) sp_gaussianBlur_init,
NULL, /* value_table */
};
- gaussianBlur_type = g_type_register_static(SP_TYPE_OBJECT, "SPGaussianBlur", &gaussianBlur_info, (GTypeFlags)0);
+ gaussianBlur_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPGaussianBlur", &gaussianBlur_info, (GTypeFlags)0);
}
return gaussianBlur_type;
}
sp_gaussianBlur_class_init(SPGaussianBlurClass *klass)
{
SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+ SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
- gaussianBlur_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+ gaussianBlur_parent_class = (SPFilterPrimitiveClass *)g_type_class_peek_parent(klass);
sp_object_class->build = sp_gaussianBlur_build;
sp_object_class->release = sp_gaussianBlur_release;
sp_object_class->write = sp_gaussianBlur_write;
sp_object_class->set = sp_gaussianBlur_set;
sp_object_class->update = sp_gaussianBlur_update;
+
+ sp_primitive_class->build_renderer = sp_gaussianBlur_build_renderer;
}
static void
-sp_gaussianBlur_init(SPGaussianBlur *gaussianBlur)
+sp_gaussianBlur_init(SPGaussianBlur */*gaussianBlur*/)
{
- debug("0x%p",gaussianBlur);
-
-// gaussianBlur->stdDeviation = 1;
}
/**
static void
sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
- debug("0x%p",object);
if (((SPObjectClass *) gaussianBlur_parent_class)->build) {
((SPObjectClass *) gaussianBlur_parent_class)->build(object, document, repr);
}
- sp_object_read_attr(object, "stdDeviation");
+ object->readAttr( "stdDeviation" );
}
@@ -115,7 +109,6 @@ sp_gaussianBlur_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
static void
sp_gaussianBlur_release(SPObject *object)
{
- debug("0x%p",object);
if (((SPObjectClass *) gaussianBlur_parent_class)->release)
((SPObjectClass *) gaussianBlur_parent_class)->release(object);
static void
sp_gaussianBlur_set(SPObject *object, unsigned int key, gchar const *value)
{
- debug("0x%p %s(%u): '%s'",object,
- sp_attribute_name(key),key,value);
SPGaussianBlur *gaussianBlur = SP_GAUSSIANBLUR(object);
switch(key) {
- case SP_ATTR_STDDEVIATION:
- gaussianBlur->stdDeviation.set(value);
+ case SP_ATTR_STDDEVIATION:
+ gaussianBlur->stdDeviation.set(value);
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
default:
if (((SPObjectClass *) gaussianBlur_parent_class)->set)
static void
sp_gaussianBlur_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->readAttr( "stdDeviation" );
}
if (((SPObjectClass *) gaussianBlur_parent_class)->update) {
* Writes its settings to an incoming repr object, if any.
*/
static Inkscape::XML::Node *
-sp_gaussianBlur_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_gaussianBlur_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");
- } else {
- repr = SP_OBJECT_REPR(object)->duplicate();
- }
+ /* TODO: Don't just clone, but create a new repr node and write all
+ * relevant values into it */
+ if (!repr) {
+ repr = SP_OBJECT_REPR(object)->duplicate(doc);
}
if (((SPObjectClass *) gaussianBlur_parent_class)->write) {
- ((SPObjectClass *) gaussianBlur_parent_class)->write(object, repr, flags);
+ ((SPObjectClass *) gaussianBlur_parent_class)->write(object, doc, repr, flags);
}
return repr;
}
+void sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num)
+{
+ blur->stdDeviation.setNumber(num);
+}
+void sp_gaussianBlur_setDeviation(SPGaussianBlur *blur, float num, float optnum)
+{
+ blur->stdDeviation.setNumber(num);
+ blur->stdDeviation.setOptNumber(optnum);
+}
+
+static void sp_gaussianBlur_build_renderer(SPFilterPrimitive *primitive, Inkscape::Filters::Filter *filter) {
+ SPGaussianBlur *sp_blur = SP_GAUSSIANBLUR(primitive);
+
+ int handle = filter->add_primitive(Inkscape::Filters::NR_FILTER_GAUSSIANBLUR);
+ Inkscape::Filters::FilterPrimitive *nr_primitive = filter->get_primitive(handle);
+ Inkscape::Filters::FilterGaussian *nr_blur = dynamic_cast<Inkscape::Filters::FilterGaussian*>(nr_primitive);
+
+ sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+ gfloat num = sp_blur->stdDeviation.getNumber();
+ if (num >= 0.0) {
+ gfloat optnum = sp_blur->stdDeviation.getOptNumber();
+ if(optnum >= 0.0)
+ nr_blur->set_deviation((double) num, (double) optnum);
+ else
+ nr_blur->set_deviation((double) num);
+ }
+}
+
/*
Local Variables:
mode:c++
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 :