From 6a3a2920151c9efd0c4bfc215965b651f902d645 Mon Sep 17 00:00:00 2001 From: orbiter Date: Mon, 10 Dec 2007 01:47:04 +0000 Subject: [PATCH] - smoothed ymage font - changed position of status banner git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4261 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/Status.html | 8 +- htroot/env/base.css | 4 +- htroot/index.java | 8 +- .../de/anomic/ymage/ymageFontGenerator.java | 397 +++++++++--------- source/de/anomic/ymage/ymageMatrix.java | 62 ++- source/de/anomic/ymage/ymageToolPrint.java | 41 +- 6 files changed, 276 insertions(+), 244 deletions(-) diff --git a/htroot/Status.html b/htroot/Status.html index 19dfde887..215bd09a5 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -23,7 +23,10 @@
-

Welcome to YaCy!

+
+

Welcome to YaCy!


+ +
@@ -146,8 +149,7 @@ - + #%env/templates/footer.template%# diff --git a/htroot/env/base.css b/htroot/env/base.css index 3264aa02c..e1d6001df 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -390,13 +390,13 @@ div.welcome { /* The heading in Status.html */ margin:10px 0; padding-top:130px; text-align:left; - width:55%; + width:65%; background:url(/env/grafics/kaskelix.png) top center no-repeat; } div.sidebar { /* sidebars on the right side */ float:left; - width:45%; + width:35%; margin:10px 0; padding-top:10px; text-align:left; diff --git a/htroot/index.java b/htroot/index.java index 3ae718f7a..e78094bb4 100644 --- a/htroot/index.java +++ b/htroot/index.java @@ -99,10 +99,7 @@ public class index { if (cds.equals("app")) contentdom = plasmaSearchQuery.CONTENTDOM_APP; //long mylinks = 0; - try { - prop.putNum("links", yacyCore.seedDB.mySeed().getLinkCount()); - } catch (NumberFormatException e) { prop.putHTML("links", "0"); } - //prop.put("total-links", groupDigits(mylinks + yacyCore.seedDB.countActiveURL())); // extremely time-intensive! + prop.putNum("links", yacyCore.seedDB.mySeed().getLinkCount()); // we create empty entries for template strings String promoteSearchPageGreeting = env.getConfig("promoteSearchPageGreeting", ""); @@ -120,8 +117,7 @@ public class index { prop.put("searchoptions_count-100", (count == 100) ? "1" : "0"); prop.put("searchoptions_resource-global", global ? "1" : "0"); prop.put("searchoptions_resource-global-disabled", (indexReceiveGranted && indexDistributeGranted) ? "0" : "1"); - prop.put("searchoptions_resource-global-disabled_reason", - (indexReceiveGranted) ? "0" : (indexDistributeGranted ? "1" : "2")); + prop.put("searchoptions_resource-global-disabled_reason", (indexReceiveGranted) ? "0" : (indexDistributeGranted ? "1" : "2")); prop.put("searchoptions_resource-local", global ? "0" : "1"); prop.put("searchoptions_searchtime", time); prop.put("searchoptions_time-1", (time == 1) ? "1" : "0"); diff --git a/source/de/anomic/ymage/ymageFontGenerator.java b/source/de/anomic/ymage/ymageFontGenerator.java index 189147c8b..8ce3083f5 100644 --- a/source/de/anomic/ymage/ymageFontGenerator.java +++ b/source/de/anomic/ymage/ymageFontGenerator.java @@ -79,39 +79,39 @@ public class ymageFontGenerator { ".X.X.", "XXXXX", ".X.X."}, - {".XXXX", + {"+XXXX", "X.X..", - ".XXX.", + "+XXX+", "..X.X", - "XXXX."}, + "XXXX+"}, {".X..X", "X.XX.", ".XXX.", ".XX.X", "X..X."}, - {".XXX.", - "X....", - ".X.X.", - "X.X..", - ".X.X."}, + {"+XXX.", + "X+...", + "+X+X.", + "X.X+.", + "+X+X."}, {"..X..", "..X..", ".....", ".....", "....."}, - {"...X.", //0x28 - "..X..", - "..X..", - "..X..", - "...X."}, - {".X...", - "..X..", - "..X..", - "..X..", - ".x..."}, + {"....X", //0x28 + "...X+", + "...X.", + "...X+", + "....X"}, + {"X....", + "+X...", + ".X...", + "+X...", + "x...."}, {".....", ".X.X.", - "xxXxx", + "++X++", ".x.X.", "....."}, {".....", @@ -122,7 +122,7 @@ public class ymageFontGenerator { {".....", ".....", "..X..", - "..X..", + ".+X..", ".X..."}, {".....", ".....", @@ -135,14 +135,14 @@ public class ymageFontGenerator { ".....", "..X.."}, {"....X", - "...X.", - "..X..", - ".X...", - "X...."}, + "...X+", + "..X+.", + ".X+..", + "X+..."}, {".XXX.", //0x30 - "X..XX", + "X+.XX", "X.X.X", - "XX..X", + "XX.+X", ".XXX."}, {"..X..", ".XX..", @@ -150,44 +150,44 @@ public class ymageFontGenerator { "..X..", ".XXX."}, {".XXX.", - "X...X", - "..XX.", - ".X...", + "X+.+X", + ".+XX+", + "+X+..", "XXXXX"}, {".XXX.", - "X...X", - "...X.", - "X...X", + "X+.+X", + "...X+", + "X+.+X", ".XXX."}, - {"..XX.", - ".X.X.", + {".+XX.", + "+X+X.", "XXXXX", "...X.", "...X."}, {"XXXXX", "X....", "XXXX.", - "....X", + "...+X", "XXXX."}, {".XXX.", - "X....", - "XXXX.", - "X...X", + "X+...", + "XXXX+", + "X+.+X", ".XXX."}, {"XXXXX", - "...X.", - "..X..", + "..+X+", + "..X+.", "..X..", "..X.."}, {".XXX.", //0x38 - "X...X", - ".XXX.", - "X...X", + "X+.+X", + "+XXX.", + "X+.+X", ".XXX."}, {".XXX.", - "X...X", - ".XXXX", - "....X", + "X+.+X", + "+XXXX", + "...+X", ".XXX."}, {".....", "..X..", @@ -197,52 +197,52 @@ public class ymageFontGenerator { {".....", "..X..", ".....", - "..X..", + ".+X..", ".X..."}, - {"...X.", - "..X..", - ".X...", - "..X..", - "...X."}, + {"...X+", + "..X+.", + ".X+..", + "..X+.", + "...X+"}, {".....", "XXXXX", ".....", "XXXXX", "....."}, - {".X...", - "..X..", - "...X.", - "..X..", - ".X..."}, + {"+X...", + ".+X..", + "..+X.", + ".+X..", + "+X..."}, {".XXX.", - "...X.", + "..+X.", "..X..", ".....", "..X.."}, - {".XXX.", //0x40 + {"+XXX+", //0x40 "XXX.X", - "XXXX.", - "X....", + "X+XX+", + "X+...", ".XXX."}, - {"..X..", - ".X.X.", - "X...X", + {".+X+.", + "+X+X+", + "X+.+X", "XXXXX", "X...X"}, - {"XXX..", - "X..X.", - "XXXX.", - "X...X", + {"XXX+.", + "X.+X.", + "XXXX+", + "X..+X", "XXXX."}, {".XXX.", + "X+...", "X....", - "X....", - "X....", + "X+...", ".XXX."}, {"XXXX.", + "X..+X", "X...X", - "X...X", - "X...X", + "X..+X", "XXXX."}, {"XXXXX", "X....", @@ -255,9 +255,9 @@ public class ymageFontGenerator { "X....", "X...."}, {".XXX.", - "X....", + "X+...", "X.XXX", - "X...X", + "X..+X", ".XXX."}, {"X...X", //0x48 "X...X", @@ -272,13 +272,13 @@ public class ymageFontGenerator { {"XXXXX", "....X", "....X", - "X...X", + "X+.+X", ".XXX."}, - {"X...X", - "X..X.", + {"X..+X", + "X.+X.", "XXX..", - "X..X..", - "X...X"}, + "X.+X.", + "X..+X"}, {"X....", "X....", "X....", @@ -286,39 +286,39 @@ public class ymageFontGenerator { "XXXXX"}, {"X...X", "XX.XX", - "X.X.X", - "X...X", - "X...X"}, - {"X...X", - "XX..X", - "X.X.X", - "X..XX", + "X+X+X", + "X.+.X", "X...X"}, + {"X+..X", + "XX+.X", + "X+X+X", + "X.+XX", + "X..+X"}, {".XXX.", + "X+.+X", "X...X", - "X...X", - "X...X", + "X+.+X", ".XXX."}, {"XXXX.", //0x50 - "X...X", + "X..+X", "XXXX.", "X....", "X...."}, {".XXX.", - "X...X", - "X.X.X", - "X..X.", - ".XX.X"}, + "X+.+X", + "X.X+X", + "X++X+", + ".XX+X"}, {"XXXX.", - "X...X", + "X..+X", "XXXX.", - "X..X.", - "X...X"}, - {".XXX.", - "X....", + "X.+X.", + "X..+X"}, + {".XXX+", + "X+...", ".XXX.", - "....X", - ".XXX."}, + "...+X", + "+XXX."}, {"XXXXX", "..X..", "..X..", @@ -327,51 +327,51 @@ public class ymageFontGenerator { {"X...X", "X...X", "X...X", - "X...X", + "X+.+X", ".XXX."}, {"X...X", "X...X", - "X...X", - ".X.X.", + "X+.+X", + ".X+X.", "..X.."}, {"X...X", "X...X", - "X...X", - "X.X.X", + "X.+.X", + "X+X+X", ".X.X."}, - {"X...X", //0x58 - ".X.X.", - "..X..", - ".X.X.", - "X...X"}, + {"X+.+X", //0x58 + "+X+X+", + ".+X+.", + "+X+X+", + "X+.+X"}, {"X...X", - ".X.X.", - "..X..", + "+X.X+", + ".+X+.", "..X..", "..X.."}, {"XXXXX", - "...X.", - "..X..", - ".X...", + "..+X+", + ".+X+.", + "+X+..", "XXXXX"}, - {".XXX.", - ".X...", - ".X...", - ".X...", - ".XXX."}, - {"X....", - ".X...", + {"..XXX", "..X..", - "...X.", - "....X"}, - {".XXX.", - "...X.", - "...X.", - "...X.", - ".XXX."}, - {"..X..", - ".X.X.", - "X...X", + "..X..", + "..X..", + "..XXX"}, + {"X+...", + "+X+..", + ".+X+.", + "..+X+", + "...+X"}, + {"XXX..", + "..X..", + "..X..", + "..X..", + "XXX.."}, + {".+X+.", + "+X+X+", + "X+.+X", ".....", "....."}, {".....", @@ -379,51 +379,51 @@ public class ymageFontGenerator { ".....", ".....", "XXXXX"}, - {".X...", //0x60 - "..X..", + {".X+..", //0x60 + ".+X..", ".....", ".....", "....."}, {".....", ".....", - ".XXXX", - "X...X", + "+XXXX", + "X+..X", ".XXXX"}, {"X....", "X....", "XXXX.", - "X...X", + "X..+X", "XXXX."}, {".....", ".....", ".XXXX", - "X....", + "X+...", ".XXXX"}, {"....X", "....X", ".XXXX", - "X...X", + "X+..X", ".XXXX"}, {".....", - ".XX..", - "X..X.", - "X.X..", + "+XX+.", + "X.+X.", + "X+X+.", ".XXXX"}, {"..XX.", - "..X..", + "..X+.", ".XXX.", "..X..", "..X.."}, {".....", - "..XX.", - ".X..X", - "..X.X", + ".+XX+", + ".X+.X", + ".+X+X", "XXXX."}, {"X....", //0x68 "X....", - "X.XX.", - "XX..X", - "X...X"}, + "X+XX+", + "XX++X", + "X+..X"}, {"..X..", ".....", "..X..", @@ -432,13 +432,13 @@ public class ymageFontGenerator { {"..X..", ".....", "..X..", - "..X..", - ".X..."}, + ".+X..", + ".X+.."}, {"X....", "X....", - "X..XX", - "XXX..", - "X..XX"}, + "X.+XX", + "XXX+.", + "X.+XX"}, {"..X..", "..X..", "..X..", @@ -446,39 +446,39 @@ public class ymageFontGenerator { "..X.."}, {".....", ".....", - ".X.X.", - "X.X.X", + ".X+X.", + "X+X+X", "X.X.X"}, {".....", ".....", ".XXX.", - "X...X", + "X+.+X", "X...X"}, {".....", ".....", ".XXX.", - "X...X", + "X+.+X", ".XXX."}, {".....", //0x70 "XXXX.", - "X...X", + "X..+X", "XXXX.", "X...."}, {".....", ".XXXX", - "X...X", + "X+..X", ".XXXX", "....X"}, {".....", - "...X.", - "..X..", + "..+X.", + "..X+.", "..X..", "..X.."}, {".....", ".....", - "..XX.", - ".X..X", - "X..X."}, + ".+XX.", + "+X++X", + "X++X."}, {"..X..", ".XXX.", "..X..", @@ -487,52 +487,52 @@ public class ymageFontGenerator { {".....", ".....", "X...X", - "X...X", + "X+.+X", ".XXX."}, {".....", ".....", - "X...X", - ".X.X.", - "..X.."}, + "X+.+X", + "+X+X+", + ".+X+."}, {".....", ".....", "X.X.X", - "X.X.X", - ".X.X."}, + "X+X+X", + ".X+X."}, {".....", //0x78 ".....", - ".X.X.", - "..X..", - ".X.X."}, + ".X+X.", + ".+X+.", + ".X+X."}, {".....", ".....", - ".X.X.", - "..X..", + ".X+X.", + ".+X+.", "..X.."}, {".....", ".....", ".XXXX", - "..X..", + ".+X+.", "XXXX."}, - {"..XX.", - "..X..", - ".X...", - "..X..", - "..XX."}, + {"...XX", + "..+X+", + ".+X+.", + "..+X+", + "...XX"}, {"..X..", "..X..", "..X..", "..X..", "..X.."}, - {".XX..", - "..X..", - "...X.", - "..X..", - ".XX.."}, + {"XX...", + "+X+..", + ".+X+.", + "+X+..", + "XX..."}, {".....", - ".X...", - "X.X.X", - "...X.", + "+X+..", + "X+X+X", + "..+X+", "....."}, {"XXXXX", "X...X", @@ -544,24 +544,25 @@ public class ymageFontGenerator { public static void main(String[] args) { String[] letter; - int b; - int v; + long b; + long v; int c = 0; String s; for (int i = 0; i < font.length; i++) { letter = font[i]; b = 0; for (int j = 0; j < 5; j++) { - b = b << 5; - v = 16; + b = b << 10; + v = 1 << 9; for (int col = 0; col < 5; col++) { - if (letter[j].charAt(col) == 'X') b += v; - v = v >> 1; + if (letter[j].charAt(col) == '+') b += v; + if (letter[j].charAt(col) == 'X') b += v + (v / 2); + v = v >> 2; } } s = Long.toHexString(b).toUpperCase(); - while (s.length() < 7) s = "0" + s; - System.out.print("0x" + s + ","); + while (s.length() < 14) s = "0" + s; + System.out.print("0x" + s + "L,"); c++; if (c >= 8) { System.out.println(); diff --git a/source/de/anomic/ymage/ymageMatrix.java b/source/de/anomic/ymage/ymageMatrix.java index f92140c8e..c6d2d7ecb 100644 --- a/source/de/anomic/ymage/ymageMatrix.java +++ b/source/de/anomic/ymage/ymageMatrix.java @@ -145,25 +145,53 @@ public class ymageMatrix { } public void plot(int x, int y) { + plot (x, y, 100); + } + + private int[] cc = new int[3]; + + public void plot(int x, int y, int intensity) { if ((x < 0) || (x >= width)) return; if ((y < 0) || (y >= height)) return; - //int n = 3 * (x + y * width); - if (this.defaultMode == MODE_REPLACE) { - grid.setPixel(x, y, defaultCol); - } else if (this.defaultMode == MODE_ADD) { - int[] c = new int[3]; - c = grid.getPixel(x, y, c); - int r = (0xff & c[0]) + defaultCol[0]; if (r > 255) r = 255; - int g = (0xff & c[1]) + defaultCol[1]; if (g > 255) g = 255; - int b = (0xff & c[2]) + defaultCol[2]; if (b > 255) b = 255; - grid.setPixel(x, y, new int[]{r, g, b}); - } else if (this.defaultMode == MODE_SUB) { - int[] c = new int[3]; - c = grid.getPixel(x, y, c); - int r = (0xff & c[0]) - defaultCol[0]; if (r < 0) r = 0; - int g = (0xff & c[1]) - defaultCol[1]; if (g < 0) g = 0; - int b = (0xff & c[2]) - defaultCol[2]; if (b < 0) b = 0; - grid.setPixel(x, y, new int[]{r, g, b}); + synchronized (cc) { + if (this.defaultMode == MODE_REPLACE) { + if (intensity == 100) { + cc[0] = defaultCol[0]; + cc[1] = defaultCol[1]; + cc[2] = defaultCol[2]; + } else { + int[] c = new int[3]; + c = grid.getPixel(x, y, c); + cc[0] = (intensity * defaultCol[0] + (100 - intensity) * c[0]) / 100; + cc[1] = (intensity * defaultCol[1] + (100 - intensity) * c[1]) / 100; + cc[2] = (intensity * defaultCol[2] + (100 - intensity) * c[2]) / 100; + } + } else if (this.defaultMode == MODE_ADD) { + int[] c = new int[3]; + c = grid.getPixel(x, y, c); + if (intensity == 100) { + cc[0] = (0xff & c[0]) + defaultCol[0]; if (cc[0] > 255) cc[0] = 255; + cc[1] = (0xff & c[1]) + defaultCol[1]; if (cc[1] > 255) cc[1] = 255; + cc[2] = (0xff & c[2]) + defaultCol[2]; if (cc[2] > 255) cc[2] = 255; + } else { + cc[0] = (0xff & c[0]) + (intensity * defaultCol[0] / 100); if (cc[0] > 255) cc[0] = 255; + cc[1] = (0xff & c[1]) + (intensity * defaultCol[1] / 100); if (cc[1] > 255) cc[1] = 255; + cc[2] = (0xff & c[2]) + (intensity * defaultCol[2] / 100); if (cc[2] > 255) cc[2] = 255; + } + } else if (this.defaultMode == MODE_SUB) { + int[] c = new int[3]; + c = grid.getPixel(x, y, c); + if (intensity == 100) { + cc[0] = (0xff & c[0]) - defaultCol[0]; if (cc[0] < 0) cc[0] = 0; + cc[1] = (0xff & c[1]) - defaultCol[1]; if (cc[1] < 0) cc[1] = 0; + cc[2] = (0xff & c[2]) - defaultCol[2]; if (cc[2] < 0) cc[2] = 0; + } else { + cc[0] = (0xff & c[0]) - (intensity * defaultCol[0] / 100); if (cc[0] < 0) cc[0] = 0; + cc[1] = (0xff & c[1]) - (intensity * defaultCol[1] / 100); if (cc[1] < 0) cc[1] = 0; + cc[2] = (0xff & c[2]) - (intensity * defaultCol[2] / 100); if (cc[2] < 0) cc[2] = 0; + } + } + grid.setPixel(x, y, cc); } } diff --git a/source/de/anomic/ymage/ymageToolPrint.java b/source/de/anomic/ymage/ymageToolPrint.java index 41573862a..e951dcc72 100644 --- a/source/de/anomic/ymage/ymageToolPrint.java +++ b/source/de/anomic/ymage/ymageToolPrint.java @@ -4,18 +4,18 @@ public class ymageToolPrint { private static long[] font = new long[]{ - 0x0000000,0x0421004,0x0A50000,0x0AFABEA,0x0FA38BE,0x09B39B2,0x0E82A8A,0x0420000, - 0x0221082,0x0821080,0x0051040,0x0023880,0x0001088,0x0003800,0x0000004,0x0111110, - 0x0E9D72E,0x046108E,0x0E8991F,0x0E88A2E,0x0657C42,0x1F8783E,0x0E87A2E,0x1F11084, - 0x0E8BA2E,0x0E8BC2E,0x0020080,0x0020088,0x0222082,0x00F83E0,0x0820888,0x0E11004, - 0x0EEFA0E,0x04547F1,0x1C97A3E,0x0E8420E,0x1E8C63E,0x1F8721F,0x1F87210,0x0E85E2E, - 0x118FE31,0x1F2109F,0x1F0862E,0x1197251,0x108421F,0x11DD631,0x11CD671,0x0E8C62E, - 0x1E8FA10,0x0E8D64D,0x1E8FA51,0x0E8382E,0x1F21084,0x118C62E,0x118C544,0x118C6AA, - 0x1151151,0x1151084,0x1F1111F,0x0E4210E,0x1041041,0x0E1084E,0x0454400,0x000001F, - 0x0820000,0x0003E2F,0x1087A3E,0x0003E0F,0x010BE2F,0x0064A8F,0x0623884,0x00324BE, - 0x1085B31,0x0401084,0x0401088,0x1084F93,0x0421084,0x0002AB5,0x0003A31,0x0003A2E, - 0x00F47D0,0x007C5E1,0x0011084,0x0001932,0x0471084,0x000462E,0x0004544,0x00056AA, - 0x000288A,0x0002884,0x0003C9E,0x0622086,0x0421084,0x0C2088C,0x0045440,0x1F8C63F + 0x00000000000000L,0x00300C03000030L,0x00CC3300000000L,0x00CCFFCCCFFCCCL,0x02FFCC2FE0CFFEL,0x00C3CF0FC3CF0CL,0x02FCE02ECCE2ECL,0x00300C00000000L, + 0x00030380C03803L,0x0300B00C0B0000L,0x0000332BA03000L,0x00000C0FC0C000L,0x0000000302C0C0L,0x0000000FC00000L,0x00000000000030L,0x00030383838380L, + 0x00FCE3F33F2CFCL,0x00303C0300C0FCL,0x00FCE2CBEB83FFL,0x00FCE2C0EE2CFCL,0x00BCBB3FF0300CL,0x03FFC03FC02FFCL,0x00FCE03FEE2CFCL,0x03FF0B8380C030L, + 0x00FCE2EFCE2CFCL,0x00FCE2EFF02CFCL,0x00000C0000C000L,0x00000C0002C0C0L,0x000E0E0E00E00EL,0x0000FFC00FFC00L,0x02C02C02C2C2C0L,0x00FC0B03000030L, + 0x02FEFCFBEE00FCL,0x00B8BBB8BFFF03L,0x03F8CB3FEC2FFCL,0x00FCE0300E00FCL,0x03FCC2F03C2FFCL,0x03FFC03F0C03FFL,0x03FFC03F0C0300L,0x00FCE033FC2CFCL, + 0x0303C0FFFC0F03L,0x03FF0C0300C3FFL,0x03FF00C03E2CFCL,0x030BCB3F0CB30BL,0x0300C0300C03FFL,0x0303F3FBBC8F03L,0x0383F8FBBCBF0BL,0x00FCE2F03E2CFCL, + 0x03FCC2FFCC0300L,0x00FCE2F3BEB8FBL,0x03FCC2FFCCB30BL,0x00FEE00FC02EFCL,0x03FF0C0300C030L,0x0303C0F03E2CFCL,0x0303C0F8B3B030L,0x0303C0F23EECCCL, + 0x038BBB8B8BBB8BL,0x0303B38B80C030L,0x03FF0B8B8B83FFL,0x003F0C0300C03FL,0x0380B80B80B80BL,0x03F00C0300C3F0L,0x00B8BBB8B00000L,0x000000000003FFL, + 0x00E02C00000000L,0x0000002FFE0CFFL,0x0300C03FCC2FFCL,0x0000000FFE00FFL,0x000300CFFE0CFFL,0x0000BE32CEE0FFL,0x003C0E0FC0C030L,0x00002F8E32EFFCL, + 0x0300C03BEFAF83L,0x0030000300C030L,0x0030000302C0E0L,0x0300C032FFE32FL,0x00300C0300C030L,0x0000000ECEEF33L,0x0000000FCE2F03L,0x0000000FCE2CFCL, + 0x0000FF30BFF300L,0x00003FF833FC03L,0x00000B0380C030L,0x0000000BCBAFACL,0x00303F0300C030L,0x000000303E2CFCL,0x00000038BBB8B8L,0x000000333EECECL, + 0x0000000EC2E0ECL,0x0000000EC2E030L,0x0000000FF2E3FCL,0x000F0B8B80B80FL,0x00300C0300C030L,0x03C0B80B8B83C0L,0x0000B83BB0B800L,0x03FFC0F03C0FFFL }; private static void print(ymageMatrix matrix, int x, int y, int angle, char letter) { @@ -23,20 +23,25 @@ public class ymageToolPrint { if (index >= font.length) return; long character = font[index]; long row; + long c; for (int i = 0; i < 5; i++) { - row = character & 0x1f; - character = character >> 5; + row = character & 0x3FFL; + character = character >> 10; if (angle == 0) { for (int j = 0; j < 5; j++) { - if ((row & 1) == 1) matrix.plot(x + 5 - j, y); - row = row >> 1; + c = row & 3L; + if (c == 3) matrix.plot(x + 5 - j, y, 100); + if (c == 2) matrix.plot(x + 5 - j, y, 35); + row = row >> 2; } y--; } if (angle == 90) { for (int j = 0; j < 5; j++) { - if ((row & 1) == 1) matrix.plot(x, y - 5 + j); - row = row >> 1; + c = row & 3L; + if (c == 3) matrix.plot(x, y - 5 + j, 100); + if (c == 2) matrix.plot(x, y - 5 + j, 35); + row = row >> 2; } x--; }