From: JazzyNico <nicoduf@yahoo.fr>
Date: Tue, 16 Nov 2010 15:25:15 +0000 (+0100)
Subject: Filters. Experimental duochrome version 2 (new structure, presence parameters and... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a5f2544e0e5d6e4355b5c24391d2a71cf441dac5;p=inkscape.git

Filters. Experimental duochrome version 2 (new structure, presence parameters and fluorescence level). All EXP filters moved to the experimental group.
---

diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h
index 82a37a6aa..17815f006 100644
--- a/src/extension/internal/filter/color.h
+++ b/src/extension/internal/filter/color.h
@@ -52,7 +52,7 @@ public:
 					"<object-type>all</object-type>\n"
 					"<effects-menu>\n"
 						"<submenu name=\"" N_("Filters") "\">\n"
-   						"<submenu name=\"" N_("Color") "\"/>\n"
+   						"<submenu name=\"" N_("Experimental") "\"/>\n"
 			      "</submenu>\n"
 					"</effects-menu>\n"
 					"<menu-tip>" N_("Change colors to a two colors palette") "</menu-tip>\n"
@@ -118,6 +118,105 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext)
 
 	return _filter;
 };
+
+
+class Duochrome2 : public Inkscape::Extension::Internal::Filter::Filter {
+protected:
+	virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext);
+
+public:
+	Duochrome2 ( ) : Filter() { };
+	virtual ~Duochrome2 ( ) { 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_("Duochrome2, custom -EXP-") "</name>\n"
+				"<id>org.inkscape.effect.filter.Duochrome2</id>\n"
+                        "<param name=\"fluo\" gui-text=\"" N_("Fluorescence level:") "\" type=\"float\" min=\"0\" max=\"2\">0</param>\n"
+                        "<param name=\"pres1\" gui-text=\"" N_("Presence 1:") "\" type=\"float\" min=\"0\" max=\"2\">1</param>\n"
+                        "<param name=\"pres2\" gui-text=\"" N_("Presence 2:") "\" type=\"float\" min=\"0\" max=\"2\">1</param>\n"
+                        "<param name=\"swapcolors\" gui-text=\"" N_("Swap colors") "\" type=\"boolean\">false</param>\n"
+                        "<_param name=\"header1\" type=\"groupheader\">Color 1</_param>\n"
+				        "<param name=\"color1\" gui-text=\"" N_("Color 1") "\" type=\"color\">1364325887</param>\n"
+                        "<_param name=\"header2\" type=\"groupheader\">Color 2</_param>\n"
+				        "<param name=\"color2\" gui-text=\"" N_("Color 2") "\" type=\"color\">-65281</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_("Convert luminance values to a duochrome palette") "</menu-tip>\n"
+				"</effect>\n"
+			"</inkscape-extension>\n", new Duochrome2());
+	};
+
+};
+
+gchar const *
+Duochrome2::get_filter_text (Inkscape::Extension::Extension * ext)
+{
+	if (_filter != NULL) g_free((void *)_filter);
+
+    std::ostringstream a1;
+    std::ostringstream r1;
+    std::ostringstream g1;
+    std::ostringstream b1;
+    std::ostringstream a2;
+    std::ostringstream r2;
+    std::ostringstream g2;
+    std::ostringstream b2;
+    std::ostringstream fluo;
+    std::ostringstream pres1;
+    std::ostringstream pres2;
+    std::ostringstream swap1;
+    std::ostringstream swap2;
+
+    guint32 color1 = ext->get_param_color("color1");
+    guint32 color2 = ext->get_param_color("color2");
+    float fluorescence = ext->get_param_float("fluo");
+    float presence1 = ext->get_param_float("pres1");
+    float presence2 = ext->get_param_float("pres2");
+    bool swapcolors = ext->get_param_bool("swapcolors");
+
+    a1 << (color1 & 0xff) / 255.0F;
+    r1 << ((color1 >> 24) & 0xff);
+    g1 << ((color1 >> 16) & 0xff);
+    b1 << ((color1 >>  8) & 0xff);
+    a2 << (color2 & 0xff) / 255.0F;
+    r2 << ((color2 >> 24) & 0xff);
+    g2 << ((color2 >> 16) & 0xff);
+    b2 << ((color2 >>  8) & 0xff);
+    fluo << fluorescence;
+    pres1 << presence1;
+    pres2 << presence2;
+
+    if (swapcolors) {
+        swap1 << "in";
+        swap2 << "out";
+    } else {
+        swap2 << "in";
+        swap1 << "out";
+    }
+
+	_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=\"Duochrome2, custom -EXP-\">\n"
+            "<feColorMatrix type=\"luminanceToAlpha\" result=\"colormatrix1\" />\n"
+            "<feFlood flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood1\" />\n"
+            "<feComposite in2=\"colormatrix1\" operator=\"%s\" result=\"composite1\" />\n"
+            "<feFlood in=\"colormatrix1\" flood-opacity=\"%s\" flood-color=\"rgb(%s,%s,%s)\" result=\"flood2\" />\n"
+            "<feComposite in2=\"colormatrix1\" result=\"composite2\" operator=\"%s\" />\n"
+            "<feComposite in=\"composite2\" in2=\"composite1\" k2=\"%s\"  k3=\"%s\" operator=\"arithmetic\" result=\"composite3\" />\n"
+            "<feColorMatrix in=\"composite3\" type=\"matrix\" values=\"2 -1 0 0 0 0 2 -1 0 0 -1 0 2 0 0 0 0 0 1 0 \" result=\"colormatrix2\" />\n"
+            "<feComposite in=\"colormatrix2\" in2=\"composite3\" operator=\"arithmetic\" k2=\"%s\" result=\"composite4\" />\n"
+            "<feBlend in=\"composite4\" in2=\"composite3\" blend=\"normal\" mode=\"normal\" result=\"blend\" />\n"
+            "<feComposite in2=\"SourceGraphic\" operator=\"in\" />\n"
+        "</filter>\n", a1.str().c_str(), r1.str().c_str(), g1.str().c_str(), b1.str().c_str(), swap1.str().c_str(), a2.str().c_str(), r2.str().c_str(), g2.str().c_str(), b2.str().c_str(), swap2.str().c_str(), pres2.str().c_str(), pres1.str().c_str(), fluo.str().c_str());
+
+	return _filter;
+};
 }; /* namespace Filter */
 }; /* namespace Internal */
 }; /* namespace Extension */
