Filters. New Channel transparency and Cross blur custom predefined filters.

Extensions. Barcode extensions reorganization.
Translations. inkscape.pot and French translation update.

(bzr r10509)

3 files changed, 208 insertions, 0 deletions

diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h
new file mode 100644
index 000000000..957484cbb
--- /dev/null
+++ b/src/extension/internal/filter/blurs.h
@@ -0,0 +1,114 @@
+#ifndef __INKSCAPE_EXTENSION_INTERNAL_FILTER_BLURS_H__
+#define __INKSCAPE_EXTENSION_INTERNAL_FILTER_BLURS_H__
+/* Change the 'BLURS' above to be your file name */
+
+/*
+ * Copyright (C) 2011 Authors:
+ *   Ivan Louette (filters)
+ *   Nicolas Dufour (UI) <nicoduf@yahoo.fr>
+ *
+ * Blur filters
+ *   Cross blur
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+/* ^^^ Change the copyright to be you and your e-mail address ^^^ */
+
+#include "filter.h"
+
+#include "extension/internal/clear-n_.h"
+#include "extension/system.h"
+#include "extension/extension.h"
+
+namespace Inkscape {
+namespace Extension {
+namespace Internal {
+namespace Filter {
+
+/**
+    \brief    Custom predefined Cross blur filter.
+    
+    Combine vertical and horizontal blur
+
+    Filter's parameters:
+    * Brighness (0.->10., default 0) -> composite (k3)
+    * Fading (0.->1., default 0) -> composite (k4)
+    * Horizontal blur (0.01->20., default 5) -> blur (stdDeviation)
+    * Vertical blur (0.01->20., default 5) -> blur (stdDeviation)
+    * Blend mode (enum, default Darken) -> blend (mode)
+*/
+
+class CrossBlur : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+    CrossBlur ( ) : Filter() { };
+    virtual ~CrossBlur ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Cross blur, custom (Blurs)") "</name>\n"
+              "<id>org.inkscape.effect.filter.CrossBlur</id>\n"
+              "<param name=\"bright\" gui-text=\"" N_("Brightness:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"10.00\">0</param>\n"
+              "<param name=\"fade\" gui-text=\"" N_("Fading:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.00\">0</param>\n"
+              "<param name=\"hblur\" gui-text=\"" N_("Horizontal blur:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
+              "<param name=\"vblur\" gui-text=\"" N_("Vertical blur:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">5</param>\n"
+              "<param name=\"blend\" gui-text=\"" N_("Blend:") "\" type=\"enum\">\n"
+                "<_item value=\"darken\">" N_("Darken") "</_item>\n"
+                "<_item value=\"screen\">" N_("Screen") "</_item>\n"
+                "<_item value=\"multiply\">" N_("Multiply") "</_item>\n"
+                "<_item value=\"lighten\">" N_("Lighten") "</_item>\n"
+              "</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Combine vertical and horizontal blur") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new CrossBlur());
+    };
+
+};
+
+gchar const *
+CrossBlur::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+    if (_filter != NULL) g_free((void *)_filter);
+
+    std::ostringstream bright;
+    std::ostringstream fade;
+    std::ostringstream hblur;
+    std::ostringstream vblur;
+    std::ostringstream blend;
+
+    bright << ext->get_param_float("bright");
+    fade << ext->get_param_float("fade");
+    hblur << ext->get_param_float("hblur");
+    vblur << ext->get_param_float("vblur");
+    blend << ext->get_param_enum("blend");
+    
+    _filter = g_strdup_printf(
+        "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" inkscape:label=\"Cross blur, custom\">\n"
+          "<feColorMatrix in=\"SourceGraphic\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0.2125 -0.7154 -0.0721 1 0 \" result=\"colormatrix\" />\n"
+          "<feComposite in=\"SourceGraphic\" in2=\"colormatrix\" operator=\"arithmetic\" k2=\"1\" k3=\"%s\" k4=\"%s\" result=\"composite\" />\n"
+          "<feGaussianBlur stdDeviation=\"%s 0.01\" result=\"blur1\" />\n"
+          "<feGaussianBlur in=\"composite\" stdDeviation=\"0.01 %s\" result=\"blur2\" />\n"
+          "<feBlend in=\"blur2\" in2=\"blur1\" blend=\"normal\" mode=\"%s\" result=\"blend\" />\n"
+        "</filter>\n", bright.str().c_str(), fade.str().c_str(), hblur.str().c_str(), vblur.str().c_str(), blend.str().c_str());
+
+    return _filter;
+}; /* Cross blur filter */
+
+
+}; /* namespace Filter */
+}; /* namespace Internal */
+}; /* namespace Extension */
+}; /* namespace Inkscape */
+
+/* Change the 'BLURS' below to be your file name */
+#endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_BLURS_H__ */
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 4f9954b2c..2df92df29 100755
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -10,6 +10,7 @@
  * Color filters
  *   Brightness
  *   Channel painting
