make blur slider a percentage; change opacity to 1..100 as well; ensure the filter...

[inkscape.git] / src / filter-chemistry.cpp

diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 0b374160cb9702a442b32a5dadde227f430bceb4..e18e54ed6e9fca4bd3a70b8d1f4b44d9ee5348f3 100644 (file)
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -27,26 +27,36 @@
  * Creates a filter with blur primitive of specified stdDeviation
  */
 SPFilter *
-new_filter_gaussian_blur (SPDocument *document, gdouble stdDeviation)
+new_filter_gaussian_blur (SPDocument *document, gdouble stdDeviation, double width, double height)
 {
     g_return_val_if_fail(document != NULL, NULL);
 
     SPDefs *defs = (SPDefs *) SP_DOCUMENT_DEFS(document);
 
-    // create a new private filter
+    // create a new filter
     Inkscape::XML::Node *repr;
     repr = sp_repr_new("svg:filter");
     repr->setAttribute("inkscape:collect", "always");
 
+    if (width != 0 && height != 0 && (2 * stdDeviation > width * 0.1 || 2 * stdDeviation > height * 0.1)) {
+        // If not within the default 10% margin (see
+        // http://www.w3.org/TR/SVG11/filters.html#FilterEffectsRegion), specify margins
+        double xmargin = 2 * stdDeviation / width;
+        double ymargin = 2 * stdDeviation / height;
+
+        sp_repr_set_svg_double(repr, "x", -xmargin);
+        sp_repr_set_svg_double(repr, "width", 1 + 2 * xmargin);
+        sp_repr_set_svg_double(repr, "y", -ymargin);
+        sp_repr_set_svg_double(repr, "height", 1 + 2 * ymargin);
+    }
+
     //create feGaussianBlur node
     Inkscape::XML::Node *b_repr;
     b_repr = sp_repr_new("svg:feGaussianBlur");
     b_repr->setAttribute("inkscape:collect", "always");
     
     //set stdDeviation attribute
-    Inkscape::CSSOStringStream os;
-    os << stdDeviation;
-    b_repr->setAttribute("stdDeviation", os.str().c_str());
+    sp_repr_set_svg_double(b_repr, "stdDeviation", stdDeviation);
     
     //set feGaussianBlur as child of filter node
     repr->appendChild(b_repr);