diff --git a/src/extension/internal/filter/drop-shadow.h b/src/extension/internal/filter/drop-shadow.h
index d8c79e3cc..0cd2a8eeb 100644
--- a/src/extension/internal/filter/drop-shadow.h
+++ b/src/extension/internal/filter/drop-shadow.h
@@ -162,7 +162,7 @@ public:
 					"<object-type>all</object-type>\n"
 					"<effects-menu>\n"
 						"<submenu name=\"" N_("Filters") "\">\n"
-   						"<submenu name=\"" N_("Shadows and Glows") "\"/>\n"
+   						"<submenu name=\"" N_("Experimental") "\"/>\n"
 			      "</submenu>\n"
 					"</effects-menu>\n"
 					"<menu-tip>" N_("Colorizable Drop shadow") "</menu-tip>\n"
diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp
index 6920e1bac..287d0a097 100644
--- a/src/extension/internal/filter/filter-all.cpp
+++ b/src/extension/internal/filter/filter-all.cpp
@@ -24,6 +24,7 @@ Filter::filters_all (void )
 {
 	// Here come the filters which are coded in C++ in order to present a parameters dialog
     Duochrome::init();
+    Duochrome2::init();
 	DropShadow::init();
 	DropGlow::init();
     ColorizableDropShadow::init();