Filters. New Chromolitho custom predefined filter (experimental). Some UI (notebooks...

diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 3bf2f63070570d21de8777b243c8d0a145a519b3..54312685c387396a7024b6f9dd3025fdb209e296 100644 (file)
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -7,6 +7,13 @@
  *   Ivan Louette (filters)
  *   Nicolas Dufour (UI) <nicoduf@yahoo.fr>
  *
+ * Color filters
+ *   Colorize
+ *   Duochrome
+ *   Quadritone
+ *   Solarize
+ *   Tritone
+ *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 /* ^^^ Change the copyright to be you and your e-mail address ^^^ */
@@ -151,6 +158,8 @@ public:
                        "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
                                "<name>" N_("Duochrome, custom -EXP-") "</name>\n"
                                "<id>org.inkscape.effect.filter.Duochrome</id>\n"
+                   "<param name=\"tab\" type=\"notebook\">\n"
+                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
                         "<param name=\"fluo\" gui-text=\"" N_("Fluorescence level:") "\" type=\"float\" min=\"0\" max=\"2\">0</param>\n"
                         "<param name=\"swap\" gui-text=\"" N_("Swap:") "\" type=\"enum\">\n"
                             "<_item value=\"none\">No swap</_item>\n"
@@ -158,10 +167,14 @@ public:
                             "<_item value=\"color\">Color only</_item>\n"
                             "<_item value=\"alpha\">Alpha only</_item>\n"
                         "</param>\n"
-                        "<_param name=\"header1\" type=\"groupheader\">Color 1</_param>\n"
+                    "</page>\n"
+                    "<page name=\"co11tab\" _gui-text=\"Color 1\">\n"
                                        "<param name=\"color1\" gui-text=\"" N_("Color 1") "\" type=\"color\">1364325887</param>\n"
-                        "<_param name=\"header2\" type=\"groupheader\">Color 2</_param>\n"
+                    "</page>\n"
+                    "<page name=\"co12tab\" _gui-text=\"Color 2\">\n"
                                        "<param name=\"color2\" gui-text=\"" N_("Color 2") "\" type=\"color\">-65281</param>\n"
+                    "</page>\n"
+                "</param>\n"
                                "<effect>\n"
                                        "<object-type>all</object-type>\n"
                                        "<effects-menu>\n"
@@ -445,14 +458,14 @@ public:
                        "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
                                "<name>" N_("Tritone, custom -EXP-") "</name>\n"
                                "<id>org.inkscape.effect.filter.Tritone</id>\n"
+                   "<param name=\"tab\" type=\"notebook\">\n"
+                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
                         "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
                             "<_item value=\"normal\">Normal</_item>\n"
                             "<_item value=\"enhue\">Enhance hue</_item>\n"
                             "<_item value=\"rad\">Radiation</_item>\n"
                             "<_item value=\"htb\">Hue to background</_item>\n"
                         "</param>\n"
-                        "<param name=\"dist\" gui-text=\"" N_("Hue distribution:") "\" type=\"int\" min=\"0\" max=\"360\">0</param>\n"
-                                       "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">-73203457</param>\n"
                         "<param name=\"globalblend\" gui-text=\"" N_("Global blend:") "\" type=\"enum\">\n"
                             "<_item value=\"lighten\">Lighten</_item>\n"
                             "<_item value=\"screen\">Screen</_item>\n"
@@ -467,6 +480,12 @@ public:
                         "</param>\n"
                         "<param name=\"llight\" gui-text=\"" N_("Local light:") "\" type=\"float\" min=\"0\" max=\"10\">0</param>\n"
                         "<param name=\"glight\" gui-text=\"" N_("Global light:") "\" type=\"float\" min=\"0\" max=\"10\">1</param>\n"
+                    "</page>\n"
+                    "<page name=\"co1tab\" _gui-text=\"Color\">\n"
+                        "<param name=\"dist\" gui-text=\"" N_("Hue distribution:") "\" type=\"int\" min=\"0\" max=\"360\">0</param>\n"
+                                       "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">-73203457</param>\n"
+                    "</page>\n"
+                "</param>\n"
                                "<effect>\n"
                                        "<object-type>all</object-type>\n"
                                        "<effects-menu>\n"

diff --git a/src/extension/internal/filter/experimental.h b/src/extension/internal/filter/experimental.h
index 6acf59f82ae645dec2c8a5a13f6516e42178e031..a8879720bdfc8cfe71012423d6aef07ef6f894b1 100644 (file)
--- a/src/extension/internal/filter/experimental.h
+++ b/src/extension/internal/filter/experimental.h
@@ -7,6 +7,12 @@
  *   Ivan Louette (filters)
  *   Nicolas Dufour (UI) <nicoduf@yahoo.fr>
  *
+ * Experimental filters (no assigned menu)
+ *   Chromolitho
+ *   Drawing
+ *   Posterize
+ *   Test filter (should no be used...)
+ *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 /* ^^^ Change the copyright to be you and your e-mail address ^^^ */
@@ -22,6 +28,182 @@ namespace Extension {
 namespace Internal {
 namespace Filter {
 
+/**
+    \brief    Custom predefined Chromolitho filter.
+    
+    Chromo effect with customizable edge drawing and graininess
+
+    Filter's parameters:
+    * Drawing (boolean, default checked) -> Checked = blend1 (in="convolve1"), unchecked = blend1 (in="composite1")
+    * Transparent (boolean, default unchecked) -> Checked = colormatrix5 (in="colormatrix4"), Unchecked = colormatrix5 (in="component1")
+    * Invert (boolean, default false) -> component1 (tableValues) [adds a trailing 0]
+    * Dented (boolean, default false) -> component1 (tableValues) [adds intermediate 0s]
+    * Expand white (0->5, default 1) -> component1 (tableValues) [0="0 1", 5="0 1 1 1 1 1 1"]
+    * Lightness (0->10, default 0) -> composite1 (k1)
+    * Saturation (0.->1., default 1.) -> colormatrix3 (values)
+    * Noise reduction (1->1000, default 20) -> convolve (kernelMatrix, central value -1001->-2000, default -1020)
+    * Drawing blend (enum, default Normal) -> blend1 (mode)
+    * Smoothness (0.01->10, default 1) -> blur1 (stdDeviation)
+    * Grain (boolean, default unchecked) -> Checked = blend2 (in="colormatrix2"), Unchecked = blend2 (in="blur1")
+        * Grain x frequency (0.->100, default 100) -> turbulence1 (baseFrequency, first value)
+        * Grain y frequency (0.->100, default 100) -> turbulence1 (baseFrequency, second value)
+        * Grain complexity (1->5, default 1) -> turbulence1 (numOctaves)
+        * Grain variation (0->1000, default 0) -> turbulence1 (seed)
+        * Grain expansion (1.->50., default 1.) -> colormatrix1 (n-1 value)
+        * Grain erosion (0.->40., default 0.) -> colormatrix1 (nth value) [inverted]
+        * Grain color (boolean, default true) -> colormatrix2 (values)
+        * Grain blend (enum, default Normal) -> blend2 (mode)
+*/
+class Chromolitho : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+       virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+       Chromolitho ( ) : Filter() { };
+       virtual ~Chromolitho ( ) { 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_("Chromolitho, custom -EXP-") "</name>\n"
+                               "<id>org.inkscape.effect.filter.Chromolitho</id>\n"
+                   "<param name=\"tab\" type=\"notebook\">\n"
+                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
+                        "<param name=\"drawing\" gui-text=\"" N_("Drawing mode") "\" type=\"boolean\" >true</param>\n"
+                        "<param name=\"dblend\" gui-text=\"" N_("Drawing blend:") "\" type=\"enum\">\n"
+                            "<_item value=\"normal\">Normal</_item>\n"
+                            "<_item value=\"multiply\">Multiply</_item>\n"
+                            "<_item value=\"screen\">Screen</_item>\n"
+                            "<_item value=\"lighten\">Lighten</_item>\n"
+                            "<_item value=\"darken\">Darken</_item>\n"
+                        "</param>\n"
+                        "<param name=\"transparent\" gui-text=\"" N_("Transparent") "\" type=\"boolean\" >false</param>\n"
+                        "<param name=\"dented\" gui-text=\"" N_("Dented") "\" type=\"boolean\" >false</param>\n"
+                        "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
+                        "<param name=\"light\" gui-text=\"" N_("Lightness:") "\" type=\"int\" min=\"0\" max=\"10\">0</param>\n"
+                        "<param name=\"saturation\" gui-text=\"" N_("Saturation:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
+                        "<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" min=\"1\" max=\"1000\">20</param>\n"
+                        "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" min=\"0.01\" max=\"10\">1</param>\n"
+                    "</page>\n"
+                    "<page name=\"graintab\" _gui-text=\"Grain\">\n"
+                        "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
+                        "<param name=\"grainxf\" gui-text=\"" N_("X frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
+                        "<param name=\"grainyf\" gui-text=\"" N_("Y frequency:") "\" type=\"float\" min=\"0\" max=\"100\">100</param>\n"
+                        "<param name=\"grainc\" gui-text=\"" N_("Complexity:") "\" type=\"int\" min=\"1\" max=\"5\">1</param>\n"
+                        "<param name=\"grainv\" gui-text=\"" N_("Variation:") "\" type=\"int\" min=\"0\" max=\"1000\">0</param>\n"
+                        "<param name=\"grainexp\" gui-text=\"" N_("Expansion:") "\" type=\"float\" min=\"1\" max=\"50\">1</param>\n"
+                        "<param name=\"grainero\" gui-text=\"" N_("Erosion:") "\" type=\"float\" min=\"0\" max=\"40\">0</param>\n"
+                        "<param name=\"graincol\" gui-text=\"" N_("Color") "\" type=\"boolean\" >true</param>\n"
+                        "<param name=\"gblend\" gui-text=\"" N_("Grain blend:") "\" type=\"enum\">\n"
+                            "<_item value=\"normal\">Normal</_item>\n"
+                            "<_item value=\"multiply\">Multiply</_item>\n"
+                            "<_item value=\"screen\">Screen</_item>\n"
+                            "<_item value=\"lighten\">Lighten</_item>\n"
+                            "<_item value=\"darken\">Darken</_item>\n"
+                        "</param>\n"
+                    "</page>\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_("Chromo effect with customizable edge drawing and graininess") "</menu-tip>\n"
+                               "</effect>\n"
+                       "</inkscape-extension>\n", new Chromolitho());
+       };
+};
+
+gchar const *
+Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+       if (_filter != NULL) g_free((void *)_filter);
+    
+    std::ostringstream b1in;
+    std::ostringstream b2in;
+    std::ostringstream col3in;
+    std::ostringstream transf;
+    std::ostringstream light;
+    std::ostringstream saturation;
+    std::ostringstream noise;
+    std::ostringstream dblend;
+    std::ostringstream smooth;
+    std::ostringstream grain;
+    std::ostringstream grainxf;
+    std::ostringstream grainyf;
+    std::ostringstream grainc;
+    std::ostringstream grainv;
+    std::ostringstream gblend;
+    std::ostringstream grainexp;
+    std::ostringstream grainero;
+    std::ostringstream graincol;
+
+    if (ext->get_param_bool("drawing"))
+        b1in << "convolve1";
+    else
+        b1in << "composite1";
+
+    if (ext->get_param_bool("transparent"))
+        col3in << "colormatrix4";
+    else
+        col3in << "component1";
+    light << ext->get_param_int("light");
+    saturation << ext->get_param_float("saturation");
+    noise << (-1000 - ext->get_param_int("noise"));
+    dblend << ext->get_param_enum("dblend");
+    smooth << ext->get_param_float("smooth");
+
+    if (ext->get_param_bool("dented")) {
+        transf << "0 1 0 1";
+    } else {
+        transf << "0 1 1";
+    }
+    if (ext->get_param_bool("inverted"))
+        transf << " 0";
+
+    if (ext->get_param_bool("grain"))
+        b2in << "colormatrix2";
+    else
+        b2in << "blur1";
+    grainxf << (ext->get_param_float("grainxf") / 100);
+    grainyf << (ext->get_param_float("grainyf") / 100);
+    grainc << ext->get_param_int("grainc");
+    grainv << ext->get_param_int("grainv");
+    gblend << ext->get_param_enum("gblend");
+    grainexp << ext->get_param_float("grainexp");
+    grainero << (-ext->get_param_float("grainero"));
+    if (ext->get_param_bool("graincol"))
+        graincol << "1";
+    else
+        graincol << "0";
+
+       _filter = g_strdup_printf(
+               "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Chromolitho, custom -EXP-\">\n"
+
+        "<feComposite stdDeviation=\"1\" in=\"SourceGraphic\" in2=\"SourceGraphic\" operator=\"arithmetic\" k1=\"%s\" k2=\"1\" result=\"composite1\" />\n"
+        "<feConvolveMatrix in=\"composite1\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0 \" order=\"3 3\" stdDeviation=\"1\" result=\"convolve1\" />\n"
+        "<feBlend in=\"%s\" in2=\"composite1\" mode=\"%s\" blend=\"normal\" stdDeviation=\"1\" result=\"blend1\" />\n"
+        "<feGaussianBlur in=\"blend1\" stdDeviation=\"%s\" result=\"blur1\" />\n"
+        "<feTurbulence baseFrequency=\"%s %s\" numOctaves=\"%s\" seed=\"%s\" type=\"fractalNoise\" result=\"turbulence1\" />\n"
+        "<feColorMatrix values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 %s %s \" result=\"colormatrix1\" />\n"
+        "<feColorMatrix type=\"saturate\" stdDeviation=\"3\" values=\"%s\" result=\"colormatrix2\" />\n"
+        "<feBlend in=\"%s\" in2=\"blur1\" stdDeviation=\"1\" blend=\"normal\" mode=\"%s\" result=\"blend2\" />\n"
+        "<feColorMatrix in=\"blend2\" type=\"saturate\" values=\"%s\" result=\"colormatrix3\" />\n"
+        "<feComponentTransfer in=\"colormatrix3\" stdDeviation=\"2\" result=\"component1\">\n"
+            "<feFuncR type=\"discrete\" tableValues=\"%s\" />\n"
+            "<feFuncG type=\"discrete\" tableValues=\"%s\" />\n"
+            "<feFuncB type=\"discrete\" tableValues=\"%s\" />\n"
+        "</feComponentTransfer>\n"
+        "<feColorMatrix 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=\"colormatrix4\" />\n"
+        "<feColorMatrix in=\"%s\" values=\"1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 15 0 \" result=\"colormatrix5\" />\n"
+        "<feComposite in2=\"SourceGraphic\" operator=\"in\" result=\"composite2\" />\n"
+        "</filter>\n", light.str().c_str(), noise.str().c_str(), b1in.str().c_str(), dblend.str().c_str(), smooth.str().c_str(), grainxf.str().c_str(), grainyf.str().c_str(), grainc.str().c_str(), grainv.str().c_str(), grainexp.str().c_str(), grainero.str().c_str(), graincol.str().c_str(), b2in.str().c_str(), gblend.str().c_str(), saturation.str().c_str(), transf.str().c_str(), transf.str().c_str(), transf.str().c_str(), col3in.str().c_str());
+
+       return _filter;
+}; /* Chromolitho filter */
+
 /**
     \brief    Custom predefined Drawing filter.
     
@@ -33,7 +215,7 @@ namespace Filter {
     * Smoothness (0.01->10, default 0.7) -> blur2 (stdDeviation)
     * Dilatation (3->100, default 6) -> colormatrix3 (n-1th value)
 
-    * Blur (0.01->10., default 5.) -> blur3 (stdDeviation)
+    * Blur (0.01->10., default 1.) -> blur3 (stdDeviation)
     * Blur spread (3->20, default 6) -> colormatrix5 (n-1th value)
     * Blur erosion (-2->0, default -2) -> colormatrix5 (nth value)
 
@@ -58,21 +240,28 @@ public:
                        "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
                                "<name>" N_("Drawing, custom -EXP-") "</name>\n"
                                "<id>org.inkscape.effect.filter.Drawing</id>\n"
+                   "<param name=\"tab\" type=\"notebook\">\n"
+                    "<page name=\"optionstab\" _gui-text=\"Options\">\n"
                         "<param name=\"simply\" gui-text=\"" N_("Simplification:") "\" type=\"float\" min=\"0.01\" max=\"10\">0.7</param>\n"
                         "<param name=\"light\" gui-text=\"" N_("Lightness:") "\" type=\"int\" min=\"0\" max=\"50\">5</param>\n"
                         "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" min=\"0.01\" max=\"10\">0.7</param>\n"
                         "<param name=\"dilat\" gui-text=\"" N_("Dilatation:") "\" type=\"int\" min=\"3\" max=\"100\">6</param>\n"
-                        "<param name=\"blur\" gui-text=\"" N_("Blur:") "\" type=\"float\" min=\"0.01\" max=\"10\">5</param>\n"
-                        "<param name=\"spread\" gui-text=\"" N_("Spread:") "\" type=\"int\" min=\"3\" max=\"20\">6</param>\n"
-                        "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"int\" min=\"-2\" max=\"0\">-2</param>\n"
-                        "<_param name=\"fillcolorheader\" type=\"groupheader\">Fill color</_param>\n"
-                                           "<param name=\"fcolor\" gui-text=\"" N_("Fill color") "\" type=\"color\">-3473153</param>\n"
-                            "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
-                            "<param name=\"iofo\" gui-text=\"" N_("Image on fill opacity:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
-                        "<_param name=\"strokecolorheader\" type=\"groupheader\">Stroke color</_param>\n"
-                                           "<param name=\"scolor\" gui-text=\"" N_("Stroke color") "\" type=\"color\">-855637761</param>\n"
-                            "<param name=\"ios\" gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
-                            "<param name=\"ioso\" gui-text=\"" N_("Image on stroke opacity:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
+                        "<_param name=\"blurheader\" type=\"groupheader\">Blur</_param>\n"
+                            "<param name=\"blur\" gui-text=\"" N_("Level:") "\" type=\"float\" min=\"0.01\" max=\"10\">1</param>\n"
+                            "<param name=\"spread\" gui-text=\"" N_("Spread:") "\" type=\"int\" min=\"3\" max=\"20\">6</param>\n"
+                            "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"int\" min=\"-2\" max=\"0\">-2</param>\n"
+                    "</page>\n"
+                    "<page name=\"co11tab\" _gui-text=\"Fill color\">\n"
+                                   "<param name=\"fcolor\" gui-text=\"" N_("Fill color") "\" type=\"color\">-3473153</param>\n"
+                        "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
+                        "<param name=\"iofo\" gui-text=\"" N_("Image on fill opacity:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
+                    "</page>\n"
+                    "<page name=\"co12tab\" _gui-text=\"Stroke color\">\n"
+                                   "<param name=\"scolor\" gui-text=\"" N_("Stroke color") "\" type=\"color\">-855637761</param>\n"
+                        "<param name=\"ios\" gui-text=\"" N_("Image on stroke") "\" type=\"boolean\" >false</param>\n"
+                        "<param name=\"ioso\" gui-text=\"" N_("Image on stroke opacity:") "\" type=\"float\" min=\"0\" max=\"1\">1</param>\n"
+                    "</page>\n"
+                "</param>\n"
                                "<effect>\n"
                                        "<object-type>all</object-type>\n"
                                        "<effects-menu>\n"
@@ -84,7 +273,6 @@ public:
                                "</effect>\n"
                        "</inkscape-extension>\n", new Drawing());
        };
-
 };
 
 gchar const *
@@ -144,7 +332,7 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
     ioso << ext->get_param_float("ioso");
 
        _filter = g_strdup_printf(
-               "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Cross-smooth, custom -EXP-\">\n"
+               "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Drawing, custom -EXP-\">\n"
         "<feGaussianBlur in=\"SourceGraphic\" stdDeviation=\"%s\" result=\"blur1\" />\n"
         "<feConvolveMatrix in=\"blur1\" order=\"3 3\" kernelMatrix=\"0 250 0 250 %s 250 0 250 0 \" divisor=\"1\" targetX=\"1\" targetY=\"1\" preserveAlpha=\"true\" bias=\"0\" stdDeviation=\"1\" result=\"convolve\" />\n"
         "<feColorMatrix values=\"0 -100 0 0 1 0 -100 0 0 1 0 -100 0 0 1 0 0 0 1 0 \" result=\"colormatrix1\" />\n"
@@ -178,8 +366,8 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext)
     
     Poster and painting effects.
 
-    Filter's parameters:
-    * Type (enum, default "Normal") ->
+    Filter's parameters (not finished yet):
+    * Effect type (enum, default "Normal") ->
         Normal = feComponentTransfer
         Dented = Normal + intermediate values
     * Blur (0.01->10., default 5.) -> blur3 (stdDeviation)
@@ -228,7 +416,6 @@ public:
                                "</effect>\n"
                        "</inkscape-extension>\n", new Posterize());
        };
-
 };
 
 gchar const *
@@ -252,7 +439,6 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
     presat << ext->get_param_float("presaturation");
     postsat << ext->get_param_float("postsaturation");
 
-
     // TransfertComponent table values are calculated based on the poster type.
     transf << "0";
     int levels = ext->get_param_int("levels") + 1;
@@ -271,7 +457,6 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext)
         antialias << "0.5";
     else
         antialias << "0.01";
-
     
        _filter = g_strdup_printf(
                "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" height=\"1\" width=\"1\" y=\"0\" x=\"0\" inkscape:label=\"Poster and painting, custom -EXP-\">\n"
@@ -319,7 +504,6 @@ public:
                                "</effect>\n"
                        "</inkscape-extension>\n", new TestFilter());
        };
-
 };
 
 gchar const *
@@ -345,7 +529,8 @@ TestFilter::get_filter_text (Inkscape::Extension::Extension * ext)
         "</filter>\n");
 
        return _filter;
-};
+}; /* Test filter */
+
 }; /* namespace Filter */
 }; /* namespace Internal */
 }; /* namespace Extension */

diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp
index d04e423ff0edd59eedc81f37ed08debb091bec0b..06b942a1fff70d574ff86c7d76a0c1b4da6423d0 100644 (file)
--- a/src/extension/internal/filter/filter-all.cpp
+++ b/src/extension/internal/filter/filter-all.cpp
@@ -45,6 +45,7 @@ Filter::filters_all (void )
     ColorizableDropShadow::init();
 
     // TDB
+    Chromolitho::init();
     Drawing::init();
     Posterize::init();
 

diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index e0f544c76e061f2827f6408ec3114862053e3406..93d44d6fa685f25ab32f329ec5925607093117e4 100644 (file)
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -7,6 +7,9 @@
  *   Ivan Louette (filters)
  *   Nicolas Dufour (UI) <nicoduf@yahoo.fr>
  *
+ * Morphology filters
+ *   Cross-smooth
+ *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 /* ^^^ Change the copyright to be you and your e-mail address ^^^ */
@@ -23,7 +26,7 @@ namespace Internal {
 namespace Filter {
 
 /**
-    \brief    Custom predefined Crosssmooth filter.
+    \brief    Custom predefined Cross-smooth filter.
     
     Smooth the outside of shapes and pictures.
 
@@ -84,7 +87,7 @@ Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext)
     }
 
        _filter = g_strdup_printf(
-               "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" y=\"0\" x=\"0\" inkscape:label=\"Cross-smooth, custom -EXP-\">\n"
+               "<filter xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\" color-interpolation-filters=\"sRGB\" inkscape:label=\"Cross-smooth, custom -EXP-\">\n"
         "<feGaussianBlur stdDeviation=\"%s\" result=\"blur\" />\n"
         "<feComposite in=\"%s\" in2=\"blur\" operator=\"atop\" result=\"composite1\" />\n"
         "<feComposite in2=\"composite1\" operator=\"in\" result=\"composite2\" />\n"