+ *   Channel transparency
  *   Colorize
  *   Duochrome
  *   Electrize
@@ -226,6 +227,90 @@ ChannelPaint::get_filter_text (Inkscape::Extension::Extension * ext)
 
 
 /**
+    \brief    Custom predefined Channel transparency filter.
+    
+    Channel transparency filter.
+
+    Filter's parameters:
+    * Saturation (0.->1., default 1.) -> colormatrix1 (values)
+    * Red (-10.->10., default -1.) -> colormatrix2 (values)
+    * Green (-10.->10., default 0.5) -> colormatrix2 (values)
+    * Blue (-10.->10., default 0.5) -> colormatrix2 (values)
+    * Alpha (-10.->10., default 1.) -> colormatrix2 (values)
+    * Flood colors (guint, default 16777215) -> flood (flood-opacity, flood-color)
+    * Inverted (boolean, default false) -> composite1 (operator, true='in', false='out')
+    
+    Matrix:
+      1  0  0  0  0
+      0  1  0  0  0
+      0  0  1  0  0
+      R  G  B  A  0
+*/
+class ChannelTransparency : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+    virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+    ChannelTransparency ( ) : Filter() { };
+    virtual ~ChannelTransparency ( ) { if (_filter != NULL) g_free((void *)_filter); return; }
+    
+    static void init (void) {
+        Inkscape::Extension::build_from_mem(
+            "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
+              "<name>" N_("Channel transparency, custom (Color)") "</name>\n"
+              "<id>org.inkscape.effect.filter.ChannelTransparency</id>\n"
+              "<param name=\"red\" gui-text=\"" N_("Red:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">-1</param>\n"
+              "<param name=\"green\" gui-text=\"" N_("Green:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.5</param>\n"
+              "<param name=\"blue\" gui-text=\"" N_("Blue:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-10.00\" max=\"10.00\">0.5</param>\n"
+              "<param name=\"alpha\" gui-text=\"" N_("Alpha:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">1</param>\n"
+              "<param name=\"invert\" gui-text=\"" N_("Inverted") "\" type=\"boolean\">false</param>\n"
+              "<effect>\n"
+                "<object-type>all</object-type>\n"
+                "<effects-menu>\n"
+                  "<submenu name=\"" N_("Filters") "\">\n"
+                    "<submenu name=\"" N_("Experimental") "\"/>\n"
+                  "</submenu>\n"
+                "</effects-menu>\n"
+                "<menu-tip>" N_("Replace RGB by transparency") "</menu-tip>\n"
+              "</effect>\n"
+            "</inkscape-extension>\n", new ChannelTransparency());
+    };
+};
+
+gchar const *
+ChannelTransparency::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+    if (_filter != NULL) g_free((void *)_filter);
+
+    std::ostringstream red;
+    std::ostringstream green;
+    std::ostringstream blue;
+    std::ostringstream alpha;
+    std::ostringstream invert;
+
+    red << ext->get_param_float("red");
+    green << ext->get_param_float("green");
+    blue << ext->get_param_float("blue");
+    alpha << ext->get_param_float("alpha");
+
+    if (!ext->get_param_bool("invert")) {
+        invert << "in";
+    } else {
+        invert << "xor";
+    }
+    
+    _filter = g_strdup_printf(
+        "<filter inkscape:label=\"Color channel painting\" color-interpolation-filters=\"sRGB\" x=\"0\" y=\"0\" width=\"1\" height=\"1\">\n"
+          "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 %s %s %s %s 0 \" in=\"SourceGraphic\" result=\"colormatrix\" />\n"
+          "<feComposite in=\"colormatrix\" in2=\"SourceGraphic\" operator=\"%s\" result=\"composite1\" />\n"
+        "</filter>\n", red.str().c_str(), green.str().c_str(), blue.str().c_str(), alpha.str().c_str(),
+                       invert.str().c_str());
+
+    return _filter;
+}; /* Channel Transparency filter */
+
+
+/**
     \brief    Custom predefined Colorize filter.
     
     Blend image or object with a flood color.
diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp
index 8a8dd57a6..ed8b4e180 100755
--- a/src/extension/internal/filter/filter-all.cpp
+++ b/src/extension/internal/filter/filter-all.cpp
@@ -9,6 +9,8 @@
 
 /* Put your filter here */
 #include "abc.h"
+#include "blurs.h"
+//#include "bumps.h"
 #include "color.h"
 #include "drop-shadow.h"
 #include "image.h"
@@ -47,9 +49,16 @@ Filter::filters_all (void )
     Silhouette::init();
     SpecularLight::init();
 
+    // Blurs
+    CrossBlur::init();
+    
+    // Bumps
+//    SpecularBump::init();
+    
     // Color
     Brightness::init();
     ChannelPaint::init();
+    ChannelTransparency::init();
     Colorize::init();
     Duochrome::init();
     Electrize::init();