index 980d77968e2163a74e5936630b151fa9a67e3467..01290391f68b98aaeee43b2b6ab28d34a6d5fab2 100644 (file)
--- a/src/sp-femorphology.cpp
+++ b/src/sp-femorphology.cpp
*/
/*
* Authors:
- * hugo Rodrigues <haa.rodrigues@gmail.com>
+ * Felipe Sanches <felipe.sanches@gmail.com>
+ * Hugo Rodrigues <haa.rodrigues@gmail.com>
*
* Copyright (C) 2006 Hugo Rodrigues
*
# include "config.h"
#endif
+#include <string.h>
+
#include "attributes.h"
#include "svg/svg.h"
#include "sp-femorphology.h"
#include "xml/repr.h"
-
+#include "display/nr-filter-morphology.h"
/* FeMorphology base class */
static void sp_feMorphology_release(SPObject *object);
static void sp_feMorphology_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMorphology_update(SPObject *object, SPCtx *ctx, guint flags);
-static Inkscape::XML::Node *sp_feMorphology_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_feMorphology_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_feMorphology_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
static SPFilterPrimitiveClass *feMorphology_parent_class;
static void
sp_feMorphology_init(SPFeMorphology *feMorphology)
{
+ //Setting default values:
+ feMorphology->radius.set("0");
}
/**
}
/*LOAD ATTRIBUTES FROM REPR HERE*/
+ sp_object_read_attr(object, "operator");
+ sp_object_read_attr(object, "radius");
}
/**
((SPObjectClass *) feMorphology_parent_class)->release(object);
}
+static NR::FilterMorphologyOperator sp_feMorphology_read_operator(gchar const *value){
+ if (!value) return NR::MORPHOLOGY_OPERATOR_ERODE; //erode is default
+ switch(value[0]){
+ case 'e':
+ if (strncmp(value, "erode", 5) == 0) return NR::MORPHOLOGY_OPERATOR_ERODE;
+ break;
+ case 'd':
+ if (strncmp(value, "dilate", 6) == 0) return NR::MORPHOLOGY_OPERATOR_DILATE;
+ break;
+ }
+ return NR::MORPHOLOGY_OPERATOR_ERODE; //erode is default
+}
+
/**
* Sets a specific value in the SPFeMorphology.
*/
{
SPFeMorphology *feMorphology = SP_FEMORPHOLOGY(object);
(void)feMorphology;
-
+
+ NR::FilterMorphologyOperator read_operator;
switch(key) {
- /*DEAL WITH SETTING ATTRIBUTES HERE*/
+ /*DEAL WITH SETTING ATTRIBUTES HERE*/
+ case SP_ATTR_OPERATOR:
+ read_operator = sp_feMorphology_read_operator(value);
+ if (read_operator != feMorphology->Operator){
+ feMorphology->Operator = read_operator;
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ }
+ break;
+ case SP_ATTR_RADIUS:
+ feMorphology->radius.set(value);
+ //From SVG spec: If <y-radius> is not provided, it defaults to <x-radius>.
+ if (feMorphology->radius.optNumIsSet() == false)
+ feMorphology->radius.setOptNumber(feMorphology->radius.getNumber());
+ object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
default:
if (((SPObjectClass *) feMorphology_parent_class)->set)
((SPObjectClass *) feMorphology_parent_class)->set(object, key, value);
* Writes its settings to an incoming repr object, if any.
*/
static Inkscape::XML::Node *
-sp_feMorphology_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_feMorphology_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
{
// 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(NULL); // FIXME
+ repr = SP_OBJECT_REPR(object)->duplicate(doc);
}
}
if (((SPObjectClass *) feMorphology_parent_class)->write) {
- ((SPObjectClass *) feMorphology_parent_class)->write(object, repr, flags);
+ ((SPObjectClass *) feMorphology_parent_class)->write(object, doc, repr, flags);
}
return repr;
@@ -175,7 +210,11 @@ static void sp_feMorphology_build_renderer(SPFilterPrimitive *primitive, NR::Fil
NR::FilterMorphology *nr_morphology = dynamic_cast<NR::FilterMorphology*>(nr_primitive);
g_assert(nr_morphology != NULL);
- sp_filter_primitive_renderer_common(primitive, nr_primitive);
+ sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+ nr_morphology->set_operator(sp_morphology->Operator);
+ nr_morphology->set_xradius( sp_morphology->radius.getNumber() );
+ nr_morphology->set_yradius( sp_morphology->radius.getOptNumber() );
}
/*