From 790315f8390e5f1f7f4bd5e2101dcb4a6e6e697c Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 15 Sep 2022 12:28:23 +0800 Subject: [PATCH] add color --- .../lang/ansi/Ansi4BitBackgroundColor.java | 33 +++++++++++++ .../hutool/core/lang/ansi/Ansi4BitColor.java | 23 +++++++++ .../hutool/core/lang/ansi/Ansi8BitColor.java | 24 +++++++++ .../main/java/cn/hutool/core/map/MapUtil.java | 1 + .../cn/hutool/extra/qrcode/QrCodeUtil.java | 22 ++++----- .../java/cn/hutool/extra/qrcode/QrConfig.java | 4 +- .../hutool/swing/captcha/CircleCaptcha.java | 2 +- .../cn/hutool/swing/captcha/LineCaptcha.java | 2 +- .../cn/hutool/swing/captcha/ShearCaptcha.java | 2 +- .../hutool/swing/img/BackgroundRemoval.java | 1 + .../cn/hutool/swing/img/GraphicsUtil.java | 1 + .../swing/img/color/Ansi4bitMapping.java | 34 +++++++++++++ .../swing/img/color/Ansi8bitMapping.java | 49 +++++++++++++++++++ .../swing/img/color/AnsiLabMapping.java | 44 +++++++++++++++++ .../swing/img/{ => color}/ColorUtil.java | 29 ++++++++++- .../swing/img/{ => color}/LabColor.java | 2 +- .../hutool/swing/img/color/package-info.java | 7 +++ .../java/cn/hutool/swing/img/ImgUtilTest.java | 1 + 18 files changed, 263 insertions(+), 18 deletions(-) create mode 100644 hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java create mode 100644 hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java create mode 100644 hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java rename hutool-swing/src/main/java/cn/hutool/swing/img/{ => color}/ColorUtil.java (88%) rename hutool-swing/src/main/java/cn/hutool/swing/img/{ => color}/LabColor.java (98%) create mode 100644 hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java index 14d62ab1d..345f9729c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitBackgroundColor.java @@ -113,9 +113,42 @@ public enum Ansi4BitBackgroundColor implements AnsiElement { return this.code; } + /** + * 获取ANSI颜色代码 + * + * @param isBackground 是否背景色 + * @return 颜色代码 + */ + public int getCode(boolean isBackground) { + return isBackground ? this.code : this.code - 10; + } + + /** + * 获取背景色对应的前景色 + * + * @return 前景色 + */ + public Ansi4BitColor asForeground() { + return Ansi4BitColor.of(getCode(false)); + } + @Override public String toString() { return StrUtil.toString(this.code); } + /** + * 根据code查找对应的Ansi4BitBackgroundColor + * + * @param code Ansi 4bit 颜色代码 + * @return Ansi4BitBackgroundColor + */ + public static Ansi4BitBackgroundColor of(int code) { + for (Ansi4BitBackgroundColor item : Ansi4BitBackgroundColor.values()) { + if (item.getCode() == code) { + return item; + } + } + throw new IllegalArgumentException(StrUtil.format("No matched Ansi4BitBackgroundColor instance,code={}", code)); + } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java index 3d8c1c8ee..5a4f2faa6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi4BitColor.java @@ -123,9 +123,32 @@ public enum Ansi4BitColor implements AnsiElement { return isBackground ? this.code + 10 : this.code; } + /** + * 获取前景色对应的背景色 + * + * @return 背景色 + */ + public Ansi4BitBackgroundColor asBackground() { + return Ansi4BitBackgroundColor.of(getCode(true)); + } + @Override public String toString() { return StrUtil.toString(this.code); } + /** + * 根据code查找对应的Ansi4BitColor + * + * @param code Ansi 4bit 颜色代码 + * @return Ansi4BitColor + */ + public static Ansi4BitColor of(int code) { + for (Ansi4BitColor item : Ansi4BitColor.values()) { + if (item.getCode() == code) { + return item; + } + } + throw new IllegalArgumentException(StrUtil.format("No matched Ansi4BitColor instance,code={}", code)); + } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java index d9c911f62..e420b6c12 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java @@ -70,6 +70,30 @@ public class Ansi8BitColor implements AnsiElement { return this.code; } + /** + * 转换为前景色 + * + * @return 前景色 + */ + public Ansi8BitColor asForeground() { + if (PREFIX_FORE.equals(this.prefix)) { + return this; + } + return Ansi8BitColor.foreground(this.code); + } + + /** + * 转换为背景色 + * + * @return 背景色 + */ + public Ansi8BitColor asBackground() { + if (PREFIX_BACK.equals(this.prefix)) { + return this; + } + return Ansi8BitColor.background(this.code); + } + @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index ed058bf66..17cd8a148 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -1275,6 +1275,7 @@ public class MapUtil extends MapGetUtil { * @param map Map，一般用于线程安全的Map * @param key 键 * @param mappingFunction 值计算函数 + * @return 值 * @see https://bugs.openjdk.java.net/browse/JDK-8161372 */ public static V computeIfAbsent(final Map map, final K key, final Function mappingFunction) { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java index 74037829a..a470f035d 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java @@ -44,7 +44,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param imageType 图片类型（图片扩展名），见{@link ImgUtil} * @param logoBase64 logo 图片的 base64 编码 * @return 图片 Base64 编码字符串 @@ -57,7 +57,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param imageType 图片类型（图片扩展名），见{@link ImgUtil} * @param logo logo 图片的byte[] * @return 图片 Base64 编码字符串 @@ -70,7 +70,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param imageType 图片类型（图片扩展名），见{@link ImgUtil} * @param logo logo 图片的byte[] * @return 图片 Base64 编码字符串 @@ -88,7 +88,7 @@ public class QrCodeUtil { *

* * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param imageType 图片类型（图片扩展名），见{@link ImgUtil} * @return 图片 Base64 编码字符串 */ @@ -116,7 +116,7 @@ public class QrCodeUtil { * 生成PNG格式的二维码图片，以byte[]形式表示 * * @param content 内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 图片的byte[] * @since 4.1.2 */ @@ -145,7 +145,7 @@ public class QrCodeUtil { * 生成二维码到文件，二维码图片格式取决于文件的扩展名 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @param targetFile 目标文件，扩展名决定输出格式 * @return 目标文件 * @since 4.1.2 @@ -174,7 +174,7 @@ public class QrCodeUtil { * 生成二维码到输出流 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @param imageType 图片类型（图片扩展名），见{@link ImgUtil} * @param out 目标流 * @since 4.1.2 @@ -213,7 +213,7 @@ public class QrCodeUtil { * 生成二维码图片 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 二维码图片（黑白） * @since 4.1.2 */ @@ -227,7 +227,7 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式，可选二维码、条形码等 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 二维码图片（黑白） * @since 4.1.14 */ @@ -277,7 +277,7 @@ public class QrCodeUtil { * 将文本内容编码为二维码 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return {@link BitMatrix} * @since 4.1.2 */ @@ -303,7 +303,7 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式枚举 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return {@link BitMatrix} * @since 4.1.2 */ diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java index 06bf5226c..0ce5dccd8 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java @@ -25,9 +25,9 @@ public class QrConfig { private static final int BLACK = 0xFF000000; private static final int WHITE = 0xFFFFFFFF; - /** 宽 */ + /** 宽度 */ protected int width; - /** 长 */ + /** 高度 */ protected int height; /** 前景色（二维码颜色） */ protected int foreColor = BLACK; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java index 2450b4bc9..1af1e2d03 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/CircleCaptcha.java @@ -2,7 +2,7 @@ package cn.hutool.swing.captcha; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.swing.img.ColorUtil; +import cn.hutool.swing.img.color.ColorUtil; import cn.hutool.swing.img.GraphicsUtil; import java.awt.Color; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java index e9298a2f7..583be34ac 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/LineCaptcha.java @@ -2,7 +2,7 @@ package cn.hutool.swing.captcha; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.swing.img.ColorUtil; +import cn.hutool.swing.img.color.ColorUtil; import cn.hutool.swing.img.GraphicsUtil; import java.awt.Color; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java index 893902c6a..82e258f4a 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/captcha/ShearCaptcha.java @@ -2,7 +2,7 @@ package cn.hutool.swing.captcha; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.RandomUtil; -import cn.hutool.swing.img.ColorUtil; +import cn.hutool.swing.img.color.ColorUtil; import cn.hutool.swing.img.GraphicsUtil; import java.awt.Color; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java index 7b11ed332..571e9ce59 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/BackgroundRemoval.java @@ -3,6 +3,7 @@ package cn.hutool.swing.img; import cn.hutool.core.io.FileTypeUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.text.StrUtil; +import cn.hutool.swing.img.color.ColorUtil; import javax.imageio.ImageIO; import javax.swing.ImageIcon; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java index db099778e..9ba1a6c45 100755 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/GraphicsUtil.java @@ -1,6 +1,7 @@ package cn.hutool.swing.img; import cn.hutool.core.util.ObjUtil; +import cn.hutool.swing.img.color.ColorUtil; import java.awt.AlphaComposite; import java.awt.Color; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java new file mode 100644 index 000000000..cd228fafd --- /dev/null +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi4bitMapping.java @@ -0,0 +1,34 @@ +package cn.hutool.swing.img.color; + +import cn.hutool.core.lang.ansi.Ansi4BitColor; + +import java.util.LinkedHashMap; + +/** + * ANSI 4bit 颜色和Lab颜色映射关系 + * + * @author Tom Xin + */ +public class Ansi4bitMapping extends AnsiLabMapping { + public static final Ansi4bitMapping INSTANCE = new Ansi4bitMapping(); + + public Ansi4bitMapping() { + ansiLabMap = new LinkedHashMap<>(16, 1); + ansiLabMap.put(Ansi4BitColor.BLACK, new LabColor(0x000000)); + ansiLabMap.put(Ansi4BitColor.RED, new LabColor(0xAA0000)); + ansiLabMap.put(Ansi4BitColor.GREEN, new LabColor(0x00AA00)); + ansiLabMap.put(Ansi4BitColor.YELLOW, new LabColor(0xAA5500)); + ansiLabMap.put(Ansi4BitColor.BLUE, new LabColor(0x0000AA)); + ansiLabMap.put(Ansi4BitColor.MAGENTA, new LabColor(0xAA00AA)); + ansiLabMap.put(Ansi4BitColor.CYAN, new LabColor(0x00AAAA)); + ansiLabMap.put(Ansi4BitColor.WHITE, new LabColor(0xAAAAAA)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_BLACK, new LabColor(0x555555)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_RED, new LabColor(0xFF5555)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_GREEN, new LabColor(0x55FF00)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_YELLOW, new LabColor(0xFFFF55)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_BLUE, new LabColor(0x5555FF)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_MAGENTA, new LabColor(0xFF55FF)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_CYAN, new LabColor(0x55FFFF)); + ansiLabMap.put(Ansi4BitColor.BRIGHT_WHITE, new LabColor(0xFFFFFF)); + } +} diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java new file mode 100644 index 000000000..49c340cb6 --- /dev/null +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/Ansi8bitMapping.java @@ -0,0 +1,49 @@ +package cn.hutool.swing.img.color; + +import cn.hutool.core.lang.ansi.Ansi8BitColor; + +import java.util.LinkedHashMap; + +/** + * ANSI 8bit 颜色和Lab颜色映射关系 + * + * @author Tom Xin + */ +public class Ansi8bitMapping extends AnsiLabMapping { + public static final Ansi8bitMapping INSTANCE = new Ansi8bitMapping(); + + private static final int[] ANSI_8BIT_COLOR_CODE_LOOKUP = new int[] { 0x000000, 0x800000, 0x008000, 0x808000, + 0x000080, 0x800080, 0x008080, 0xc0c0c0, 0x808080, 0xff0000, 0x00ff00, 0xffff00, 0x0000ff, 0xff00ff, + 0x00ffff, 0xffffff, 0x000000, 0x00005f, 0x000087, 0x0000af, 0x0000d7, 0x0000ff, 0x005f00, 0x005f5f, + 0x005f87, 0x005faf, 0x005fd7, 0x005fff, 0x008700, 0x00875f, 0x008787, 0x0087af, 0x0087d7, 0x0087ff, + 0x00af00, 0x00af5f, 0x00af87, 0x00afaf, 0x00afd7, 0x00afff, 0x00d700, 0x00d75f, 0x00d787, 0x00d7af, + 0x00d7d7, 0x00d7ff, 0x00ff00, 0x00ff5f, 0x00ff87, 0x00ffaf, 0x00ffd7, 0x00ffff, 0x5f0000, 0x5f005f, + 0x5f0087, 0x5f00af, 0x5f00d7, 0x5f00ff, 0x5f5f00, 0x5f5f5f, 0x5f5f87, 0x5f5faf, 0x5f5fd7, 0x5f5fff, + 0x5f8700, 0x5f875f, 0x5f8787, 0x5f87af, 0x5f87d7, 0x5f87ff, 0x5faf00, 0x5faf5f, 0x5faf87, 0x5fafaf, + 0x5fafd7, 0x5fafff, 0x5fd700, 0x5fd75f, 0x5fd787, 0x5fd7af, 0x5fd7d7, 0x5fd7ff, 0x5fff00, 0x5fff5f, + 0x5fff87, 0x5fffaf, 0x5fffd7, 0x5fffff, 0x870000, 0x87005f, 0x870087, 0x8700af, 0x8700d7, 0x8700ff, + 0x875f00, 0x875f5f, 0x875f87, 0x875faf, 0x875fd7, 0x875fff, 0x878700, 0x87875f, 0x878787, 0x8787af, + 0x8787d7, 0x8787ff, 0x87af00, 0x87af5f, 0x87af87, 0x87afaf, 0x87afd7, 0x87afff, 0x87d700, 0x87d75f, + 0x87d787, 0x87d7af, 0x87d7d7, 0x87d7ff, 0x87ff00, 0x87ff5f, 0x87ff87, 0x87ffaf, 0x87ffd7, 0x87ffff, + 0xaf0000, 0xaf005f, 0xaf0087, 0xaf00af, 0xaf00d7, 0xaf00ff, 0xaf5f00, 0xaf5f5f, 0xaf5f87, 0xaf5faf, + 0xaf5fd7, 0xaf5fff, 0xaf8700, 0xaf875f, 0xaf8787, 0xaf87af, 0xaf87d7, 0xaf87ff, 0xafaf00, 0xafaf5f, + 0xafaf87, 0xafafaf, 0xafafd7, 0xafafff, 0xafd700, 0xafd75f, 0xafd787, 0xafd7af, 0xafd7d7, 0xafd7ff, + 0xafff00, 0xafff5f, 0xafff87, 0xafffaf, 0xafffd7, 0xafffff, 0xd70000, 0xd7005f, 0xd70087, 0xd700af, + 0xd700d7, 0xd700ff, 0xd75f00, 0xd75f5f, 0xd75f87, 0xd75faf, 0xd75fd7, 0xd75fff, 0xd78700, 0xd7875f, + 0xd78787, 0xd787af, 0xd787d7, 0xd787ff, 0xd7af00, 0xd7af5f, 0xd7af87, 0xd7afaf, 0xd7afd7, 0xd7afff, + 0xd7d700, 0xd7d75f, 0xd7d787, 0xd7d7af, 0xd7d7d7, 0xd7d7ff, 0xd7ff00, 0xd7ff5f, 0xd7ff87, 0xd7ffaf, + 0xd7ffd7, 0xd7ffff, 0xff0000, 0xff005f, 0xff0087, 0xff00af, 0xff00d7, 0xff00ff, 0xff5f00, 0xff5f5f, + 0xff5f87, 0xff5faf, 0xff5fd7, 0xff5fff, 0xff8700, 0xff875f, 0xff8787, 0xff87af, 0xff87d7, 0xff87ff, + 0xffaf00, 0xffaf5f, 0xffaf87, 0xffafaf, 0xffafd7, 0xffafff, 0xffd700, 0xffd75f, 0xffd787, 0xffd7af, + 0xffd7d7, 0xffd7ff, 0xffff00, 0xffff5f, 0xffff87, 0xffffaf, 0xffffd7, 0xffffff, 0x080808, 0x121212, + 0x1c1c1c, 0x262626, 0x303030, 0x3a3a3a, 0x444444, 0x4e4e4e, 0x585858, 0x626262, 0x6c6c6c, 0x767676, + 0x808080, 0x8a8a8a, 0x949494, 0x9e9e9e, 0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada, + 0xe4e4e4, 0xeeeeee }; + + public Ansi8bitMapping() { + ansiLabMap = new LinkedHashMap<>(256, 1); + for (int i = 0; i < ANSI_8BIT_COLOR_CODE_LOOKUP.length; i++) { + ansiLabMap.put(Ansi8BitColor.foreground(i), new LabColor(ANSI_8BIT_COLOR_CODE_LOOKUP[i])); + } + } +} diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java new file mode 100644 index 000000000..768d8b594 --- /dev/null +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/AnsiLabMapping.java @@ -0,0 +1,44 @@ +package cn.hutool.swing.img.color; + +import cn.hutool.core.lang.ansi.AnsiElement; + +import java.awt.Color; +import java.util.Map; + +/** + * ANSI颜色和Lab颜色的对应查找表， + * + * @author Tom Xin + */ +public abstract class AnsiLabMapping { + protected Map ansiLabMap; + + /** + * 查找与给定LabColor最接近的AnsiElement颜色 + * + * @param color {@link LabColor} + * @return 最接近的Ansi4BitColor + */ + public AnsiElement lookupClosest(Color color) { + return lookupClosest(new LabColor(color)); + } + + /** + * 查找与给定LabColor最接近的AnsiElement颜色 + * + * @param color {@link LabColor} + * @return 最接近的Ansi4BitColor + */ + public AnsiElement lookupClosest(LabColor color) { + AnsiElement closest = null; + double closestDistance = Float.MAX_VALUE; + for (Map.Entry entry : ansiLabMap.entrySet()) { + double candidateDistance = color.getDistance(entry.getValue()); + if (closest == null || candidateDistance < closestDistance) { + closestDistance = candidateDistance; + closest = entry.getKey(); + } + } + return closest; + } +} diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/ColorUtil.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java similarity index 88% rename from hutool-swing/src/main/java/cn/hutool/swing/img/ColorUtil.java rename to hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java index fc9244924..e14825c6d 100644 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/ColorUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/ColorUtil.java @@ -1,6 +1,9 @@ -package cn.hutool.swing.img; +package cn.hutool.swing.img.color; import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.ansi.Ansi4BitColor; +import cn.hutool.core.lang.ansi.Ansi8BitColor; +import cn.hutool.core.lang.ansi.AnsiElement; import cn.hutool.core.text.StrUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; @@ -194,6 +197,30 @@ public class ColorUtil { return new Color(random.nextInt(RGB_COLOR_BOUND), random.nextInt(RGB_COLOR_BOUND), random.nextInt(RGB_COLOR_BOUND)); } + /** + * AWT的{@link Color}颜色转换为ANSI颜色，由于取最接近颜色，故可能有色差 + * + * @param color {@link Color} + * @param is8Bit 是否8bit的ANSI颜色 + * @param isBackground 是否背景色 + * @return ANSI颜色 + */ + public static AnsiElement toAnsiColor(Color color, boolean is8Bit, boolean isBackground) { + if (is8Bit) { + final Ansi8BitColor ansiElement = (Ansi8BitColor) Ansi8bitMapping.INSTANCE.lookupClosest(color); + if (isBackground) { + return ansiElement.asBackground(); + } + return ansiElement; + } else { + final Ansi4BitColor ansiElement = (Ansi4BitColor) Ansi4bitMapping.INSTANCE.lookupClosest(color); + if (isBackground) { + return ansiElement.asBackground(); + } + return ansiElement; + } + } + /** * 获取给定图片的主色调，背景填充用 * diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/LabColor.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java similarity index 98% rename from hutool-swing/src/main/java/cn/hutool/swing/img/LabColor.java rename to hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java index 8be48d4c2..b4840577e 100644 --- a/hutool-swing/src/main/java/cn/hutool/swing/img/LabColor.java +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/LabColor.java @@ -1,4 +1,4 @@ -package cn.hutool.swing.img; +package cn.hutool.swing.img.color; import cn.hutool.core.lang.Assert; diff --git a/hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java b/hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java new file mode 100644 index 000000000..ee273067a --- /dev/null +++ b/hutool-swing/src/main/java/cn/hutool/swing/img/color/package-info.java @@ -0,0 +1,7 @@ +/** + * 颜色处理相关工具类封装 + * + * @author looly + * + */ +package cn.hutool.swing.img.color; diff --git a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java index 18dc2a030..13ce5507f 100755 --- a/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java +++ b/hutool-swing/src/test/java/cn/hutool/swing/img/ImgUtilTest.java @@ -2,6 +2,7 @@ package cn.hutool.swing.img; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; +import cn.hutool.swing.img.color.ColorUtil; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test;