use scientific terms and added an approximation formula for tritanopia.

2002-12-16  Sven Neumann  <sven@gimp.org>

	* modules/cdisplay_colorblind.c: use scientific terms and added an
	approximation formula for tritanopia.

2002-12-16  Sven Neumann  <sven@gimp.org>

	* POTFILES.in: added modules/cdisplay_colorblind.c.
	* de.po: updated german translation.
This commit is contained in:
Sven Neumann 2002-12-16 16:41:29 +00:00 committed by Sven Neumann
parent 4e1051d6d1
commit 8f003f40ca
5 changed files with 93 additions and 64 deletions

View File

@ -1,3 +1,8 @@
2002-12-16 Sven Neumann <sven@gimp.org>
* modules/cdisplay_colorblind.c: use scientific terms and added an
approximation formula for tritanopia.
2002-12-16 Michael Natterer <mitch@gimp.org> 2002-12-16 Michael Natterer <mitch@gimp.org>
* modules/Makefile.am * modules/Makefile.am

View File

@ -35,12 +35,15 @@
typedef enum typedef enum
{ {
COLORBLIND_DEFICIENCY_FOO, COLORBLIND_DEFICIENCY_NONE,
COLORBLIND_DEFICIENCY_BAR COLORBLIND_DEFICIENCY_PROTONOPIA,
COLORBLIND_DEFICIENCY_DEUTERANOPIA,
COLORBLIND_DEFICIENCY_TRITANOPIA,
COLORBLIND_DEFICIENCY_LAST = COLORBLIND_DEFICIENCY_TRITANOPIA
} ColorblindDeficiency; } ColorblindDeficiency;
#define DEFAULT_DEFICIENCY COLORBLIND_DEFICIENCY_FOO #define DEFAULT_DEFICIENCY COLORBLIND_DEFICIENCY_DEUTERANOPIA
#define CDISPLAY_TYPE_COLORBLIND (cdisplay_colorblind_type) #define CDISPLAY_TYPE_COLORBLIND (cdisplay_colorblind_type)
@ -97,7 +100,7 @@ static const GimpModuleInfo cdisplay_colorblind_info =
N_("Colorblind display filter"), N_("Colorblind display filter"),
"Michael Natterer <mitch@gimp.org>", "Michael Natterer <mitch@gimp.org>",
"v0.1", "v0.1",
"(c) 2001, released under the GPL", "(c) 2002, released under the GPL",
"December 16, 2002" "December 16, 2002"
}; };
@ -216,7 +219,6 @@ cdisplay_colorblind_convert (GimpColorDisplay *display,
CdisplayColorblind *colorblind; CdisplayColorblind *colorblind;
gint i, j; gint i, j;
guchar *b; guchar *b;
guchar red, green, blue;
colorblind = CDISPLAY_COLORBLIND (display); colorblind = CDISPLAY_COLORBLIND (display);
@ -232,30 +234,25 @@ cdisplay_colorblind_convert (GimpColorDisplay *display,
switch (colorblind->deficiency) switch (colorblind->deficiency)
{ {
case COLORBLIND_DEFICIENCY_FOO: case COLORBLIND_DEFICIENCY_PROTONOPIA:
case COLORBLIND_DEFICIENCY_DEUTERANOPIA:
/* FIXME: need proper formulas */
while (i--) while (i--)
{ {
red = b[0] >> 1; guchar red = b[0] >> 1;
green = b[1] >> 1; guchar green = b[1] >> 1;
b[0] = red + green; b[0] = b[1] = red + green;
b[1] = red + green;
/* b[2] = b[2]; */
b += bpp; b += bpp;
} }
break; break;
case COLORBLIND_DEFICIENCY_BAR: case COLORBLIND_DEFICIENCY_TRITANOPIA:
/* FIXME: need proper formula */
while (i--) while (i--)
{ {
red = b[0]; b[2] = 0;
green = b[1];
blue = b[2];
b[0] = green;
b[1] = blue;
b[2] = red;
b += bpp; b += bpp;
} }
@ -286,8 +283,8 @@ cdisplay_colorblind_load_state (GimpColorDisplay *display,
if (sscanf (str, "%d", &deficiency) == 1) if (sscanf (str, "%d", &deficiency) == 1)
{ {
if (deficiency >= COLORBLIND_DEFICIENCY_FOO && if (deficiency > COLORBLIND_DEFICIENCY_NONE &&
deficiency <= COLORBLIND_DEFICIENCY_BAR) deficiency <= COLORBLIND_DEFICIENCY_LAST)
{ {
colorblind->deficiency = deficiency; colorblind->deficiency = deficiency;
@ -336,12 +333,16 @@ cdisplay_colorblind_configure (GimpColorDisplay *display)
colorblind, colorblind,
GINT_TO_POINTER (colorblind->deficiency), GINT_TO_POINTER (colorblind->deficiency),
"FIXME: formula from bug #101256", _("Protonopia (insensitivity to red)"),
GINT_TO_POINTER (COLORBLIND_DEFICIENCY_FOO), GINT_TO_POINTER (COLORBLIND_DEFICIENCY_PROTONOPIA),
NULL, NULL,
"FIXME: random test formula", _("Deuteranopia (insensitivity to green)"),
GINT_TO_POINTER (COLORBLIND_DEFICIENCY_BAR), GINT_TO_POINTER (COLORBLIND_DEFICIENCY_DEUTERANOPIA),
NULL,
_("Tritanopia (insensitivity to blue)"),
GINT_TO_POINTER (COLORBLIND_DEFICIENCY_TRITANOPIA),
NULL, NULL,
NULL); NULL);

View File

@ -1,3 +1,8 @@
2002-12-16 Sven Neumann <sven@gimp.org>
* POTFILES.in: added modules/cdisplay_colorblind.c.
* de.po: updated german translation.
2002-12-15 Ole Laursen <olau@hardworking.dk> 2002-12-15 Ole Laursen <olau@hardworking.dk>
* da.po: Updated Danish translation. * da.po: Updated Danish translation.

View File

@ -15,6 +15,7 @@ libgimpwidgets/gimpstock.c
libgimpwidgets/gimpunitmenu.c libgimpwidgets/gimpunitmenu.c
libgimpwidgets/gimpwidgets.c libgimpwidgets/gimpwidgets.c
modules/cdisplay_colorblind.c
modules/cdisplay_gamma.c modules/cdisplay_gamma.c
modules/cdisplay_highcontrast.c modules/cdisplay_highcontrast.c
modules/colorsel_triangle.c modules/colorsel_triangle.c

View File

@ -7,8 +7,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GIMP 1.3.10\n" "Project-Id-Version: GIMP 1.3.10\n"
"POT-Creation-Date: 2002-11-06 22:59+0100\n" "POT-Creation-Date: 2002-12-16 17:35+0100\n"
"PO-Revision-Date: 2002-11-05 19:11+0100\n" "PO-Revision-Date: 2002-12-16 17:41+0100\n"
"Last-Translator: Christian Neumair <christian-neumair@web.de>\n" "Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n" "Language-Team: German <gnome-de@gnome.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -215,67 +215,67 @@ msgstr "/Schwarz"
msgid "/White" msgid "/White"
msgstr "/Weiss" msgstr "/Weiss"
#: libgimpwidgets/gimpcolorscales.c:162 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:163 libgimpwidgets/gimpcolorselect.c:353
msgid "_H" msgid "_H"
msgstr "_H" msgstr "_H"
#: libgimpwidgets/gimpcolorscales.c:163 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:164 libgimpwidgets/gimpcolorselect.c:353
msgid "_S" msgid "_S"
msgstr "_S" msgstr "_S"
#: libgimpwidgets/gimpcolorscales.c:164 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:165 libgimpwidgets/gimpcolorselect.c:353
msgid "_V" msgid "_V"
msgstr "_V" msgstr "_V"
#: libgimpwidgets/gimpcolorscales.c:165 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:166 libgimpwidgets/gimpcolorselect.c:353
msgid "_R" msgid "_R"
msgstr "_R" msgstr "_R"
#: libgimpwidgets/gimpcolorscales.c:166 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:167 libgimpwidgets/gimpcolorselect.c:353
msgid "_G" msgid "_G"
msgstr "_G" msgstr "_G"
#: libgimpwidgets/gimpcolorscales.c:167 libgimpwidgets/gimpcolorselect.c:353 #: libgimpwidgets/gimpcolorscales.c:168 libgimpwidgets/gimpcolorselect.c:353
msgid "_B" msgid "_B"
msgstr "_B" msgstr "_B"
#: libgimpwidgets/gimpcolorscales.c:168 #: libgimpwidgets/gimpcolorscales.c:169
msgid "_A" msgid "_A"
msgstr "_A" msgstr "_A"
#: libgimpwidgets/gimpcolorscales.c:172 libgimpwidgets/gimpcolorselect.c:357 #: libgimpwidgets/gimpcolorscales.c:173 libgimpwidgets/gimpcolorselect.c:357
msgid "Hue" msgid "Hue"
msgstr "Farbton" msgstr "Farbton"
#: libgimpwidgets/gimpcolorscales.c:173 libgimpwidgets/gimpcolorselect.c:358 #: libgimpwidgets/gimpcolorscales.c:174 libgimpwidgets/gimpcolorselect.c:358
msgid "Saturation" msgid "Saturation"
msgstr "Sättigung" msgstr "Sättigung"
#: libgimpwidgets/gimpcolorscales.c:174 libgimpwidgets/gimpcolorselect.c:359 #: libgimpwidgets/gimpcolorscales.c:175 libgimpwidgets/gimpcolorselect.c:359
msgid "Value" msgid "Value"
msgstr "Wert" msgstr "Wert"
#: libgimpwidgets/gimpcolorscales.c:175 libgimpwidgets/gimpcolorselect.c:360 #: libgimpwidgets/gimpcolorscales.c:176 libgimpwidgets/gimpcolorselect.c:360
msgid "Red" msgid "Red"
msgstr "Rot" msgstr "Rot"
#: libgimpwidgets/gimpcolorscales.c:176 libgimpwidgets/gimpcolorselect.c:361 #: libgimpwidgets/gimpcolorscales.c:177 libgimpwidgets/gimpcolorselect.c:361
msgid "Green" msgid "Green"
msgstr "Grün" msgstr "Grün"
#: libgimpwidgets/gimpcolorscales.c:177 libgimpwidgets/gimpcolorselect.c:362 #: libgimpwidgets/gimpcolorscales.c:178 libgimpwidgets/gimpcolorselect.c:362
msgid "Blue" msgid "Blue"
msgstr "Blau" msgstr "Blau"
#: libgimpwidgets/gimpcolorscales.c:178 libgimpwidgets/gimpcolorselect.c:363 #: libgimpwidgets/gimpcolorscales.c:179 libgimpwidgets/gimpcolorselect.c:363
msgid "Alpha" msgid "Alpha"
msgstr "Deckkraft" msgstr "Deckkraft"
#: libgimpwidgets/gimpcolorscales.c:252 #: libgimpwidgets/gimpcolorscales.c:253
msgid "Hexadecimal color notation as used in HTML" msgid "Hexadecimal color notation as used in HTML"
msgstr "Hexadezimale Schreibweise wie in HTML" msgstr "Hexadezimale Schreibweise wie in HTML"
#: libgimpwidgets/gimpcolorscales.c:266 #: libgimpwidgets/gimpcolorscales.c:267
msgid "He_x Triplet:" msgid "He_x Triplet:"
msgstr "He_xadezimal:" msgstr "He_xadezimal:"
@ -375,43 +375,60 @@ msgstr "Einheit"
msgid "Factor" msgid "Factor"
msgstr "Faktor" msgstr "Faktor"
#: libgimpwidgets/gimpwidgets.c:976 #: libgimpwidgets/gimpwidgets.c:960
msgid "" msgid ""
"If the \"Time\" button is not pressed, use this value for random number " "Use this value for random number generator seed - this allows you to repeat "
"generator seed - this allows you to repeat a given \"random\" operation" "a given \"random\" operation"
msgstr "" msgstr "Benutze diesen Wert für den Zufallsgenerator - dies ermgöglicht es \"zufällige\" Funktionen zu wiederholen"
"Wenn der \"Zeit\"-Knopf nicht aktiviert ist, nimm diesen Wert für den "
"Zufallsgenerator - dies ermgöglicht es \"zufällige\" Funktionen zu "
"wiederholen"
#: libgimpwidgets/gimpwidgets.c:981 #: libgimpwidgets/gimpwidgets.c:964
msgid "_Time" msgid "_Randomize"
msgstr "_Zeit" msgstr "_Würfeln"
#: libgimpwidgets/gimpwidgets.c:990 #: libgimpwidgets/gimpwidgets.c:975
msgid "" msgid "Seed random number generator with a generated random number"
"Seed random number generator from the current time - this guarantees a " msgstr "Initialisiere den Zufallsgenerator mit einer Zufallszahl"
"reasonable randomization"
msgstr ""
"Speise Zufallsgenerator mit der aktuellen Zeit - dies garantiert eine "
"vernünftige Wahrscheinlichkeit"
#: libgimpwidgets/gimpwidgets.c:1316 #: libgimpwidgets/gimpwidgets.c:1289
msgid "Bytes" msgid "Bytes"
msgstr "Byte" msgstr "Byte"
#: libgimpwidgets/gimpwidgets.c:1317 #: libgimpwidgets/gimpwidgets.c:1290
msgid "KiloBytes" msgid "KiloBytes"
msgstr "KiloByte" msgstr "KiloByte"
#: libgimpwidgets/gimpwidgets.c:1318 #: libgimpwidgets/gimpwidgets.c:1291
msgid "MegaBytes" msgid "MegaBytes"
msgstr "MegaByte" msgstr "MegaByte"
#: libgimpwidgets/gimpwidgets.c:1319 #: libgimpwidgets/gimpwidgets.c:1292
msgid "GigaBytes" msgid "GigaBytes"
msgstr "GigaByte" msgstr "GigaByte"
#: modules/cdisplay_colorblind.c:100
msgid "Colorblind display filter"
msgstr "Farbenblindheit Anzeigenfarbfilter"
#: modules/cdisplay_colorblind.c:166
msgid "Colorblind"
msgstr "Farbenblindheit"
#: modules/cdisplay_colorblind.c:326
msgid "Color Deficiency Type:"
msgstr "Art der Sehschwäche:"
#: modules/cdisplay_colorblind.c:336
msgid "Protonopia (insensitivity to red)"
msgstr "Protonopia (Rotschwäche)"
#: modules/cdisplay_colorblind.c:340
msgid "Deuteranopia (insensitivity to green)"
msgstr "Deuteranopia (Grünschwäche)"
#: modules/cdisplay_colorblind.c:344
msgid "Tritanopia (insensitivity to blue)"
msgstr "Tritanopia (Blauschwäche)"
#: modules/cdisplay_gamma.c:89 #: modules/cdisplay_gamma.c:89
msgid "Gamma color display filter" msgid "Gamma color display filter"
msgstr "Gamma Anzeigenfarbfilter" msgstr "Gamma Anzeigenfarbfilter"