X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-filter.cpp;h=2b1b94b1fa9c32782fe0b978c2501cb3ea39be29;hb=724821145d62dee9f97465c706952582da6e432d;hp=d7229bda16c60c62a4ec92a90e18c070a25ec5f4;hpb=e7a2b63dd05c88adcac422aedc11fed284640bed;p=inkscape.git diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp index d7229bda1..2b1b94b1f 100644 --- a/src/sp-filter.cpp +++ b/src/sp-filter.cpp @@ -6,8 +6,9 @@ /* * Authors: * Hugo Rodrigues + * Niko Kiirala * - * Copyright (C) 2006 Hugo Rodrigues + * Copyright (C) 2006,2007 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -16,6 +17,11 @@ # include "config.h" #endif +#include +#include +using std::map; +using std::pair; + #include "attributes.h" #include "document.h" #include "sp-filter.h" @@ -26,36 +32,7 @@ #define SP_MACROS_SILENT #include "macros.h" - -/* - * For debugging purposes only - */ -void printfilter(SPFilter *filter) -{ - if(filter->filterUnits==SP_FILTER_UNITS_USERSPACEONUSE) - g_print("filterUnits=SP_FILTER_UNITS_USERSPACEONUSE\n"); - else if(filter->filterUnits==SP_FILTER_UNITS_OBJECTBOUNDINGBOX) - g_print("filterUnits=SP_FILTER_UNITS_OBJECTBOUNDINGBOX\n"); - else - g_print("filterUnits=UNKNOWN!!!\n"); - - if(filter->primitiveUnits==SP_FILTER_UNITS_USERSPACEONUSE) - g_print("primitiveUnits=SP_FILTER_UNITS_USERSPACEONUSE\n"); - else if(filter->primitiveUnits==SP_FILTER_UNITS_OBJECTBOUNDINGBOX) - g_print("primitiveUnits=SP_FILTER_UNITS_OBJECTBOUNDINGBOX\n"); - else - g_print("primitiveUnits=UNKNOWN!!!\n"); - -//TODO: print X, Y, W and H units - g_print("x=%lf\n", filter->x.computed); - g_print("y=%lf\n", filter->y.computed); - g_print("width=%lf\n", filter->width.computed); - g_print("height=%lf\n", filter->height.computed); - g_print("filterRes=(%lf %lf)\n", filter->filterRes.getNumber(), filter->filterRes.getOptNumber()); - -} - - +#include "display/nr-filter.cpp" /* Filter base class */ @@ -66,6 +43,10 @@ static void sp_filter_build(SPObject *object, SPDocument *document, Inkscape::XM static void sp_filter_release(SPObject *object); static void sp_filter_set(SPObject *object, unsigned int key, gchar const *value); static void sp_filter_update(SPObject *object, SPCtx *ctx, guint flags); +static void sp_filter_child_added(SPObject *object, + Inkscape::XML::Node *child, + Inkscape::XML::Node *ref); +static void sp_filter_remove_child(SPObject *object, Inkscape::XML::Node *child); static Inkscape::XML::Node *sp_filter_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter); @@ -107,6 +88,8 @@ sp_filter_class_init(SPFilterClass *klass) sp_object_class->write = sp_filter_write; sp_object_class->set = sp_filter_set; sp_object_class->update = sp_filter_update; + sp_object_class->child_added = sp_filter_child_added; + sp_object_class->remove_child = sp_filter_remove_child; } static void @@ -124,7 +107,15 @@ sp_filter_init(SPFilter *filter) filter->primitiveUnits = SP_FILTER_UNITS_OBJECTBOUNDINGBOX; filter->filterUnits_set = FALSE; filter->primitiveUnits_set = FALSE; - + filter->_primitive_count=0; + + filter->_primitive_table_size = 1; + filter->_primitives = new SPFilterPrimitive*[1]; + filter->_primitives[0] = NULL; + + filter->_renderer = NULL; + + filter->_image_name = map(); } /** @@ -219,24 +210,24 @@ sp_filter_set(SPObject *object, unsigned int key, gchar const *value) } object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_X: + case SP_ATTR_X: filter->x.readOrUnset(value); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_Y: - filter->y.readOrUnset(value); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); + case SP_ATTR_Y: + filter->y.readOrUnset(value); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_WIDTH: - filter->width.readOrUnset(value); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); + case SP_ATTR_WIDTH: + filter->width.readOrUnset(value); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_HEIGHT: - filter->height.readOrUnset(value); - object->requestModified(SP_OBJECT_MODIFIED_FLAG); + case SP_ATTR_HEIGHT: + filter->height.readOrUnset(value); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_FILTERRES: - filter->filterRes.set(value); + case SP_ATTR_FILTERRES: + filter->filterRes.set(value); break; case SP_ATTR_XLINK_HREF: if (value) { @@ -288,7 +279,7 @@ sp_filter_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) SPFilter *filter = SP_FILTER(object); if (!repr) { - repr = SP_OBJECT_REPR(object)->duplicate(); + repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME } if ((flags & SP_OBJECT_WRITE_ALL) || filter->filterUnits_set) { @@ -337,9 +328,10 @@ sp_filter_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) repr->setAttribute("height", NULL); } - if (filter->filterRes._set) { - char filterRes[32]; - repr->setAttribute("filterRes", filter->filterRes.getValueString(filterRes)); + if (filter->filterRes.getNumber()>=0) { + gchar *tmp = filter->filterRes.getValueString(); + repr->setAttribute("filterRes", tmp); + g_free(tmp); } else { repr->setAttribute("filterRes", NULL); } @@ -384,6 +376,116 @@ filter_ref_modified(SPObject *href, guint flags, SPFilter *filter) } +void _enlarge_primitive_table(SPFilter * filter) { + SPFilterPrimitive **new_tbl = new SPFilterPrimitive*[filter->_primitive_table_size * 2]; + for (int i = 0 ; i < filter->_primitive_count ; i++) { + new_tbl[i] = filter->_primitives[i]; + } + filter->_primitive_table_size *= 2; + for (int i = filter->_primitive_count ; i < filter->_primitive_table_size ; i++) { + new_tbl[i] = NULL; + } + delete[] filter->_primitives; + filter->_primitives = new_tbl; +} + +SPFilterPrimitive *add_primitive(SPFilter *filter, SPFilterPrimitive *primitive) +{ + if (filter->_primitive_count >= filter->_primitive_table_size) { + _enlarge_primitive_table(filter); + } + filter->_primitives[filter->_primitive_count] = primitive; + filter->_primitive_count++; + return primitive; +} + +/** + * Callback for child_added event. + */ +static void +sp_filter_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref) +{/* + SPFilter *f = SP_FILTER(object); + + if (((SPObjectClass *) filter_parent_class)->child_added) + (* ((SPObjectClass *) filter_parent_class)->child_added)(object, child, ref); + + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + */ +} + +/** + * Callback for remove_child event. + */ +static void +sp_filter_remove_child(SPObject *object, Inkscape::XML::Node *child) +{/* + SPFilter *f = SP_FILTER(object); + + if (((SPObjectClass *) filter_parent_class)->remove_child) + (* ((SPObjectClass *) filter_parent_class)->remove_child)(object, child); + + SPObject *ochild; + + + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + */ +} + +void sp_filter_build_renderer(SPFilter *sp_filter, NR::Filter *nr_filter) +{ + g_assert(sp_filter != NULL); + g_assert(nr_filter != NULL); + + sp_filter->_renderer = nr_filter; + + nr_filter->set_x(sp_filter->x); + nr_filter->set_y(sp_filter->y); + nr_filter->set_width(sp_filter->width); + nr_filter->set_height(sp_filter->height); + + nr_filter->clear_primitives(); + for (int i = 0 ; i < sp_filter->_primitive_count ; i++) { + SPFilterPrimitive *primitive = sp_filter->_primitives[i]; + g_assert(primitive != NULL); + if (((SPFilterPrimitiveClass*) G_OBJECT_GET_CLASS(primitive))->build_renderer) { + ((SPFilterPrimitiveClass *) G_OBJECT_GET_CLASS(primitive))->build_renderer(primitive, nr_filter); + } else { + g_warning("Cannot build filter renderer: missing builder"); + } + } +} + +int sp_filter_primitive_count(SPFilter *filter) { + g_assert(filter != NULL); + return filter->_primitive_count; +} + +int sp_filter_get_image_name(SPFilter *filter, gchar const *name) { + gchar *name_copy = strdup(name); + map::iterator result = filter->_image_name.find(name_copy); + free(name_copy); + if (result == filter->_image_name.end()) return -1; + else return (*result).second; +} + +int sp_filter_set_image_name(SPFilter *filter, gchar const *name) { + int value = filter->_image_number_next; + filter->_image_number_next++; + gchar *name_copy = strdup(name); + pair::iterator,bool> ret = filter->_image_name.insert(pair(name_copy, value)); + if (ret.second == false) { + return (*ret.first).second; + } + return value; +} + +bool ltstr::operator()(const char* s1, const char* s2) const +{ + return strcmp(s1, s2) < 0; +} + + /* Local Variables: mode:c++