ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

计算色差值，参数为null时返回最大色差值；修复compareColor为null时的逻辑判断

Browse Source
This commit is contained in:
chenzecheng 2024-08-09 10:11:42 +08:00
parent 6082abff00
commit 778a67222f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-swing/src/main/java/org/dromara/hutool/swing/img/color/ColorUtil.java
View File

@ -269,12 +269,11 @@ public class ColorUtil {
* @since 5.8.30 * @since 5.8.30
*/ */
public static Color randomColor(final Color compareColor, final int minDistance) { public static Color randomColor(final Color compareColor, final int minDistance) {
Color color = randomColor();
if(null != compareColor && minDistance > 0){
// 注意minDistance太大会增加循环次数，保证至少1/3的概率生成成功 // 注意minDistance太大会增加循环次数，保证至少1/3的概率生成成功
Assert.isTrue(minDistance < maxDistance(compareColor) / 3 * 2, Assert.isTrue(minDistance < maxDistance(compareColor) / 3 * 2,
"minDistance is too large, there are too few remaining colors!"); "minDistance is too large, there are too few remaining colors!");
Color color = randomColor();
if(null == compareColor || minDistance <= 0){
while (computeColorDistance(compareColor, color) < minDistance) { while (computeColorDistance(compareColor, color) < minDistance) {
color = randomColor(); color = randomColor();
} }
@ -293,7 +292,8 @@ public class ColorUtil {
*/ */
public static int computeColorDistance(final Color color1, final Color color2) { public static int computeColorDistance(final Color color1, final Color color2) {
if (null == color1 || null == color2) { if (null == color1 || null == color2) {
return 0; // (0,0,0)到(256,256,256)的距离约等于442.336
return 443;
} }
return (int) Math.sqrt(Math.pow(color1.getRed() - color2.getRed(), 2) return (int) Math.sqrt(Math.pow(color1.getRed() - color2.getRed(), 2)
+ Math.pow(color1.getGreen() - color2.getGreen(), 2) + Math.pow(color1.getGreen() - color2.getGreen(), 2)
@ -308,6 +308,10 @@ public class ColorUtil {
* @since 6.0.0-M16 * @since 6.0.0-M16
*/ */
public static int maxDistance(final Color color) { public static int maxDistance(final Color color) {
if (null == color) {
// (0,0,0)到(256,256,256)的距离约等于442.336
return 443;
}
final int maxX = RGB_COLOR_BOUND - 2 * color.getRed(); final int maxX = RGB_COLOR_BOUND - 2 * color.getRed();
final int maxY = RGB_COLOR_BOUND - 2 * color.getGreen(); final int maxY = RGB_COLOR_BOUND - 2 * color.getGreen();
final int maxZ = RGB_COLOR_BOUND - 2 * color.getBlue(); final int maxZ = RGB_COLOR_BOUND - 2 * color.getBlue();