diff --git a/build.xml b/build.xml index 38aa09e..b35f0bf 100644 --- a/build.xml +++ b/build.xml @@ -13,7 +13,7 @@ - + @@ -74,10 +74,8 @@ - - - - + + diff --git a/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar b/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar new file mode 100644 index 0000000..812e757 Binary files /dev/null and b/fr-plugin-CharCartnoon-1.0/fr-plugin-CharCartnoon-1.0.jar differ diff --git a/fr-plugin-CharCartnoon-1.0/plugin.xml b/fr-plugin-CharCartnoon-1.0/plugin.xml new file mode 100644 index 0000000..212a1cd --- /dev/null +++ b/fr-plugin-CharCartnoon-1.0/plugin.xml @@ -0,0 +1,23 @@ + + com.fr.plugin.char.cartnoon + + yes + 1.0 + 10.0 + 2018-07-31 + all100 + + + ]]> + + + + + + + + + + + \ No newline at end of file diff --git a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar b/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar deleted file mode 100644 index 0cc46b4..0000000 Binary files a/fr-plugin-DataEncryptor-1.0/fr-plugin-DataEncryptor-1.0.jar and /dev/null differ diff --git a/fr-plugin-DataEncryptor-1.0/plugin.xml b/fr-plugin-DataEncryptor-1.0/plugin.xml deleted file mode 100644 index 1b7edd4..0000000 --- a/fr-plugin-DataEncryptor-1.0/plugin.xml +++ /dev/null @@ -1,19 +0,0 @@ - - com.fr.plugin.data.encrypt - - yes - 1.0 - 10.0 - 2018-07-31 - all100 - - - ]]> - - - - - - - \ No newline at end of file diff --git a/install/fr-plugin-CharCartnoon-1.0.zip b/install/fr-plugin-CharCartnoon-1.0.zip new file mode 100644 index 0000000..1154e03 Binary files /dev/null and b/install/fr-plugin-CharCartnoon-1.0.zip differ diff --git a/install/fr-plugin-CoolChart-1.0.zip b/install/fr-plugin-CoolChart-1.0.zip new file mode 100644 index 0000000..578e05f Binary files /dev/null and b/install/fr-plugin-CoolChart-1.0.zip differ diff --git a/install/fr-plugin-DataEncryptor-1.0.zip b/install/fr-plugin-DataEncryptor-1.0.zip deleted file mode 100644 index 4ec7f54..0000000 Binary files a/install/fr-plugin-DataEncryptor-1.0.zip and /dev/null differ diff --git a/install/install/fr-plugin-cool-chart-1.1.zip b/install/install/fr-plugin-cool-chart-1.1.zip new file mode 100644 index 0000000..ccad8ce Binary files /dev/null and b/install/install/fr-plugin-cool-chart-1.1.zip differ diff --git a/lib/fastjson-1.2.68.jar b/lib/fastjson-1.2.68.jar deleted file mode 100644 index a2babb2..0000000 Binary files a/lib/fastjson-1.2.68.jar and /dev/null differ diff --git a/lib/fine-decision-10.0-RELEASE-SNAPSHOT.jar b/lib/fine-decision-10.0-RELEASE-SNAPSHOT.jar new file mode 100644 index 0000000..3aebc37 Binary files /dev/null and b/lib/fine-decision-10.0-RELEASE-SNAPSHOT.jar differ diff --git a/lib/fine-report-designer-10.0-RELEASE-20200826.162742-1709.jar b/lib/fine-report-designer-10.0-RELEASE-20200826.162742-1709.jar new file mode 100644 index 0000000..d63f023 Binary files /dev/null and b/lib/fine-report-designer-10.0-RELEASE-20200826.162742-1709.jar differ diff --git a/lib/fine-report-engine-10.0-RELEASE-20200826.162743-1710.jar b/lib/fine-report-engine-10.0-RELEASE-20200826.162743-1710.jar new file mode 100644 index 0000000..a765856 Binary files /dev/null and b/lib/fine-report-engine-10.0-RELEASE-20200826.162743-1710.jar differ diff --git a/lib/fine-report-engine-10.0-RELEASE-SNAPSHOT.jar b/lib/fine-report-engine-10.0-RELEASE-SNAPSHOT.jar new file mode 100644 index 0000000..72bada2 Binary files /dev/null and b/lib/fine-report-engine-10.0-RELEASE-SNAPSHOT.jar differ diff --git a/lib/gson-2.8.5.jar b/lib/gson-2.8.5.jar deleted file mode 100644 index 0d5baf3..0000000 Binary files a/lib/gson-2.8.5.jar and /dev/null differ diff --git a/lib/jasypt-1.9.3.jar b/lib/jasypt-1.9.3.jar deleted file mode 100644 index f4c4606..0000000 Binary files a/lib/jasypt-1.9.3.jar and /dev/null differ diff --git a/lib/servlet-api-3.0.jar b/lib/servlet-api-3.0.jar new file mode 100644 index 0000000..a6670c2 Binary files /dev/null and b/lib/servlet-api-3.0.jar differ diff --git a/plugin-function-char-cartnoon.iml b/plugin-function-char-cartnoon.iml new file mode 100644 index 0000000..028d5b3 --- /dev/null +++ b/plugin-function-char-cartnoon.iml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugin.xml b/plugin.xml index 1b7edd4..212a1cd 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,19 +1,23 @@ - com.fr.plugin.data.encrypt - + com.fr.plugin.char.cartnoon + yes 1.0 10.0 2018-07-31 all100 - + + [2021-8-19]初始化插件。
]]> - - - + + - + + + + + + \ No newline at end of file diff --git a/src/com/fr/plugin/cool/cartnoon/FRCoolGif.java b/src/com/fr/plugin/cool/cartnoon/FRCoolGif.java new file mode 100644 index 0000000..589508b --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/FRCoolGif.java @@ -0,0 +1,48 @@ +package com.fr.plugin.cool.cartnoon; + +import com.fr.intelli.record.Focus; +import com.fr.intelli.record.Original; +import com.fr.log.FineLoggerFactory; +import com.fr.plugin.cool.cartnoon.utils.AnimatedGifEncoder; +import com.fr.plugin.cool.cartnoon.web.ImageViewer; +import com.fr.record.analyzer.EnableMetrics; +import com.fr.script.AbstractFunction; +import com.fr.stable.ColumnRow; +import com.fr.stable.fun.Authorize; +import sun.font.FontDesignMetrics; + +import java.awt.*; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; + +@EnableMetrics +@Authorize(callSignKey = com.fr.plugin.cool.cartnoon.FunConstants.PLUGIN_ID) +public class FRCoolGif extends AbstractFunction { + @Override + @Focus(id = com.fr.plugin.cool.cartnoon.FunConstants.PLUGIN_ID, text = "Plugin-Function_FRCoolGif", source = Original.PLUGIN) + public Object run(Object[] args) { + final String text = args[0].toString(); + + int width= Integer.parseInt(args[1].toString()); + int height= Integer.parseInt(args[2].toString()); + int fontSize= Integer.parseInt(args[3].toString()); + int rate= Integer.parseInt(args[4].toString()); + final Color color = FunConstants.TextToColor(args[5].toString()); + + final ColumnRow currentColumnRow = this.getCalculator().getCurrentColumnRow(); + + int intRow=currentColumnRow.getRow(); + int intCol=currentColumnRow.getColumn(); + final String strCol = String.valueOf((char) (intCol + 65)); + String id=strCol+intRow; + String gifUrl="/webroot/decision/url/img?id="+id; + + FunConstants.CreateGif(id,text,fontSize,rate,color,width); + return ""; + + } + + + +} \ No newline at end of file diff --git a/src/com/fr/plugin/cool/cartnoon/FREncryptorFunction.java b/src/com/fr/plugin/cool/cartnoon/FREncryptorFunction.java new file mode 100644 index 0000000..f52458f --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/FREncryptorFunction.java @@ -0,0 +1,19 @@ +package com.fr.plugin.cool.cartnoon; + +import com.fr.stable.fun.impl.AbstractFunctionDefContainer; +import com.fr.stable.script.FunctionDef; + +public class FREncryptorFunction extends AbstractFunctionDefContainer { + @Override + public FunctionDef[] getFunctionDefs() { + return new FunctionDef[]{ + new FunctionDef("FRCoolGif", "FRCoolGif(varchar1,varchar2,logical3)：生成Gif。", FRCoolGif.class.getName()), + + }; + } + + @Override + public String getGroupName() { + return "字符动画函数"; + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/FunConstants.java b/src/com/fr/plugin/cool/cartnoon/FunConstants.java new file mode 100644 index 0000000..c1a8888 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/FunConstants.java @@ -0,0 +1,81 @@ +package com.fr.plugin.cool.cartnoon; + +import com.fr.log.FineLoggerFactory; +import com.fr.plugin.cool.cartnoon.utils.AnimatedGifEncoder; +import com.fr.plugin.cool.cartnoon.web.ImageViewer; +import com.fr.stable.fun.Authorize; +import sun.font.FontDesignMetrics; + +import java.awt.*; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; + +@Authorize(callSignKey = FunConstants.PLUGIN_ID) +public class FunConstants { + static final String PLUGIN_ID = "com.fr.plugin.cool.cartnoon"; + static Color TextToColor(String ColorText) { + Color result=new Color(0,0,0); + if (ColorText.length() != 6) { + return result; + } + final int red = Integer.parseInt(ColorText.substring(0, 2), 16); + final int blue = Integer.parseInt(ColorText.substring(2, 4), 16); + final int green = Integer.parseInt(ColorText.substring(4, 6), 16); + if (red > 255 || red < 0) { + return result; + } + if (blue > 255 || blue < 0) { + return result; + } + if (green > 255 || green < 0) { + return result; + } + Color color = new Color(red, blue, green); + return color; + } + final static BufferedImage ImageFromText(String text, int fontSize, Color color, int width) { + + Font font = new Font("黑体", Font.BOLD, fontSize); + FontMetrics fm = FontDesignMetrics.getMetrics(font); + final int y = fm.getAscent(); + int textWidth = fm.stringWidth(text); + int textHeight=fm.getHeight(); + BufferedImage img = new BufferedImage(width, textHeight, BufferedImage.TYPE_4BYTE_ABGR); + Graphics2D g2 = img.createGraphics(); + FineLoggerFactory.getLogger().info("textWidth,textHeightY:{},{}",textWidth,textHeight); + AffineTransform affineTransform = new AffineTransform(); + Font rotatedFont = font.deriveFont(affineTransform); + g2.setFont(rotatedFont); + g2.setColor(color); + g2.drawString(text, 0, y); + g2.dispose(); + return img; + } + + final static void CreateGif(String id,String text,int fontSize,int rate,Color color,int width) { + + // 读数据 + int len=text.length(); + + AnimatedGifEncoder e = new AnimatedGifEncoder(); + + ByteArrayOutputStream out=new ByteArrayOutputStream(); + e.start(out); + + //图片之间间隔时间 + e.setDelay(rate); // 1 frame per sec + //重复次数 0表示无限重复 默认不重复 + e.setRepeat(0); + //添加图片 + String subStr; + for (int i = 0; i <= len; i++) { + subStr=text.substring(0,i); + e.addFrame(ImageFromText(subStr,fontSize,color,width)); + } + e.finish(); + + byte[] data = out.toByteArray(); + ImageViewer.gifData.put(id,data); + } +} diff --git a/src/com/fr/plugin/data/encrypt/FunLocaleFinder.java b/src/com/fr/plugin/cool/cartnoon/FunLocaleFinder.java similarity index 93% rename from src/com/fr/plugin/data/encrypt/FunLocaleFinder.java rename to src/com/fr/plugin/cool/cartnoon/FunLocaleFinder.java index 6ec2a07..6533c7d 100644 --- a/src/com/fr/plugin/data/encrypt/FunLocaleFinder.java +++ b/src/com/fr/plugin/cool/cartnoon/FunLocaleFinder.java @@ -1,4 +1,4 @@ -package com.fr.plugin.data.encrypt; +package com.fr.plugin.cool.cartnoon; import com.fr.intelli.record.Focus; import com.fr.intelli.record.Original; diff --git a/src/com/fr/plugin/cool/cartnoon/TestFun.java b/src/com/fr/plugin/cool/cartnoon/TestFun.java new file mode 100644 index 0000000..f4becb8 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/TestFun.java @@ -0,0 +1,37 @@ +package com.fr.plugin.cool.cartnoon; + +import com.fr.plugin.cool.cartnoon.utils.AnimatedGifEncoder; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.*; + +public class TestFun { + public static void main(String args[]) throws Exception { + BufferedImage image1 = ImageIO.read(new File("D:/123.jpg")); + BufferedImage image2 = ImageIO.read(new File("D:/456.jpg")); + AnimatedGifEncoder e = new AnimatedGifEncoder(); + //生成的图片路径 +// e.start(new FileOutputStream("D:/testgif.gif")); + final FileOutputStream fileOutputStream = new FileOutputStream("D:/testgif.gif"); + ByteArrayOutputStream out=new ByteArrayOutputStream(); + e.start(out); + + //图片之间间隔时间 + e.setDelay(500); // 1 frame per sec + //重复次数 0表示无限重复 默认不重复 + e.setRepeat(0); + //添加图片 + e.addFrame(image1); + e.addFrame(image2); + e.finish(); + + byte[] data = out.toByteArray(); + fileOutputStream.write(data); + ByteArrayInputStream input = new ByteArrayInputStream(data); + BufferedImage image = ImageIO.read(input); + File outputfile = new File("d:/bufferimage.gif"); + ImageIO.write(image, "GIF", outputfile); + + } +} diff --git a/src/com/fr/plugin/data/encrypt/local/dataEncrypt.properties b/src/com/fr/plugin/cool/cartnoon/local/dataEncrypt.properties similarity index 100% rename from src/com/fr/plugin/data/encrypt/local/dataEncrypt.properties rename to src/com/fr/plugin/cool/cartnoon/local/dataEncrypt.properties diff --git a/src/com/fr/plugin/data/encrypt/local/dataEncrypt_zh_CN.properties b/src/com/fr/plugin/cool/cartnoon/local/dataEncrypt_zh_CN.properties similarity index 100% rename from src/com/fr/plugin/data/encrypt/local/dataEncrypt_zh_CN.properties rename to src/com/fr/plugin/cool/cartnoon/local/dataEncrypt_zh_CN.properties diff --git a/src/com/fr/plugin/data/encrypt/resources/menuIcon.png b/src/com/fr/plugin/cool/cartnoon/resources/menuIcon.png similarity index 100% rename from src/com/fr/plugin/data/encrypt/resources/menuIcon.png rename to src/com/fr/plugin/cool/cartnoon/resources/menuIcon.png diff --git a/src/com/fr/plugin/cool/cartnoon/utils/AnimatedGifEncoder.java b/src/com/fr/plugin/cool/cartnoon/utils/AnimatedGifEncoder.java new file mode 100644 index 0000000..683e155 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/utils/AnimatedGifEncoder.java @@ -0,0 +1,543 @@ +package com.fr.plugin.cool.cartnoon.utils; + +import java.io.*; +import java.awt.*; +import java.awt.image.*; + +/** + * Class AnimatedGifEncoder - Encodes a GIF file consisting of one or + * more frames. + * 
+ * Example:
+ *    AnimatedGifEncoder e = new AnimatedGifEncoder();
+ *    e.start(outputFileName);
+ *    e.setDelay(1000);   // 1 frame per sec
+ *    e.addFrame(image1);
+ *    e.addFrame(image2);
+ *    e.finish();
+ *
+ * No copyright asserted on the source code of this class. May be used + * for any purpose, however, refer to the Unisys LZW patent for restrictions + * on use of the associated LZWEncoder class. Please forward any corrections + * to questions at fmsware.com. + * + * @author Kevin Weiner, FM Software + * @version 1.03 November 2003 + * + */ + +public class AnimatedGifEncoder { + + protected int width; // image size + protected int height; + protected Color transparent = null; // transparent color if given + protected boolean transparentExactMatch = false; // transparent color will be found by looking for the closest color + // or for the exact color if transparentExactMatch == true + protected Color background = null; // background color if given + protected int transIndex; // transparent index in color table + protected int repeat = -1; // no repeat + protected int delay = 0; // frame delay (hundredths) + protected boolean started = false; // ready to output frames + protected OutputStream out; + protected BufferedImage image; // current frame + protected byte[] pixels; // BGR byte array from frame + protected byte[] indexedPixels; // converted frame indexed to palette + protected int colorDepth; // number of bit planes + protected byte[] colorTab; // RGB palette + protected boolean[] usedEntry = new boolean[256]; // active palette entries + protected int palSize = 7; // color table size (bits-1) + protected int dispose = -1; // disposal code (-1 = use default) + protected boolean closeStream = false; // close stream when finished + protected boolean firstFrame = true; + protected boolean sizeSet = false; // if false, get size from first frame + protected int sample = 10; // default sample interval for quantizer + + /** + * Sets the delay time between each frame, or changes it + * for subsequent frames (applies to last frame added). + * + * @param ms int delay time in milliseconds + */ + public void setDelay(int ms) { + delay = Math.round(ms / 10.0f); + } + + /** + * Sets the GIF frame disposal code for the last added frame + * and any subsequent frames. Default is 0 if no transparent + * color has been set, otherwise 2. + * @param code int disposal code. + */ + public void setDispose(int code) { + if (code >= 0) { + dispose = code; + } + } + + /** + * Sets the number of times the set of GIF frames + * should be played. Default is 1; 0 means play + * indefinitely. Must be invoked before the first + * image is added. + * + * @param iter int number of iterations. + */ + public void setRepeat(int iter) { + if (iter >= 0) { + repeat = iter; + } + } + + /** + * Sets the transparent color for the last added frame + * and any subsequent frames. + * Since all colors are subject to modification + * in the quantization process, the color in the final + * palette for each frame closest to the given color + * becomes the transparent color for that frame. + * May be set to null to indicate no transparent color. + * + * @param c Color to be treated as transparent on display. + */ + public void setTransparent(Color c) { + setTransparent (c, false); + } + + /** + * Sets the transparent color for the last added frame + * and any subsequent frames. + * Since all colors are subject to modification + * in the quantization process, the color in the final + * palette for each frame closest to the given color + * becomes the transparent color for that frame. + * If exactMatch is set to true, transparent color index + * is search with exact match, and not looking for the + * closest one. + * May be set to null to indicate no transparent color. + * + * @param c Color to be treated as transparent on display. + */ + public void setTransparent(Color c, boolean exactMatch) { + transparent = c; + transparentExactMatch = exactMatch; + } + + + /** + * Sets the background color for the last added frame + * and any subsequent frames. + * Since all colors are subject to modification + * in the quantization process, the color in the final + * palette for each frame closest to the given color + * becomes the background color for that frame. + * May be set to null to indicate no background color + * which will default to black. + * + * @param c Color to be treated as background on display. + */ + public void setBackground(Color c) { + background = c; + } + + /** + * Adds next GIF frame. The frame is not written immediately, but is + * actually deferred until the next frame is received so that timing + * data can be inserted. Invoking finish() flushes all + * frames. If setSize was not invoked, the size of the + * first image is used for all subsequent frames. + * + * @param im BufferedImage containing frame to write. + * @return true if successful. + */ + public boolean addFrame(BufferedImage im) { + if ((im == null) || !started) { + return false; + } + boolean ok = true; + try { + if (!sizeSet) { + // use first frame's size + setSize(im.getWidth(), im.getHeight()); + } + image = im; + getImagePixels(); // convert to correct format if necessary + analyzePixels(); // build color table & map pixels + if (firstFrame) { + writeLSD(); // logical screen descriptior + writePalette(); // global color table + if (repeat >= 0) { + // use NS app extension to indicate reps + writeNetscapeExt(); + } + } + writeGraphicCtrlExt(); // write graphic control extension + writeImageDesc(); // image descriptor + if (!firstFrame) { + writePalette(); // local color table + } + writePixels(); // encode and write pixel data + firstFrame = false; + } catch (IOException e) { + ok = false; + } + + return ok; + } + + /** + * Flushes any pending data and closes output file. + * If writing to an OutputStream, the stream is not + * closed. + */ + public boolean finish() { + if (!started) return false; + boolean ok = true; + started = false; + try { + out.write(0x3b); // gif trailer + out.flush(); + if (closeStream) { + out.close(); + } + } catch (IOException e) { + ok = false; + } + + // reset for subsequent use + transIndex = 0; + out = null; + image = null; + pixels = null; + indexedPixels = null; + colorTab = null; + closeStream = false; + firstFrame = true; + + return ok; + } + + /** + * Sets frame rate in frames per second. Equivalent to + * setDelay(1000/fps). + * + * @param fps float frame rate (frames per second) + */ + public void setFrameRate(float fps) { + if (fps != 0f) { + delay = Math.round(100f / fps); + } + } + + /** + * Sets quality of color quantization (conversion of images + * to the maximum 256 colors allowed by the GIF specification). + * Lower values (minimum = 1) produce better colors, but slow + * processing significantly. 10 is the default, and produces + * good color mapping at reasonable speeds. Values greater + * than 20 do not yield significant improvements in speed. + * + * @param quality int greater than 0. + */ + public void setQuality(int quality) { + if (quality < 1) quality = 1; + sample = quality; + } + + /** + * Sets the GIF frame size. The default size is the + * size of the first frame added if this method is + * not invoked. + * + * @param w int frame width. + * @param h int frame width. + */ + public void setSize(int w, int h) { + if (started && !firstFrame) return; + width = w; + height = h; + if (width < 1) width = 320; + if (height < 1) height = 240; + sizeSet = true; + } + + /** + * Initiates GIF file creation on the given stream. The stream + * is not closed automatically. + * + * @param os OutputStream on which GIF images are written. + * @return false if initial write failed. + */ + public boolean start(OutputStream os) { + if (os == null) return false; + boolean ok = true; + closeStream = false; + out = os; + try { + writeString("GIF89a"); // header + } catch (IOException e) { + ok = false; + } + return started = ok; + } + + /** + * Initiates writing of a GIF file with the specified name. + * + * @param file String containing output file name. + * @return false if open or initial write failed. + */ + public boolean start(String file) { + boolean ok = true; + try { + out = new BufferedOutputStream(new FileOutputStream(file)); + ok = start(out); + closeStream = true; + } catch (IOException e) { + ok = false; + } + return started = ok; + } + + public boolean isStarted() { + return started; + } + + /** + * Analyzes image colors and creates color map. + */ + protected void analyzePixels() { + int len = pixels.length; + int nPix = len / 3; + indexedPixels = new byte[nPix]; + NeuQuant nq = new NeuQuant(pixels, len, sample); + // initialize quantizer + colorTab = nq.process(); // create reduced palette + // convert map from BGR to RGB + for (int i = 0; i < colorTab.length; i += 3) { + byte temp = colorTab[i]; + colorTab[i] = colorTab[i + 2]; + colorTab[i + 2] = temp; + usedEntry[i / 3] = false; + } + // map image pixels to new palette + int k = 0; + for (int i = 0; i < nPix; i++) { + int index = + nq.map(pixels[k++] & 0xff, + pixels[k++] & 0xff, + pixels[k++] & 0xff); + usedEntry[index] = true; + indexedPixels[i] = (byte) index; + } + pixels = null; + colorDepth = 8; + palSize = 7; + // get closest match to transparent color if specified + if (transparent != null) { + transIndex = transparentExactMatch ? findExact(transparent) : findClosest(transparent); + } + } + + /** + * Returns index of palette color closest to c + * + */ + protected int findClosest(Color c) { + if (colorTab == null) return -1; + int r = c.getRed(); + int g = c.getGreen(); + int b = c.getBlue(); + int minpos = 0; + int dmin = 256 * 256 * 256; + int len = colorTab.length; + for (int i = 0; i < len;) { + int dr = r - (colorTab[i++] & 0xff); + int dg = g - (colorTab[i++] & 0xff); + int db = b - (colorTab[i] & 0xff); + int d = dr * dr + dg * dg + db * db; + int index = i / 3; + if (usedEntry[index] && (d < dmin)) { + dmin = d; + minpos = index; + } + i++; + } + return minpos; + } + + /* + * Returns true if the exact matching color is existing, and used in the color palette, otherwise, return false. This method has to be called before + * finishing the image, because after finished the palette is destroyed and it will always return false. + */ + boolean isColorUsed(Color c) { + return findExact(c) != -1; + } + + /** + * Returns index of palette exactly matching to color c or -1 if there is no exact matching. + * + */ + protected int findExact(Color c) { + if (colorTab == null) { + return -1; + } + + int r = c.getRed(); + int g = c.getGreen(); + int b = c.getBlue(); + int len = colorTab.length / 3; + for (int index = 0; index < len; ++index) { + int i = index * 3; + // If the entry is used in colorTab, then check if it is the same exact color we're looking for + if (usedEntry[index] && r == (colorTab[i] & 0xff) && g == (colorTab[i+1] & 0xff) && b == (colorTab[i+2] & 0xff)) { + return index; + } + } + return -1; + } + + /** + * Extracts image pixels into byte array "pixels" + */ + protected void getImagePixels() { + int w = image.getWidth(); + int h = image.getHeight(); + int type = image.getType(); + if ((w != width) + || (h != height) + || (type != BufferedImage.TYPE_3BYTE_BGR)) { + // create new image with right size/format + BufferedImage temp = + new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR); + Graphics2D g = temp.createGraphics(); + g.setColor(background); + g.fillRect(0, 0, width, height); + g.drawImage(image, 0, 0, null); + image = temp; + } + pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData(); + } + + /** + * Writes Graphic Control Extension + */ + protected void writeGraphicCtrlExt() throws IOException { + out.write(0x21); // extension introducer + out.write(0xf9); // GCE label + out.write(4); // data block size + int transp, disp; + if (transparent == null) { + transp = 0; + disp = 0; // dispose = no action + } else { + transp = 1; + disp = 2; // force clear if using transparent color + } + if (dispose >= 0) { + disp = dispose & 7; // user override + } + disp <<= 2; + + // packed fields + out.write(0 | // 1:3 reserved + disp | // 4:6 disposal + 0 | // 7 user input - 0 = none + transp); // 8 transparency flag + + writeShort(delay); // delay x 1/100 sec + out.write(transIndex); // transparent color index + out.write(0); // block terminator + } + + /** + * Writes Image Descriptor + */ + protected void writeImageDesc() throws IOException { + out.write(0x2c); // image separator + writeShort(0); // image position x,y = 0,0 + writeShort(0); + writeShort(width); // image size + writeShort(height); + // packed fields + if (firstFrame) { + // no LCT - GCT is used for first (or only) frame + out.write(0); + } else { + // specify normal LCT + out.write(0x80 | // 1 local color table 1=yes + 0 | // 2 interlace - 0=no + 0 | // 3 sorted - 0=no + 0 | // 4-5 reserved + palSize); // 6-8 size of color table + } + } + + /** + * Writes Logical Screen Descriptor + */ + protected void writeLSD() throws IOException { + // logical screen size + writeShort(width); + writeShort(height); + // packed fields + out.write((0x80 | // 1 : global color table flag = 1 (gct used) + 0x70 | // 2-4 : color resolution = 7 + 0x00 | // 5 : gct sort flag = 0 + palSize)); // 6-8 : gct size + + out.write(0); // background color index + out.write(0); // pixel aspect ratio - assume 1:1 + } + + /** + * Writes Netscape application extension to define + * repeat count. + */ + protected void writeNetscapeExt() throws IOException { + out.write(0x21); // extension introducer + out.write(0xff); // app extension label + out.write(11); // block size + writeString("NETSCAPE" + "2.0"); // app id + auth code + out.write(3); // sub-block size + out.write(1); // loop sub-block id + writeShort(repeat); // loop count (extra iterations, 0=repeat forever) + out.write(0); // block terminator + } + + /** + * Writes color table + */ + protected void writePalette() throws IOException { + out.write(colorTab, 0, colorTab.length); + int n = (3 * 256) - colorTab.length; + for (int i = 0; i < n; i++) { + out.write(0); + } + } + + /** + * Encodes and writes pixel data + */ + protected void writePixels() throws IOException { + LZWEncoder encoder = + new LZWEncoder(width, height, indexedPixels, colorDepth); + encoder.encode(out); + } + + /** + * Write 16-bit value to output stream, LSB first + */ + protected void writeShort(int value) throws IOException { + out.write(value & 0xff); + out.write((value >> 8) & 0xff); + } + + /** + * Writes string to output stream + */ + protected void writeString(String s) throws IOException { + for (int i = 0; i < s.length(); i++) { + out.write((byte) s.charAt(i)); + } + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/utils/GifDecoder.java b/src/com/fr/plugin/cool/cartnoon/utils/GifDecoder.java new file mode 100644 index 0000000..8495638 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/utils/GifDecoder.java @@ -0,0 +1,783 @@ +package com.fr.plugin.cool.cartnoon.utils; + +import java.net.*; +import java.io.*; +import java.util.*; +import java.awt.*; +import java.awt.image.*; + +/** + * Class GifDecoder - Decodes a GIF file into one or more frames. + * + * Example: + * + * 
+ * {@code
+ *    GifDecoder d = new GifDecoder();
+ *    d.read("sample.gif");
+ *    int n = d.getFrameCount();
+ *    for (int i = 0; i < n; i++) {
+ *       BufferedImage frame = d.getFrame(i);  // frame i
+ *       int t = d.getDelay(i);  // display duration of frame in milliseconds
+ *       // do something with frame
+ *    }
+ * }
+ *
+ * No copyright asserted on the source code of this class. May be used for + * any purpose, however, refer to the Unisys LZW patent for any additional + * restrictions. Please forward any corrections to questions at fmsware.com. + * + * @author Kevin Weiner, FM Software; LZW decoder adapted from John Cristy's ImageMagick. + * @version 1.03 November 2003 + * + */ + +public class GifDecoder { + + /** + * File read status: No errors. + */ + public static final int STATUS_OK = 0; + + /** + * File read status: Error decoding file (may be partially decoded) + */ + public static final int STATUS_FORMAT_ERROR = 1; + + /** + * File read status: Unable to open source. + */ + public static final int STATUS_OPEN_ERROR = 2; + + protected BufferedInputStream in; + protected int status; + + protected int width; // full image width + protected int height; // full image height + protected boolean gctFlag; // global color table used + protected int gctSize; // size of global color table + protected int loopCount = 1; // iterations; 0 = repeat forever + + protected int[] gct; // global color table + protected int[] lct; // local color table + protected int[] act; // active color table + + protected int bgIndex; // background color index + protected int bgColor; // background color + protected int lastBgColor; // previous bg color + protected int pixelAspect; // pixel aspect ratio + + protected boolean lctFlag; // local color table flag + protected boolean interlace; // interlace flag + protected int lctSize; // local color table size + + protected int ix, iy, iw, ih; // current image rectangle + protected Rectangle lastRect; // last image rect + protected BufferedImage image; // current frame + protected BufferedImage lastImage; // previous frame + + protected byte[] block = new byte[256]; // current data block + protected int blockSize = 0; // block size + + // last graphic control extension info + protected int dispose = 0; + // 0=no action; 1=leave in place; 2=restore to bg; 3=restore to prev + protected int lastDispose = 0; + protected boolean transparency = false; // use transparent color + protected int delay = 0; // delay in milliseconds + protected int transIndex; // transparent color index + + protected static final int MaxStackSize = 4096; + // max decoder pixel stack size + + // LZW decoder working arrays + protected short[] prefix; + protected byte[] suffix; + protected byte[] pixelStack; + protected byte[] pixels; + + protected ArrayList frames; // frames read from current file + protected int frameCount; + + static class GifFrame { + public GifFrame(BufferedImage im, int del) { + image = im; + delay = del; + } + public BufferedImage image; + public int delay; + } + + /** + * Gets display duration for specified frame. + * + * @param n int index of frame + * @return delay in milliseconds + */ + public int getDelay(int n) { + // + delay = -1; + if ((n >= 0) && (n < frameCount)) { + delay = ((GifFrame) frames.get(n)).delay; + } + return delay; + } + + /** + * Gets the number of frames read from file. + * @return frame count + */ + public int getFrameCount() { + return frameCount; + } + + /** + * Gets the first (or only) image read. + * + * @return BufferedImage containing first frame, or null if none. + */ + public BufferedImage getImage() { + return getFrame(0); + } + + /** + * Gets the "Netscape" iteration count, if any. + * A count of 0 means repeat indefinitiely. + * + * @return iteration count if one was specified, else 1. + */ + public int getLoopCount() { + return loopCount; + } + + /** + * Creates new frame image from current data (and previous + * frames as specified by their disposition codes). + */ + protected void setPixels() { + // expose destination image's pixels as int array + int[] dest = + ((DataBufferInt) image.getRaster().getDataBuffer()).getData(); + + // fill in starting image contents based on last image's dispose code + if (lastDispose > 0) { + if (lastDispose == 3) { + // use image before last + int n = frameCount - 2; + if (n > 0) { + lastImage = getFrame(n - 1); + } else { + lastImage = null; + } + } + + if (lastImage != null) { + int[] prev = + ((DataBufferInt) lastImage.getRaster().getDataBuffer()).getData(); + System.arraycopy(prev, 0, dest, 0, width * height); + // copy pixels + + if (lastDispose == 2) { + // fill last image rect area with background color + Graphics2D g = image.createGraphics(); + Color c = null; + if (transparency) { + c = new Color(0, 0, 0, 0); // assume background is transparent + } else { + c = new Color(lastBgColor); // use given background color + } + g.setColor(c); + g.setComposite(AlphaComposite.Src); // replace area + g.fill(lastRect); + g.dispose(); + } + } + } + + // copy each source line to the appropriate place in the destination + int pass = 1; + int inc = 8; + int iline = 0; + for (int i = 0; i < ih; i++) { + int line = i; + if (interlace) { + if (iline >= ih) { + pass++; + switch (pass) { + case 2 : + iline = 4; + break; + case 3 : + iline = 2; + inc = 4; + break; + case 4 : + iline = 1; + inc = 2; + } + } + line = iline; + iline += inc; + } + line += iy; + if (line < height) { + int k = line * width; + int dx = k + ix; // start of line in dest + int dlim = dx + iw; // end of dest line + if ((k + width) < dlim) { + dlim = k + width; // past dest edge + } + int sx = i * iw; // start of line in source + while (dx < dlim) { + // map color and insert in destination + int index = ((int) pixels[sx++]) & 0xff; + int c = act[index]; + if (c != 0) { + dest[dx] = c; + } + dx++; + } + } + } + } + + /** + * Gets the image contents of frame n. + * + * @return BufferedImage representation of frame, or null if n is invalid. + */ + public BufferedImage getFrame(int n) { + BufferedImage im = null; + if ((n >= 0) && (n < frameCount)) { + im = ((GifFrame) frames.get(n)).image; + } + return im; + } + + /** + * Gets image size. + * + * @return GIF image dimensions + */ + public Dimension getFrameSize() { + return new Dimension(width, height); + } + + /** + * Reads GIF image from stream + * + * @param is BufferedInputStream containing GIF file. + * @return read status code (0 = no errors) + */ + public int read(BufferedInputStream is) { + init(); + if (is != null) { + in = is; + readHeader(); + if (!err()) { + readContents(); + if (frameCount < 0) { + status = STATUS_FORMAT_ERROR; + } + } + } else { + status = STATUS_OPEN_ERROR; + } + try { + is.close(); + } catch (IOException e) { + } + return status; + } + + /** + * Reads GIF image from stream + * + * @param is InputStream containing GIF file. + * @return read status code (0 = no errors) + */ + public int read(InputStream is) { + init(); + if (is != null) { + if (!(is instanceof BufferedInputStream)) + is = new BufferedInputStream(is); + in = (BufferedInputStream) is; + readHeader(); + if (!err()) { + readContents(); + if (frameCount < 0) { + status = STATUS_FORMAT_ERROR; + } + } + } else { + status = STATUS_OPEN_ERROR; + } + try { + is.close(); + } catch (IOException e) { + } + return status; + } + + /** + * Reads GIF file from specified file/URL source + * (URL assumed if name contains ":/" or "file:") + * + * @param name String containing source + * @return read status code (0 = no errors) + */ + public int read(String name) { + status = STATUS_OK; + try { + name = name.trim().toLowerCase(); + if ((name.indexOf("file:") >= 0) || + (name.indexOf(":/") > 0)) { + URL url = new URL(name); + in = new BufferedInputStream(url.openStream()); + } else { + in = new BufferedInputStream(new FileInputStream(name)); + } + status = read(in); + } catch (IOException e) { + status = STATUS_OPEN_ERROR; + } + + return status; + } + + /** + * Decodes LZW image data into pixel array. + * Adapted from John Cristy's ImageMagick. + */ + protected void decodeImageData() { + int NullCode = -1; + int npix = iw * ih; + int available, + clear, + code_mask, + code_size, + end_of_information, + in_code, + old_code, + bits, + code, + count, + i, + datum, + data_size, + first, + top, + bi, + pi; + + if ((pixels == null) || (pixels.length < npix)) { + pixels = new byte[npix]; // allocate new pixel array + } + if (prefix == null) prefix = new short[MaxStackSize]; + if (suffix == null) suffix = new byte[MaxStackSize]; + if (pixelStack == null) pixelStack = new byte[MaxStackSize + 1]; + + // Initialize GIF data stream decoder. + + data_size = read(); + clear = 1 << data_size; + end_of_information = clear + 1; + available = clear + 2; + old_code = NullCode; + code_size = data_size + 1; + code_mask = (1 << code_size) - 1; + for (code = 0; code < clear; code++) { + prefix[code] = 0; + suffix[code] = (byte) code; + } + + // Decode GIF pixel stream. + + datum = bits = count = first = top = pi = bi = 0; + + for (i = 0; i < npix;) { + if (top == 0) { + if (bits < code_size) { + // Load bytes until there are enough bits for a code. + if (count == 0) { + // Read a new data block. + count = readBlock(); + if (count <= 0) + break; + bi = 0; + } + datum += (((int) block[bi]) & 0xff) << bits; + bits += 8; + bi++; + count--; + continue; + } + + // Get the next code. + + code = datum & code_mask; + datum >>= code_size; + bits -= code_size; + + // Interpret the code + + if ((code > available) || (code == end_of_information)) + break; + if (code == clear) { + // Reset decoder. + code_size = data_size + 1; + code_mask = (1 << code_size) - 1; + available = clear + 2; + old_code = NullCode; + continue; + } + if (old_code == NullCode) { + pixelStack[top++] = suffix[code]; + old_code = code; + first = code; + continue; + } + in_code = code; + if (code == available) { + pixelStack[top++] = (byte) first; + code = old_code; + } + while (code > clear) { + pixelStack[top++] = suffix[code]; + code = prefix[code]; + } + first = ((int) suffix[code]) & 0xff; + + // Add a new string to the string table, + + if (available >= MaxStackSize) { + pixelStack[top++] = (byte) first; + continue; + } + pixelStack[top++] = (byte) first; + prefix[available] = (short) old_code; + suffix[available] = (byte) first; + available++; + if (((available & code_mask) == 0) + && (available < MaxStackSize)) { + code_size++; + code_mask += available; + } + old_code = in_code; + } + + // Pop a pixel off the pixel stack. + + top--; + pixels[pi++] = pixelStack[top]; + i++; + } + + for (i = pi; i < npix; i++) { + pixels[i] = 0; // clear missing pixels + } + + } + + /** + * Returns true if an error was encountered during reading/decoding + */ + protected boolean err() { + return status != STATUS_OK; + } + + /** + * Initializes or re-initializes reader + */ + protected void init() { + status = STATUS_OK; + frameCount = 0; + frames = new ArrayList(); + gct = null; + lct = null; + } + + /** + * Reads a single byte from the input stream. + */ + protected int read() { + int curByte = 0; + try { + curByte = in.read(); + } catch (IOException e) { + status = STATUS_FORMAT_ERROR; + } + return curByte; + } + + /** + * Reads next variable length block from input. + * + * @return number of bytes stored in "buffer" + */ + protected int readBlock() { + blockSize = read(); + int n = 0; + if (blockSize > 0) { + try { + int count = 0; + while (n < blockSize) { + count = in.read(block, n, blockSize - n); + if (count == -1) + break; + n += count; + } + } catch (IOException e) { + } + + if (n < blockSize) { + status = STATUS_FORMAT_ERROR; + } + } + return n; + } + + /** + * Reads color table as 256 RGB integer values + * + * @param ncolors int number of colors to read + * @return int array containing 256 colors (packed ARGB with full alpha) + */ + protected int[] readColorTable(int ncolors) { + int nbytes = 3 * ncolors; + int[] tab = null; + byte[] c = new byte[nbytes]; + int n = 0; + try { + n = in.read(c); + } catch (IOException e) { + } + if (n < nbytes) { + status = STATUS_FORMAT_ERROR; + } else { + tab = new int[256]; // max size to avoid bounds checks + int i = 0; + int j = 0; + while (i < ncolors) { + int r = ((int) c[j++]) & 0xff; + int g = ((int) c[j++]) & 0xff; + int b = ((int) c[j++]) & 0xff; + tab[i++] = 0xff000000 | (r << 16) | (g << 8) | b; + } + } + return tab; + } + + /** + * Main file parser. Reads GIF content blocks. + */ + protected void readContents() { + // read GIF file content blocks + boolean done = false; + while (!(done || err())) { + int code = read(); + switch (code) { + + case 0x2C : // image separator + readImage(); + break; + + case 0x21 : // extension + code = read(); + switch (code) { + case 0xf9 : // graphics control extension + readGraphicControlExt(); + break; + + case 0xff : // application extension + readBlock(); + String app = ""; + for (int i = 0; i < 11; i++) { + app += (char) block[i]; + } + if (app.equals("NETSCAPE2.0")) { + readNetscapeExt(); + } + else + skip(); // don't care + break; + + default : // uninteresting extension + skip(); + } + break; + + case 0x3b : // terminator + done = true; + break; + + case 0x00 : // bad byte, but keep going and see what happens + break; + + default : + status = STATUS_FORMAT_ERROR; + } + } + } + + /** + * Reads Graphics Control Extension values + */ + protected void readGraphicControlExt() { + read(); // block size + int packed = read(); // packed fields + dispose = (packed & 0x1c) >> 2; // disposal method + if (dispose == 0) { + dispose = 1; // elect to keep old image if discretionary + } + transparency = (packed & 1) != 0; + delay = readShort() * 10; // delay in milliseconds + transIndex = read(); // transparent color index + read(); // block terminator + } + + /** + * Reads GIF file header information. + */ + protected void readHeader() { + String id = ""; + for (int i = 0; i < 6; i++) { + id += (char) read(); + } + if (!id.startsWith("GIF")) { + status = STATUS_FORMAT_ERROR; + return; + } + + readLSD(); + if (gctFlag && !err()) { + gct = readColorTable(gctSize); + bgColor = gct[bgIndex]; + } + } + + /** + * Reads next frame image + */ + protected void readImage() { + ix = readShort(); // (sub)image position & size + iy = readShort(); + iw = readShort(); + ih = readShort(); + + int packed = read(); + lctFlag = (packed & 0x80) != 0; // 1 - local color table flag + interlace = (packed & 0x40) != 0; // 2 - interlace flag + // 3 - sort flag + // 4-5 - reserved + lctSize = 2 << (packed & 7); // 6-8 - local color table size + + if (lctFlag) { + lct = readColorTable(lctSize); // read table + act = lct; // make local table active + } else { + act = gct; // make global table active + if (bgIndex == transIndex) + bgColor = 0; + } + int save = 0; + if (transparency) { + save = act[transIndex]; + act[transIndex] = 0; // set transparent color if specified + } + + if (act == null) { + status = STATUS_FORMAT_ERROR; // no color table defined + } + + if (err()) return; + + decodeImageData(); // decode pixel data + skip(); + + if (err()) return; + + frameCount++; + + // create new image to receive frame data + image = + new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB_PRE); + + setPixels(); // transfer pixel data to image + + frames.add(new GifFrame(image, delay)); // add image to frame list + + if (transparency) { + act[transIndex] = save; + } + resetFrame(); + + } + + /** + * Reads Logical Screen Descriptor + */ + protected void readLSD() { + + // logical screen size + width = readShort(); + height = readShort(); + + // packed fields + int packed = read(); + gctFlag = (packed & 0x80) != 0; // 1 : global color table flag + // 2-4 : color resolution + // 5 : gct sort flag + gctSize = 2 << (packed & 7); // 6-8 : gct size + + bgIndex = read(); // background color index + pixelAspect = read(); // pixel aspect ratio + } + + /** + * Reads Netscape extenstion to obtain iteration count + */ + protected void readNetscapeExt() { + do { + readBlock(); + if (block[0] == 1) { + // loop count sub-block + int b1 = ((int) block[1]) & 0xff; + int b2 = ((int) block[2]) & 0xff; + loopCount = (b2 << 8) | b1; + } + } while ((blockSize > 0) && !err()); + } + + /** + * Reads next 16-bit value, LSB first + */ + protected int readShort() { + // read 16-bit value, LSB first + return read() | (read() << 8); + } + + /** + * Resets frame state for reading next image. + */ + protected void resetFrame() { + lastDispose = dispose; + lastRect = new Rectangle(ix, iy, iw, ih); + lastImage = image; + lastBgColor = bgColor; + int dispose = 0; + boolean transparency = false; + int delay = 0; + lct = null; + } + + /** + * Skips variable length blocks up to and including + * next zero length block. + */ + protected void skip() { + do { + readBlock(); + } while ((blockSize > 0) && !err()); + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/utils/LZWEncoder.java b/src/com/fr/plugin/cool/cartnoon/utils/LZWEncoder.java new file mode 100644 index 0000000..98b9fb0 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/utils/LZWEncoder.java @@ -0,0 +1,303 @@ +package com.fr.plugin.cool.cartnoon.utils; + +import java.io.OutputStream; +import java.io.IOException; + +//============================================================================== +// Adapted from Jef Poskanzer's Java port by way of J. M. G. Elliott. +// K Weiner 12/00 + +class LZWEncoder { + + private static final int EOF = -1; + + private int imgW, imgH; + private byte[] pixAry; + private int initCodeSize; + private int remaining; + private int curPixel; + + // GIFCOMPR.C - GIF Image compression routines + // + // Lempel-Ziv compression based on 'compress'. GIF modifications by + // David Rowley (mgardi@watdcsu.waterloo.edu) + + // General DEFINEs + + static final int BITS = 12; + + static final int HSIZE = 5003; // 80% occupancy + + // GIF Image compression - modified 'compress' + // + // Based on: compress.c - File compression ala IEEE Computer, June 1984. + // + // By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas) + // Jim McKie (decvax!mcvax!jim) + // Steve Davies (decvax!vax135!petsd!peora!srd) + // Ken Turkowski (decvax!decwrl!turtlevax!ken) + // James A. Woods (decvax!ihnp4!ames!jaw) + // Joe Orost (decvax!vax135!petsd!joe) + + int n_bits; // number of bits/code + int maxbits = BITS; // user settable max # bits/code + int maxcode; // maximum code, given n_bits + int maxmaxcode = 1 << BITS; // should NEVER generate this code + + int[] htab = new int[HSIZE]; + int[] codetab = new int[HSIZE]; + + int hsize = HSIZE; // for dynamic table sizing + + int free_ent = 0; // first unused entry + + // block compression parameters -- after all codes are used up, + // and compression rate changes, start over. + boolean clear_flg = false; + + // Algorithm: use open addressing double hashing (no chaining) on the + // prefix code / next character combination. We do a variant of Knuth's + // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime + // secondary probe. Here, the modular division first probe is gives way + // to a faster exclusive-or manipulation. Also do block compression with + // an adaptive reset, whereby the code table is cleared when the compression + // ratio decreases, but after the table fills. The variable-length output + // codes are re-sized at this point, and a special CLEAR code is generated + // for the decompressor. Late addition: construct the table according to + // file size for noticeable speed improvement on small files. Please direct + // questions about this implementation to ames!jaw. + + int g_init_bits; + + int ClearCode; + int EOFCode; + + // output + // + // Output the given code. + // Inputs: + // code: A n_bits-bit integer. If == -1, then EOF. This assumes + // that n_bits =< wordsize - 1. + // Outputs: + // Outputs code to the file. + // Assumptions: + // Chars are 8 bits long. + // Algorithm: + // Maintain a BITS character long buffer (so that 8 codes will + // fit in it exactly). Use the VAX insv instruction to insert each + // code in turn. When the buffer fills up empty it and start over. + + int cur_accum = 0; + int cur_bits = 0; + + int masks[] = + { + 0x0000, + 0x0001, + 0x0003, + 0x0007, + 0x000F, + 0x001F, + 0x003F, + 0x007F, + 0x00FF, + 0x01FF, + 0x03FF, + 0x07FF, + 0x0FFF, + 0x1FFF, + 0x3FFF, + 0x7FFF, + 0xFFFF }; + + // Number of characters so far in this 'packet' + int a_count; + + // Define the storage for the packet accumulator + byte[] accum = new byte[256]; + + //---------------------------------------------------------------------------- + LZWEncoder(int width, int height, byte[] pixels, int color_depth) { + imgW = width; + imgH = height; + pixAry = pixels; + initCodeSize = Math.max(2, color_depth); + } + + // Add a character to the end of the current packet, and if it is 254 + // characters, flush the packet to disk. + void char_out(byte c, OutputStream outs) throws IOException { + accum[a_count++] = c; + if (a_count >= 254) + flush_char(outs); + } + + // Clear out the hash table + + // table clear for block compress + void cl_block(OutputStream outs) throws IOException { + cl_hash(hsize); + free_ent = ClearCode + 2; + clear_flg = true; + + output(ClearCode, outs); + } + + // reset code table + void cl_hash(int hsize) { + for (int i = 0; i < hsize; ++i) + htab[i] = -1; + } + + void compress(int init_bits, OutputStream outs) throws IOException { + int fcode; + int i /* = 0 */; + int c; + int ent; + int disp; + int hsize_reg; + int hshift; + + // Set up the globals: g_init_bits - initial number of bits + g_init_bits = init_bits; + + // Set up the necessary values + clear_flg = false; + n_bits = g_init_bits; + maxcode = MAXCODE(n_bits); + + ClearCode = 1 << (init_bits - 1); + EOFCode = ClearCode + 1; + free_ent = ClearCode + 2; + + a_count = 0; // clear packet + + ent = nextPixel(); + + hshift = 0; + for (fcode = hsize; fcode < 65536; fcode *= 2) + ++hshift; + hshift = 8 - hshift; // set hash code range bound + + hsize_reg = hsize; + cl_hash(hsize_reg); // clear hash table + + output(ClearCode, outs); + + outer_loop : while ((c = nextPixel()) != EOF) { + fcode = (c << maxbits) + ent; + i = (c << hshift) ^ ent; // xor hashing + + if (htab[i] == fcode) { + ent = codetab[i]; + continue; + } else if (htab[i] >= 0) // non-empty slot + { + disp = hsize_reg - i; // secondary hash (after G. Knott) + if (i == 0) + disp = 1; + do { + if ((i -= disp) < 0) + i += hsize_reg; + + if (htab[i] == fcode) { + ent = codetab[i]; + continue outer_loop; + } + } while (htab[i] >= 0); + } + output(ent, outs); + ent = c; + if (free_ent < maxmaxcode) { + codetab[i] = free_ent++; // code -> hashtable + htab[i] = fcode; + } else + cl_block(outs); + } + // Put out the final code. + output(ent, outs); + output(EOFCode, outs); + } + + //---------------------------------------------------------------------------- + void encode(OutputStream os) throws IOException { + os.write(initCodeSize); // write "initial code size" byte + + remaining = imgW * imgH; // reset navigation variables + curPixel = 0; + + compress(initCodeSize + 1, os); // compress and write the pixel data + + os.write(0); // write block terminator + } + + // Flush the packet to disk, and reset the accumulator + void flush_char(OutputStream outs) throws IOException { + if (a_count > 0) { + outs.write(a_count); + outs.write(accum, 0, a_count); + a_count = 0; + } + } + + final int MAXCODE(int n_bits) { + return (1 << n_bits) - 1; + } + + //---------------------------------------------------------------------------- + // Return the next pixel from the image + //---------------------------------------------------------------------------- + private int nextPixel() { + if (remaining == 0) + return EOF; + + --remaining; + + byte pix = pixAry[curPixel++]; + + return pix & 0xff; + } + + void output(int code, OutputStream outs) throws IOException { + cur_accum &= masks[cur_bits]; + + if (cur_bits > 0) + cur_accum |= (code << cur_bits); + else + cur_accum = code; + + cur_bits += n_bits; + + while (cur_bits >= 8) { + char_out((byte) (cur_accum & 0xff), outs); + cur_accum >>= 8; + cur_bits -= 8; + } + + // If the next entry is going to be too big for the code size, + // then increase it, if possible. + if (free_ent > maxcode || clear_flg) { + if (clear_flg) { + maxcode = MAXCODE(n_bits = g_init_bits); + clear_flg = false; + } else { + ++n_bits; + if (n_bits == maxbits) + maxcode = maxmaxcode; + else + maxcode = MAXCODE(n_bits); + } + } + + if (code == EOFCode) { + // At EOF, write the rest of the buffer. + while (cur_bits > 0) { + char_out((byte) (cur_accum & 0xff), outs); + cur_accum >>= 8; + cur_bits -= 8; + } + + flush_char(outs); + } + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/utils/NeuQuant.java b/src/com/fr/plugin/cool/cartnoon/utils/NeuQuant.java new file mode 100644 index 0000000..356f45c --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/utils/NeuQuant.java @@ -0,0 +1,459 @@ +package com.fr.plugin.cool.cartnoon.utils; + +/* NeuQuant Neural-Net Quantization Algorithm + * ------------------------------------------ + * + * Copyright (c) 1994 Anthony Dekker + * + * NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. + * See "Kohonen neural networks for optimal colour quantization" + * in "Network: Computation in Neural Systems" Vol. 5 (1994) pp 351-367. + * for a discussion of the algorithm. + * + * Any party obtaining a copy of these files from the author, directly or + * indirectly, is granted, free of charge, a full and unrestricted irrevocable, + * world-wide, paid up, royalty-free, nonexclusive right and license to deal + * in this software and documentation files (the "Software"), including without + * limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons who receive + * copies from any such party to do so, with the only requirement being + * that this copyright notice remain intact. + */ + +// Ported to Java 12/00 K Weiner + +public class NeuQuant { + + protected static final int netsize = 256; /* number of colours used */ + + /* four primes near 500 - assume no image has a length so large */ + /* that it is divisible by all four primes */ + protected static final int prime1 = 499; + protected static final int prime2 = 491; + protected static final int prime3 = 487; + protected static final int prime4 = 503; + + protected static final int minpicturebytes = (3 * prime4); + /* minimum size for input image */ + + /* Program Skeleton + ---------------- + [select samplefac in range 1..30] + [read image from input file] + pic = (unsigned char*) malloc(3*width*height); + initnet(pic,3*width*height,samplefac); + learn(); + unbiasnet(); + [write output image header, using writecolourmap(f)] + inxbuild(); + write output image using inxsearch(b,g,r) */ + + /* Network Definitions + ------------------- */ + + protected static final int maxnetpos = (netsize - 1); + protected static final int netbiasshift = 4; /* bias for colour values */ + protected static final int ncycles = 100; /* no. of learning cycles */ + + /* defs for freq and bias */ + protected static final int intbiasshift = 16; /* bias for fractions */ + protected static final int intbias = (((int) 1) << intbiasshift); + protected static final int gammashift = 10; /* gamma = 1024 */ + protected static final int gamma = (((int) 1) << gammashift); + protected static final int betashift = 10; + protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */ + protected static final int betagamma = + (intbias << (gammashift - betashift)); + + /* defs for decreasing radius factor */ + protected static final int initrad = (netsize >> 3); /* for 256 cols, radius starts */ + protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */ + protected static final int radiusbias = (((int) 1) << radiusbiasshift); + protected static final int initradius = (initrad * radiusbias); /* and decreases by a */ + protected static final int radiusdec = 30; /* factor of 1/30 each cycle */ + + /* defs for decreasing alpha factor */ + protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */ + protected static final int initalpha = (((int) 1) << alphabiasshift); + + protected int alphadec; /* biased by 10 bits */ + + /* radbias and alpharadbias used for radpower calculation */ + protected static final int radbiasshift = 8; + protected static final int radbias = (((int) 1) << radbiasshift); + protected static final int alpharadbshift = (alphabiasshift + radbiasshift); + protected static final int alpharadbias = (((int) 1) << alpharadbshift); + + /* Types and Global Variables + -------------------------- */ + + protected byte[] thepicture; /* the input image itself */ + protected int lengthcount; /* lengthcount = H*W*3 */ + + protected int samplefac; /* sampling factor 1..30 */ + + // typedef int pixel[4]; /* BGRc */ + protected int[][] network; /* the network itself - [netsize][4] */ + + protected int[] netindex = new int[256]; + /* for network lookup - really 256 */ + + protected int[] bias = new int[netsize]; + /* bias and freq arrays for learning */ + protected int[] freq = new int[netsize]; + protected int[] radpower = new int[initrad]; + /* radpower for precomputation */ + + /* Initialise network in range (0,0,0) to (255,255,255) and set parameters + ----------------------------------------------------------------------- */ + public NeuQuant(byte[] thepic, int len, int sample) { + + int i; + int[] p; + + thepicture = thepic; + lengthcount = len; + samplefac = sample; + + network = new int[netsize][]; + for (i = 0; i < netsize; i++) { + network[i] = new int[4]; + p = network[i]; + p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize; + freq[i] = intbias / netsize; /* 1/netsize */ + bias[i] = 0; + } + } + + public byte[] colorMap() { + byte[] map = new byte[3 * netsize]; + int[] index = new int[netsize]; + for (int i = 0; i < netsize; i++) + index[network[i][3]] = i; + int k = 0; + for (int i = 0; i < netsize; i++) { + int j = index[i]; + map[k++] = (byte) (network[j][0]); + map[k++] = (byte) (network[j][1]); + map[k++] = (byte) (network[j][2]); + } + return map; + } + + /* Insertion sort of network and building of netindex[0..255] (to do after unbias) + ------------------------------------------------------------------------------- */ + public void inxbuild() { + + int i, j, smallpos, smallval; + int[] p; + int[] q; + int previouscol, startpos; + + previouscol = 0; + startpos = 0; + for (i = 0; i < netsize; i++) { + p = network[i]; + smallpos = i; + smallval = p[1]; /* index on g */ + /* find smallest in i..netsize-1 */ + for (j = i + 1; j < netsize; j++) { + q = network[j]; + if (q[1] < smallval) { /* index on g */ + smallpos = j; + smallval = q[1]; /* index on g */ + } + } + q = network[smallpos]; + /* swap p (i) and q (smallpos) entries */ + if (i != smallpos) { + j = q[0]; + q[0] = p[0]; + p[0] = j; + j = q[1]; + q[1] = p[1]; + p[1] = j; + j = q[2]; + q[2] = p[2]; + p[2] = j; + j = q[3]; + q[3] = p[3]; + p[3] = j; + } + /* smallval entry is now in position i */ + if (smallval != previouscol) { + netindex[previouscol] = (startpos + i) >> 1; + for (j = previouscol + 1; j < smallval; j++) + netindex[j] = i; + previouscol = smallval; + startpos = i; + } + } + netindex[previouscol] = (startpos + maxnetpos) >> 1; + for (j = previouscol + 1; j < 256; j++) + netindex[j] = maxnetpos; /* really 256 */ + } + + /* Main Learning Loop + ------------------ */ + public void learn() { + + int i, j, b, g, r; + int radius, rad, alpha, step, delta, samplepixels; + byte[] p; + int pix, lim; + + if (lengthcount < minpicturebytes) + samplefac = 1; + alphadec = 30 + ((samplefac - 1) / 3); + p = thepicture; + pix = 0; + lim = lengthcount; + samplepixels = lengthcount / (3 * samplefac); + delta = samplepixels / ncycles; + alpha = initalpha; + radius = initradius; + + rad = radius >> radiusbiasshift; + if (rad <= 1) + rad = 0; + for (i = 0; i < rad; i++) + radpower[i] = + alpha * (((rad * rad - i * i) * radbias) / (rad * rad)); + + //fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad); + + if (lengthcount < minpicturebytes) + step = 3; + else if ((lengthcount % prime1) != 0) + step = 3 * prime1; + else { + if ((lengthcount % prime2) != 0) + step = 3 * prime2; + else { + if ((lengthcount % prime3) != 0) + step = 3 * prime3; + else + step = 3 * prime4; + } + } + + i = 0; + while (i < samplepixels) { + b = (p[pix + 0] & 0xff) << netbiasshift; + g = (p[pix + 1] & 0xff) << netbiasshift; + r = (p[pix + 2] & 0xff) << netbiasshift; + j = contest(b, g, r); + + altersingle(alpha, j, b, g, r); + if (rad != 0) + alterneigh(rad, j, b, g, r); /* alter neighbours */ + + pix += step; + if (pix >= lim) + pix -= lengthcount; + + i++; + if (delta == 0) + delta = 1; + if (i % delta == 0) { + alpha -= alpha / alphadec; + radius -= radius / radiusdec; + rad = radius >> radiusbiasshift; + if (rad <= 1) + rad = 0; + for (j = 0; j < rad; j++) + radpower[j] = + alpha * (((rad * rad - j * j) * radbias) / (rad * rad)); + } + } + //fprintf(stderr,"finished 1D learning: final alpha=%f !\n",((float)alpha)/initalpha); + } + + /* Search for BGR values 0..255 (after net is unbiased) and return colour index + ---------------------------------------------------------------------------- */ + public int map(int b, int g, int r) { + + int i, j, dist, a, bestd; + int[] p; + int best; + + bestd = 1000; /* biggest possible dist is 256*3 */ + best = -1; + i = netindex[g]; /* index on g */ + j = i - 1; /* start at netindex[g] and work outwards */ + + while ((i < netsize) || (j >= 0)) { + if (i < netsize) { + p = network[i]; + dist = p[1] - g; /* inx key */ + if (dist >= bestd) + i = netsize; /* stop iter */ + else { + i++; + if (dist < 0) + dist = -dist; + a = p[0] - b; + if (a < 0) + a = -a; + dist += a; + if (dist < bestd) { + a = p[2] - r; + if (a < 0) + a = -a; + dist += a; + if (dist < bestd) { + bestd = dist; + best = p[3]; + } + } + } + } + if (j >= 0) { + p = network[j]; + dist = g - p[1]; /* inx key - reverse dif */ + if (dist >= bestd) + j = -1; /* stop iter */ + else { + j--; + if (dist < 0) + dist = -dist; + a = p[0] - b; + if (a < 0) + a = -a; + dist += a; + if (dist < bestd) { + a = p[2] - r; + if (a < 0) + a = -a; + dist += a; + if (dist < bestd) { + bestd = dist; + best = p[3]; + } + } + } + } + } + return (best); + } + public byte[] process() { + learn(); + unbiasnet(); + inxbuild(); + return colorMap(); + } + + /* Unbias network to give byte values 0..255 and record position i to prepare for sort + ----------------------------------------------------------------------------------- */ + public void unbiasnet() { + + int i, j; + + for (i = 0; i < netsize; i++) { + network[i][0] >>= netbiasshift; + network[i][1] >>= netbiasshift; + network[i][2] >>= netbiasshift; + network[i][3] = i; /* record colour no */ + } + } + + /* Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|] + --------------------------------------------------------------------------------- */ + protected void alterneigh(int rad, int i, int b, int g, int r) { + + int j, k, lo, hi, a, m; + int[] p; + + lo = i - rad; + if (lo < -1) + lo = -1; + hi = i + rad; + if (hi > netsize) + hi = netsize; + + j = i + 1; + k = i - 1; + m = 1; + while ((j < hi) || (k > lo)) { + a = radpower[m++]; + if (j < hi) { + p = network[j++]; + try { + p[0] -= (a * (p[0] - b)) / alpharadbias; + p[1] -= (a * (p[1] - g)) / alpharadbias; + p[2] -= (a * (p[2] - r)) / alpharadbias; + } catch (Exception e) { + } // prevents 1.3 miscompilation + } + if (k > lo) { + p = network[k--]; + try { + p[0] -= (a * (p[0] - b)) / alpharadbias; + p[1] -= (a * (p[1] - g)) / alpharadbias; + p[2] -= (a * (p[2] - r)) / alpharadbias; + } catch (Exception e) { + } + } + } + } + + /* Move neuron i towards biased (b,g,r) by factor alpha + ---------------------------------------------------- */ + protected void altersingle(int alpha, int i, int b, int g, int r) { + + /* alter hit neuron */ + int[] n = network[i]; + n[0] -= (alpha * (n[0] - b)) / initalpha; + n[1] -= (alpha * (n[1] - g)) / initalpha; + n[2] -= (alpha * (n[2] - r)) / initalpha; + } + + /* Search for biased BGR values + ---------------------------- */ + protected int contest(int b, int g, int r) { + + /* finds closest neuron (min dist) and updates freq */ + /* finds best neuron (min dist-bias) and returns position */ + /* for frequently chosen neurons, freq[i] is high and bias[i] is negative */ + /* bias[i] = gamma*((1/netsize)-freq[i]) */ + + int i, dist, a, biasdist, betafreq; + int bestpos, bestbiaspos, bestd, bestbiasd; + int[] n; + + bestd = ~(((int) 1) << 31); + bestbiasd = bestd; + bestpos = -1; + bestbiaspos = bestpos; + + for (i = 0; i < netsize; i++) { + n = network[i]; + dist = n[0] - b; + if (dist < 0) + dist = -dist; + a = n[1] - g; + if (a < 0) + a = -a; + dist += a; + a = n[2] - r; + if (a < 0) + a = -a; + dist += a; + if (dist < bestd) { + bestd = dist; + bestpos = i; + } + biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift)); + if (biasdist < bestbiasd) { + bestbiasd = biasdist; + bestbiaspos = i; + } + betafreq = (freq[i] >> betashift); + freq[i] -= betafreq; + bias[i] += (betafreq << gammashift); + } + freq[bestpos] += beta; + bias[bestpos] -= betagamma; + return (bestbiaspos); + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/web/ImageRequestHandlerBridge.java b/src/com/fr/plugin/cool/cartnoon/web/ImageRequestHandlerBridge.java new file mode 100644 index 0000000..06c9816 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/web/ImageRequestHandlerBridge.java @@ -0,0 +1,13 @@ +package com.fr.plugin.cool.cartnoon.web; + +import com.fr.decision.fun.HttpHandler; +import com.fr.decision.fun.impl.AbstractHttpHandlerProvider; + +public class ImageRequestHandlerBridge extends AbstractHttpHandlerProvider { + @Override + public HttpHandler[] registerHandlers() { + return new HttpHandler[]{ + new ImageViewer() + }; + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/web/ImageURLAliasBridge.java b/src/com/fr/plugin/cool/cartnoon/web/ImageURLAliasBridge.java new file mode 100644 index 0000000..ada3ae4 --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/web/ImageURLAliasBridge.java @@ -0,0 +1,14 @@ +package com.fr.plugin.cool.cartnoon.web; + +import com.fr.decision.fun.impl.AbstractURLAliasProvider; +import com.fr.decision.webservice.url.alias.URLAlias; +import com.fr.decision.webservice.url.alias.URLAliasFactory; + +public class ImageURLAliasBridge extends AbstractURLAliasProvider { + @Override + public URLAlias[] registerAlias() { + return new URLAlias[]{ + URLAliasFactory.createPluginAlias("/img", "/image", true) + }; + } +} diff --git a/src/com/fr/plugin/cool/cartnoon/web/ImageViewer.java b/src/com/fr/plugin/cool/cartnoon/web/ImageViewer.java new file mode 100644 index 0000000..d2e201a --- /dev/null +++ b/src/com/fr/plugin/cool/cartnoon/web/ImageViewer.java @@ -0,0 +1,52 @@ +package com.fr.plugin.cool.cartnoon.web; + +import com.fr.decision.fun.impl.BaseHttpHandler; +import com.fr.intelli.record.Focus; +import com.fr.intelli.record.Original; +import com.fr.log.FineLoggerFactory; +import com.fr.third.springframework.web.bind.annotation.RequestMethod; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.HashMap; + +public class ImageViewer extends BaseHttpHandler { + public static HashMap gifData =new HashMap<>(); + @Override + public RequestMethod getMethod() { + return RequestMethod.GET; + } + + @Override + public String getPath() { + return "/image"; + } + + @Override + public boolean isPublic() { + return true; + } + + @Override + @Focus(id = "com.fr.plugin.cool.chart.web", text = "", source = Original.PLUGIN) + public void handle(HttpServletRequest request, HttpServletResponse response) throws Exception { + + final String JPG = "image/jpeg;charset=GB2312"; + String id = request.getParameter("id"); + response.setHeader("Content-Type", "image/gif"); + OutputStream output = response.getOutputStream(); + + FineLoggerFactory.getLogger().info("id:{}",id); + + // 回写 + response.setContentType("image/gif"); + output.write(gifData.get(id)); + output.flush(); + output.close(); + + } + + + +} diff --git a/src/com/fr/plugin/cool/cartnoon/web/scroll.png b/src/com/fr/plugin/cool/cartnoon/web/scroll.png new file mode 100644 index 0000000..d9cc10c Binary files /dev/null and b/src/com/fr/plugin/cool/cartnoon/web/scroll.png differ diff --git a/src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java b/src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java deleted file mode 100644 index 8b72857..0000000 --- a/src/com/fr/plugin/data/encrypt/EncryptDataAccessBridge.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.db.fun.impl.AbstractDBAccessProvider; -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.plugin.data.encrypt.dao.EncryptDataDao; -import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.stable.db.accessor.DBAccessor; -import com.fr.stable.db.dao.BaseDAO; -import com.fr.stable.db.dao.DAOProvider; - -@EnableMetrics -public class EncryptDataAccessBridge extends AbstractDBAccessProvider { - private static DBAccessor dbAccessor = null; - - @Focus(id=FunConstants.PLUGIN_ID, text = "", source = Original.PLUGIN) - public static DBAccessor getDbAccessor() { - return dbAccessor; - } - - @Override - public DAOProvider[] registerDAO() { - return new DAOProvider[]{ - new DAOProvider() { - @Override - public Class getEntityClass() { - return EncryptDataEntity.class; - } - - @Override - public Class getDAOClass() { - return EncryptDataDao.class; - } - }, - }; - } - - @Override - public void onDBAvailable(DBAccessor dbAccessor) { - EncryptDataAccessBridge.dbAccessor = dbAccessor; - } -} diff --git a/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java deleted file mode 100644 index 5ea9f6c..0000000 --- a/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndDES.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.fun.Authorize; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FRDEncryptWithMD5AndDES extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRDEncryptWithMD5AndDES", source = Original.PLUGIN) - public Object run(Object[] args) { - - String checkRes = FunConstants.CheckArgs(args, 2); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String key= args[0].toString(); - String data = args[1].toString(); - - return FunConstants.EncryptData(key,data,"PBEWithMD5AndDES",false); - } - - - -} \ No newline at end of file diff --git a/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java b/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java deleted file mode 100644 index 9c0e54a..0000000 --- a/src/com/fr/plugin/data/encrypt/FRDEncryptWithMD5AndTripleDES.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.fun.Authorize; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FRDEncryptWithMD5AndTripleDES extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRDEncryptWithMD5AndDES", source = Original.PLUGIN) - public Object run(Object[] args) { - - String checkRes = FunConstants.CheckArgs(args, 2); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String key= args[0].toString(); - String data = args[1].toString(); - - return FunConstants.EncryptData(key,data,"PBEWithMD5AndTripleDES",false); - } - - - -} \ No newline at end of file diff --git a/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java deleted file mode 100644 index fa999c7..0000000 --- a/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndDES.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.fun.Authorize; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FREncryptWithMD5AndDES extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FREnWithMD5AndDES", source = Original.PLUGIN) - public Object run(Object[] args) { - - String checkRes = FunConstants.CheckArgs(args, 2); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String key= args[0].toString(); - String data = args[1].toString(); - - return FunConstants.EncryptData(key,data,"PBEWithMD5AndDES",true); - } - - - -} \ No newline at end of file diff --git a/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java b/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java deleted file mode 100644 index de00347..0000000 --- a/src/com/fr/plugin/data/encrypt/FREncryptWithMD5AndTripleDES.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.fun.Authorize; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FREncryptWithMD5AndTripleDES extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FREnWithMD5AndDES", source = Original.PLUGIN) - public Object run(Object[] args) { - - String checkRes = FunConstants.CheckArgs(args, 2); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String key= args[0].toString(); - String data = args[1].toString(); - - return FunConstants.EncryptData(key,data,"PBEWithMD5AndTripleDES",true); - } - - - -} \ No newline at end of file diff --git a/src/com/fr/plugin/data/encrypt/FREncryptorFunction.java b/src/com/fr/plugin/data/encrypt/FREncryptorFunction.java deleted file mode 100644 index 4b84149..0000000 --- a/src/com/fr/plugin/data/encrypt/FREncryptorFunction.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.stable.fun.impl.AbstractFunctionDefContainer; -import com.fr.stable.script.FunctionDef; - -public class FREncryptorFunction extends AbstractFunctionDefContainer { - @Override - public FunctionDef[] getFunctionDefs() { - return new FunctionDef[]{ - new FunctionDef("FRHashData", "FRHashData(varchar1,varchar2,logical3)：生成数据散列码，存存储妻finedb数据库中的FINE_PLUGIN_ENCRYPT_DATA表中以便FRGetDataFromHash函数引用。\n参数说明：\nvarchar1：源数据文本或单元格，如“中国”，A1。\nvarchar2：散列类型，md5或sha。\nlogical3：是否存储数据，true或false，如果存储数据，可以用FRGetDataFromHash函数通过散列值获取数据。\n示例：FRHashData(\"asddfds\",\"SHA\",true)。结果为返回\"asddfds\"用sha加密后的hash值，并储存到finedb数据库中的FINE_PLUGIN_ENCRYPT_DATA表中。", FRHashData.class.getName()), - new FunctionDef("FRGetDataFromHash", "FRGetDataFromHash(varchar1)：数据散列码获得数据，如果数据被非法篡改，则返回错误信息。\n参数说明：\nvarchar1：数据散列码文本。\n示例：FRGetDataFromHash(\"dhstkd7v4q7s7qnes5rar4mjp\")", FRGetDataFromHash.class.getName()), - new FunctionDef("FREncryptWithMD5AndDES", "FREncryptWithMD5AndDES(varchar1,varchar2)：用MD5AndDES算法加密数据。\n参数说明：\nvarchar1：加密密钥。\nvarchar2：加密数据。\n示例：FREncryptWithMD5AndDES(\"abc\",b1)", FREncryptWithMD5AndDES.class.getName()), - new FunctionDef("FREncryptWithMD5AndTripleDES", "FREncryptWithMD5AndTripleDES(varchar1,varchar2)：用MD5AndTripleDES算法加密数据。\n参数说明：\nvarchar1：加密密钥。\nvarchar2：加密数据。\n示例：FREncryptWithMD5AndTripleDES(\"abc\",b1)", FREncryptWithMD5AndTripleDES.class.getName()), - new FunctionDef("FRDEncryptWithMD5AndDES", "FRDEncryptWithMD5AndDES(varchar1,varchar2)：用MD5AndDES算法解密密数据。\n参数说明：\nvarchar1：解密密钥。\nvarchar2：解密数据。\n示例：FRDEncryptWithMD5AndDES(\"abc\",\"wiAHHlV0laFpYi2YoXLUxE+LD8noomQ0TXOTZbYECQA=\")", FRDEncryptWithMD5AndDES.class.getName()), - new FunctionDef("FRDEncryptWithMD5AndTripleDES", "FRDEncryptWithMD5AndTripleDES(varchar1,varchar2)：用MD5AndTripleDES算法解决密数据。\n参数说明：\nvarchar1：解密密钥。\nvarchar2：解密数据。\n示例：FRDEncryptWithMD5AndTripleDES(\"abc\",\"DD5rc+jocBMlhUGwV2cqnfgDDERtX/E2727LIbf2KGs=\")", FRDEncryptWithMD5AndTripleDES.class.getName()), - - }; - } - - @Override - public String getGroupName() { - return "数据加密函数"; - } -} diff --git a/src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java b/src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java deleted file mode 100644 index 4a92e1b..0000000 --- a/src/com/fr/plugin/data/encrypt/FRGetDataFromHash.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fanruan.api.query.QueryConditionKit; -import com.fanruan.api.query.RestrictionKit; -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.plugin.data.encrypt.dao.EncryptDataDao; -import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.db.action.DBAction; -import com.fr.stable.db.dao.DAOContext; -import com.fr.stable.exception.FormulaException; -import com.fr.stable.fun.Authorize; - -import java.util.List; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FRGetDataFromHash extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRHashData", source = Original.PLUGIN) - public Object run(Object[] args) throws FormulaException { - - String checkRes = FunConstants.CheckArgs(args, 1); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String hashID= args[0].toString(); - - return QueryDataFromID(hashID); - } - - final private String QueryDataFromID(String hashID){ - try { - List entities = EncryptDataAccessBridge.getDbAccessor().runQueryAction(daoContext -> { - // 查询 - return daoContext.getDAO(EncryptDataDao.class).find(QueryConditionKit.newQueryCondition().addRestriction(RestrictionKit.eq("id", hashID))); - }); - if(entities.size()<=0){ - return Primitive.ERROR_VALUE+":数据没有找到！"; - } - String result=entities.get(0).getData(); - final String hashDataMd5 = FunConstants.HashData(result, "md5", false); - final String hashDataSha = FunConstants.HashData(result, "sha", false); - if(hashID.equals(hashDataMd5)||hashID.equals(hashDataSha)){ - return result; - } - return Primitive.ERROR_VALUE+":数据错误！"; - - } catch (Exception e) { - return Primitive.ERROR_VALUE + ":"+e.getMessage(); - } - } -} diff --git a/src/com/fr/plugin/data/encrypt/FRHashData.java b/src/com/fr/plugin/data/encrypt/FRHashData.java deleted file mode 100644 index ab356a3..0000000 --- a/src/com/fr/plugin/data/encrypt/FRHashData.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.intelli.record.Focus; -import com.fr.intelli.record.Original; -import com.fr.log.FineLoggerFactory; -import com.fr.record.analyzer.EnableMetrics; -import com.fr.script.AbstractFunction; -import com.fr.stable.Primitive; -import com.fr.stable.fun.Authorize; - -@EnableMetrics -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FRHashData extends AbstractFunction { - @Override - @Focus(id = FunConstants.PLUGIN_ID, text = "Plugin-Function_FRHashData", source = Original.PLUGIN) - public Object run(Object[] args) { - - String checkRes = FunConstants.CheckArgs(args, 3); - if (!checkRes.equals(FunConstants.CHECK_PASS)) { - return Primitive.ERROR_VALUE + ":"+checkRes; - } - - String message= args[0].toString(); - String type = args[1].toString(); - boolean isSave = Boolean.parseBoolean(args[2].toString()); - FineLoggerFactory.getLogger().info("message :"+message); - return FunConstants.HashData(message,type,isSave); - } - - -} \ No newline at end of file diff --git a/src/com/fr/plugin/data/encrypt/FunConstants.java b/src/com/fr/plugin/data/encrypt/FunConstants.java deleted file mode 100644 index d479ed6..0000000 --- a/src/com/fr/plugin/data/encrypt/FunConstants.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fr.plugin.data.encrypt; - -import com.fr.locale.InterProviderFactory; -import com.fr.log.FineLoggerFactory; -import com.fr.plugin.PluginLicenseManager; -import com.fr.plugin.data.encrypt.dao.EncryptDataDao; -import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; -import com.fr.stable.ArrayUtils; -import com.fr.stable.Primitive; -import com.fr.stable.StringUtils; -import com.fr.stable.db.action.DBAction; -import com.fr.stable.db.dao.DAOContext; -import com.fr.stable.fun.Authorize; -import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; -import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; - -import java.math.BigInteger; -import java.security.MessageDigest; - -@Authorize(callSignKey = FunConstants.PLUGIN_ID) -public class FunConstants { - static final String PLUGIN_ID = "com.fr.plugin.data.encrypt"; - public static final String TABLE_NAME = "FINE_PLUGIN_ENCRYPT_DATA"; - static final String AUTHOR_ERROR =InterProviderFactory.getProvider().getLocText("Fine-Design_Data_Encrypt_AUTHOR_ERROR"); - static final String CHECK_PASS = InterProviderFactory.getProvider().getLocText("Fine-Design_Data_Encrypt_CHECK_PASS"); - static final String ARGS_ERROR= InterProviderFactory.getProvider().getLocText("Fine-Design_Data_Encrypt_ArgsCountError"); - - - static final boolean author() { - return true; - } - - static final String CheckArgs(Object[] args, int num) { - String res = FunConstants.CHECK_PASS; - int len = ArrayUtils.getLength(args); - if (len != num) { - return "Fine-Design_FRFinanceFunction_ArgsCountError"; - } - return res; - } - - static final boolean SaveData(String hashID,String hashType,String Data) { - try { - EncryptDataAccessBridge.getDbAccessor().runDMLAction(new DBAction() { - @Override - public EncryptDataEntity run(DAOContext daoContext) throws Exception { - EncryptDataEntity entity = new EncryptDataEntity(); - entity.setId(hashID); - entity.setHashType(hashType); - entity.setData(Data); - daoContext.getDAO(EncryptDataDao.class).add(entity); - - return entity; - } - }); - } catch (Exception e) { - FineLoggerFactory.getLogger().error("Save Date Error:"+e.getMessage()); - return false; - } - return true; - } - - static final String HashData(String message,String type,boolean isSave){ - if(StringUtils.isEmpty(message)){ - return ""; - } - BigInteger shaID; - byte[] inputData = message.getBytes(); - try{ - MessageDigest messageDigest = MessageDigest.getInstance(type); //确定计算方法 - messageDigest.update(inputData); - shaID = new BigInteger(messageDigest.digest()); //生成散列码 - final String hashID = shaID.toString(32); - if(isSave){ - FineLoggerFactory.getLogger().info("HashData hashID:"+hashID); - FunConstants.SaveData(hashID,type,message); - - } - return hashID; - } catch (Exception e) { - return Primitive.ERROR_VALUE +":"+ e.getMessage(); - } - } - - final static SimpleStringPBEConfig GetSimpleStringPBEConfig(String secretKey, String algorithm) { - SimpleStringPBEConfig config = new SimpleStringPBEConfig(); - config.setPassword(secretKey); - config.setPoolSize("1"); -// config.setAlgorithm("PBEWithMD5AndDES"); - config.setAlgorithm(algorithm); - config.setKeyObtentionIterations("1000"); - config.setProviderName("SunJCE"); -// config.setSaltGeneratorClassName("org.jasypt.salt.RandomSaltGenerator"); -// config.setIvGeneratorClassName("org.jasypt.iv.RandomIvGenerator"); - config.setStringOutputType("base64"); - return config; - } - - final static String EncryptData(String secretKey, String message,String algorithm, boolean isEncrypt){ - String result; - PooledPBEStringEncryptor pooledPBEStringEncryptor = new PooledPBEStringEncryptor(); - pooledPBEStringEncryptor.setConfig(GetSimpleStringPBEConfig(secretKey,algorithm)); - try { - result = isEncrypt ? pooledPBEStringEncryptor.encrypt(message) : pooledPBEStringEncryptor.decrypt(message); - }catch (Exception e){ - result = Primitive.ERROR_VALUE + ":解密数据错误"; - } - return result; - } -} diff --git a/src/com/fr/plugin/data/encrypt/TestFun.java b/src/com/fr/plugin/data/encrypt/TestFun.java deleted file mode 100644 index 8435647..0000000 --- a/src/com/fr/plugin/data/encrypt/TestFun.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.fr.plugin.data.encrypt; - -public class TestFun { - public static void main(String args[]) throws Exception { - } -} diff --git a/src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java b/src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java deleted file mode 100644 index 4b9c5b6..0000000 --- a/src/com/fr/plugin/data/encrypt/dao/EncryptDataDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fr.plugin.data.encrypt.dao; - -import com.fr.plugin.data.encrypt.entity.EncryptDataEntity; -import com.fr.stable.db.dao.BaseDAO; -import com.fr.stable.db.session.DAOSession; - -public class EncryptDataDao extends BaseDAO { - public EncryptDataDao(DAOSession daoSession) { - super(daoSession); - } - @Override - protected Class getEntityClass() { - return EncryptDataEntity.class; - } -} diff --git a/src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java b/src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java deleted file mode 100644 index b6ad11f..0000000 --- a/src/com/fr/plugin/data/encrypt/entity/EncryptDataEntity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fr.plugin.data.encrypt.entity; - -import com.fr.plugin.data.encrypt.FunConstants; -import com.fr.stable.AssistUtils; -import com.fr.stable.db.entity.BaseEntity; -import com.fr.third.javax.persistence.Column; -import com.fr.third.javax.persistence.Entity; -import com.fr.third.javax.persistence.Table; - -@Entity -@Table(name = FunConstants.TABLE_NAME) -public class EncryptDataEntity extends BaseEntity { - - @Column(name = "hashType") - private String hashType; - - @Column(name = "Data") - private String data; - - public EncryptDataEntity() { - - } - - public String getHashType() { - return hashType; - } - - public void setHashType(String hashType) { - this.hashType = hashType; - } - - public String getData() { - return data; - } - - public void setData(String data) { - this.data = data; - } - - - @Override - public String toString() { - return AssistUtils.toString(this); - } -}