archive-access-cvs Mailing List for Web Archive Access Utilities (Page 31)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3055
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3055&view=rev
Author:   bradtofel
Date:     2010-04-24 00:17:43 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
INITIAL REV: Library to generate simple bar graphs, intended to be easily encoded as an opaque string and used as an IMG src in an HTML page.

Added Paths:
-----------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphElement.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncodingException.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RectangularGraphElement.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElement.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElements.java

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java
===================================================================

--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,116 @@
+/* Graph
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+
+/**
+ * @author brad
+ *
+ */
+public class Graph extends RectangularGraphElement {
+
+	private RegionGraphElement regions[] = null;
+	private GraphConfiguration config = null;
+
+	/**
+	 * @param width the width of the graph
+	 * @param height the height of the graph
+	 * @param data the values to draw in the graph
+	 * @param config the configuration to use when drawing the graph
+	 */
+	public Graph(int width, int height, RegionData data[],
+			GraphConfiguration config) {
+		super(0,0,width,height);
+		this.config = config;
+
+		int totalValues = 0;
+		int maxValue = -1;
+		for(RegionData datum : data) {
+			int array[] = datum.getValues();
+			totalValues += array.length;
+			for(int d : array) {
+				if(d > maxValue) {
+					maxValue = d;
+				}
+			}
+		}
+		int valuesSoFar = 0;
+		regions = new RegionGraphElement[data.length];
+		for(int i = 0; i < data.length; i++) {
+			int vCount = data[i].getValues().length;
+			
+			int x = Graph.xlateX(width, totalValues, valuesSoFar);
+			int w = Graph.xlateX(width, totalValues, valuesSoFar + vCount) - x;
+			data[i].setMaxValue(maxValue);
+			regions[i] = new RegionGraphElement(x,0,w,height,data[i],config);
+			valuesSoFar += vCount;
+		}
+	}
+
+	/**
+	 * @return the RegionGraphElements for the graph
+	 */
+	public RegionGraphElement[] getRegions() {
+		return regions;
+	}
+
+	public void draw(Graphics2D g2d) {
+
+		// set up rendering hints:
+		config.setRenderingHints(g2d);
+		
+		// draw background:
+		g2d.setColor(config.backgroundColor);
+		g2d.fillRect(1, 1, width - 2, height - 2);
+		
+		for(RegionGraphElement region : regions) {
+			region.draw(g2d);
+		}
+
+		// draw line below values:
+		int labelHeight = config.regionFontSize + (config.fontPadY * 2);
+		int valuesHeight = (height - labelHeight) + 1;
+
+		g2d.setColor(config.regionBorderColor);
+		g2d.setStroke(config.regionBorderStroke);
+		g2d.drawLine(1, valuesHeight, width - 2, valuesHeight);
+	}
+
+	static int xlateX(int w, int c, int i) {
+		if(i == 0) {
+			return 0;
+		} else if(i == c) {
+			return w;
+		}
+		float width = w;
+		float count = c;
+		float idx = i;
+		float x = (idx/count) * width;
+		return (int) x;
+	}
+	
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,128 @@
+/* GraphConfiguration
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.Stroke;
+
+/**
+ * @author brad
+ *
+ */
+public class GraphConfiguration {
+	final static float dash1[] = {3.0f};
+    final static BasicStroke dashed = new BasicStroke(1.0f, 
+                                          BasicStroke.CAP_BUTT, 
+                                          BasicStroke.JOIN_MITER, 
+                                          3.0f, dash1, 0.0f);
+
+	/**
+	 * Main background color for graphs
+	 */
+	public Color backgroundColor = Color.white;
+
+	/**
+	 * font size for Year/Month labels
+	 */
+	public int regionFontSize = 9;
+	/**
+	 * font name for Year/Month labels
+	 */
+	public String regionFontName = Font.SANS_SERIF;
+	/**
+	 * font style for Year/Month labels
+	 */
+	public int regionFontStyle = Font.PLAIN;
+	/**
+	 * font Color for Year/Month labels
+	 */
+	public Color regionLabelColor = Color.black;
+	/**
+	 * top/bottom font padding for Year/Month labels
+	 */
+	public int fontPadY = 2;
+	/**
+	 * left font padding for Year/Month labels
+	 */
+	public int fontPadX = 4;
+
+	/**
+	 * color for Year/Month border lines
+	 */
+	public Color regionBorderColor = Color.darkGray;
+	/**
+	 * Stroke for Year/Month border lines
+	 */
+	public Stroke regionBorderStroke = dashed;
+
+	/**
+	 * Background color for active/selected Year/Month
+	 */
+	public Color regionHighlightColor = Color.lightGray;
+
+	/**
+	 * color for non-active/selected graph values
+	 */
+	public Color valueColor = Color.blue;
+	/**
+	 * color for active/selected graph values
+	 */
+	public Color valueHighlightColor = Color.green;
+
+	/**
+	 * Minimum pixel height for non-zero graph values
+	 */
+	public int valueMinHeight = 5;
+
+
+	private Font regionLabelFont = null;
+	/**
+	 * @return the current Font to use for Month/Year labels, combination of
+	 *   regionFontStyle, regionFontSize, regionFontName
+	 */
+	public Font getRegionLabelFont() {
+		if(regionLabelFont == null) {
+			regionLabelFont = new Font(regionFontName,
+					regionFontStyle,regionFontSize);
+		}
+		return regionLabelFont;
+	}
+	/**
+	 * Set whatever redneringHints are needed to properly draw the graph, ie.
+	 * AntiAliasing, etc.
+	 * @param g2d The Graphics2D objects on which the hints should be set.
+	 */
+	public void setRenderingHints(Graphics2D g2d) {
+		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+				RenderingHints.VALUE_ANTIALIAS_ON);
+		g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+				RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphElement.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphElement.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphElement.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,41 @@
+/* GraphElement
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+
+/**
+ * @author brad
+ *
+ */
+public interface GraphElement {
+	/**
+	 * Draw the element onto a Graphics2D.
+	 * 
+	 * @param g2d the Graphics2D onto which the element should be drawn.
+	 */
+	public void draw(Graphics2D g2d);
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphElement.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,172 @@
+/* GraphEncoder
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+/**
+ * @author brad
+ *
+ */
+public class GraphEncoder {
+	private static String DELIM = "_";
+	private static String REGION_DELIM = ":";
+	
+	/**
+	 * convert a String-encoded graph into a usable Graph object, using 
+	 * default GraphConfiguration
+	 * @param encodedGraph String encoded graph, as returned by getEncoded()
+	 * @return a Graph, ready to use
+	 * @throws GraphEncodingException if there were problems with the encoded 
+	 * data
+	 */
+	public static Graph decode(String encodedGraph) 
+	throws GraphEncodingException {
+		return decode(encodedGraph, new GraphConfiguration());
+	}
+	/**
+	 * convert a String-encoded graph into a usable Graph object, using 
+	 * the provided GraphConfiguration.
+	 * @param encodedGraph String encoded graph, as returned by getEncoded()
+	 * @param config the GraphConfiguration to use
+	 * @return a Graph, ready to use
+	 * @throws GraphEncodingException if there were problems with the encoded 
+	 * data
+	 */
+	public static Graph decode(String encodedGraph, GraphConfiguration config) 
+	throws GraphEncodingException {
+		// encoded = "800_35_REGIONDATA_REGIONDATA_REGIONDATA_REGIONDATA_..."
+		String parts[] = encodedGraph.split(DELIM);
+		int numRegions = parts.length - 2;
+		if(parts.length < 1) {
+			throw new GraphEncodingException("No regions defined!");
+		}
+		int width;
+		int height;
+		try {
+			width = Integer.parseInt(parts[0]);
+		} catch(NumberFormatException e) {
+			throw new GraphEncodingException("Bad integer width:" + parts[0]);
+		}
+		try {
+			height = Integer.parseInt(parts[1]);
+		} catch(NumberFormatException e) {
+			throw new GraphEncodingException("Bad integer width:" + parts[0]);
+		}
+		RegionData data[] = new RegionData[numRegions];
+		for(int i = 0; i < numRegions; i++) {
+			// REGIONDATA = "2001:-1:0ab3f70023f902f"
+			//               LABEL:ACTIVE_IDX:HEXDATA
+			String regionParts[] = parts[i + 2].split(REGION_DELIM);
+			if(regionParts.length != 3) {
+				throw new GraphEncodingException("Wrong number of parts in " + 
+						parts[i+2]);
+			}
+			int highlightedValue = Integer.parseInt(regionParts[1]);
+			int values[] = decodeHex(regionParts[2]);
+			data[i] = new RegionData(regionParts[0], highlightedValue, values);
+		}
+		return new Graph(width, height, data, config);
+	}
+
+	/**
+	 * Convert a complete Graph into an opaque String that can later be 
+	 * re-assembled into a Graph object. Note that GraphConfiguration 
+	 * information is NOT encoded into the opaque String.
+	 * @param g Graph to encode
+	 * @return opaque String which can later be used with decode()
+	 */
+	public static String encode(Graph g) {
+		RegionGraphElement rge[] = g.getRegions();
+		RegionData data[] = new RegionData[rge.length];
+		for(int i = 0; i < data.length; i++) {
+			data[i] = rge[i].getData();
+		}
+		return encode(g.width, g.height, data);
+	}
+	
+	/**
+	 * Convert a Graph fields into an opaque String that can later be 
+	 * re-assembled into a Graph object. Note that GraphConfiguration 
+	 * information is NOT encoded into the opaque String.
+	 * @param width of the Graph
+	 * @param height of the Graph
+	 * @param data array of RegionData for the graph
+	 * @return opaque String which can later be used with decode()
+	 */
+	public static String encode(int width, int height, RegionData data[]) {
+		StringBuilder sb = new StringBuilder();
+		sb.append(width).append(DELIM);
+		sb.append(height);
+		boolean first = false;
+		for(RegionData datum : data) {
+			if(first) {
+				first = false;
+			} else {
+				sb.append(DELIM);
+			}
+			sb.append(datum.getLabel()).append(REGION_DELIM);
+			sb.append(datum.getHighlightedValue()).append(REGION_DELIM);
+			sb.append(encodeHex(datum.getValues()));
+		}
+		return sb.toString();
+	}
+
+	private static String encodeHex(int values[]) {
+		StringBuilder sb = new StringBuilder(values.length);
+		for(int value : values) {
+			if((value > 15) || (value < 0)){
+				throw new IllegalArgumentException();
+			}
+			sb.append(Integer.toHexString(value));
+		}
+		return sb.toString();
+	}
+
+	private static int[] decodeHex(String hexString) {
+		int length = hexString.length();
+		int values[] = new int[length];
+		for(int i = 0; i < length; i++) {
+			char c = hexString.charAt(i);
+			if(c >= '0') {
+				if(c <= '9') {
+					values[i] = c - '0';
+				} else {
+					if(c > 'f') {
+						throw new IllegalArgumentException();						
+					} else {
+						if(c >= 'a') {
+							values[i] = c - 'W';
+						} else {
+							throw new IllegalArgumentException();							
+						}
+					}
+				}
+			} else {
+				throw new IllegalArgumentException();
+			}
+		}
+		return values;
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncodingException.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncodingException.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncodingException.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,46 @@
+/* GraphEncodingException
+ *
+ * $Id$:
+ *
+ * Created on Apr 14, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+/**
+ * @author brad
+ *
+ */
+public class GraphEncodingException extends Exception {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -998274644110299354L;
+
+	/**
+	 * @param string message context for the exception
+	 */
+	public GraphEncodingException(String string) {
+		super(string);
+	}
+
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncodingException.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,102 @@
+/* GraphRenderer
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.imageio.ImageIO;
+
+/**
+ * @author brad
+ *
+ */
+public class GraphRenderer {
+	/**
+	 * appropriate Content-Type HTTP header value for graph image content
+	 * produced by render(OutputStream,Graph)
+	 */
+	public final static String RENDERED_IMAGE_MIME = "image/png"; 
+	/**
+	 * Create both an HTML AREA map and an HTML IMG for a graph, using provided
+	 * href targets, and titles within the AREA map.
+	 * @param graph Graph to draw
+	 * @param mapName name of HTML AREA map
+	 * @param imgUrl URL to rendered Graph, see GraphEncoder.encode()
+	 * @param targets URL href targets for the years in the Graph
+	 * @param titles titles for the years in the graph.
+	 * @return HTML String for the resulting AREA and IMG
+	 */
+	public static String renderHTML(Graph graph, String mapName, String imgUrl, 
+			String targets[], String titles[]) {
+
+		StringBuilder sb = new StringBuilder();
+		sb.append("<map name=\"").append(mapName).append("\">");
+		RegionGraphElement rge[] = graph.getRegions();
+		int count = rge.length;
+		for(int i = 0; i < count; i++) {
+			if(targets[i] != null) {
+				Rectangle r = rge[i].getBoundingRectangle();
+				sb.append("<area href=\"").append(targets[i]).append("\"");
+				if(titles[i] != null) {
+					sb.append(" title=\"").append(titles[i]).append("\"");
+				}
+				sb.append(" shape=\"rect\" coords=\"");
+				sb.append(r.x).append(",");
+				sb.append(r.y).append(",");
+				sb.append(r.x+r.width).append(",");
+				sb.append(r.y+r.height).append("\" border=\"1\" />");
+			}
+		}
+		sb.append("</map>");
+		sb.append("<image src=\"").append(imgUrl).append("\"");
+		sb.append(" border=\"0\" width=\"").append(graph.width).append("\"");
+		sb.append(" height=\"").append(graph.height).append("\"");
+		sb.append(" usemap=\"#").append(mapName).append("\" />");
+
+		return sb.toString();
+	}
+		
+	/**
+	 * Send a PNG format byte stream for the argument Graph to the provided
+	 * OutputStream  
+	 * @param target OutputStream to write PNG format bytes
+	 * @param graph Graph to send to the target
+	 * @throws IOException for usual reasons.
+	 */
+	public void render(OutputStream target, Graph graph) throws IOException {
+		
+		BufferedImage bi = 
+			new BufferedImage(graph.width, graph.height, BufferedImage.TYPE_INT_RGB);
+		Graphics2D g2d = bi.createGraphics();
+		graph.draw(g2d);
+	    ImageIO.write(bi, "png", target);
+	}
+
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RectangularGraphElement.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RectangularGraphElement.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RectangularGraphElement.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,76 @@
+/* RectangularGraphElement
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Rectangle;
+
+/**
+ * A GraphElement which allows interrogation of it's bounding java.awt.Rectangle
+ * @author brad
+ *
+ */
+public abstract class RectangularGraphElement implements GraphElement {
+	protected int x = 0;
+	protected int y = 0;
+	protected int width = 0;
+	protected int height = 0;
+
+	/**
+	 * Construct a new RectangularGraphElement with the supplied values
+	 * @param x the rectangles x in the global coordinate space
+	 * @param y the rectangles y in the global coordinate space
+	 * @param width the rectangles width
+	 * @param height the rectangles height
+	 */
+	public RectangularGraphElement(int x, int y, int width, int height) {
+		this.x = x;
+		this.y = y;
+		this.width = width;
+		this.height = height;
+	}
+
+	/**
+	 * @return the width
+	 */
+	public int getWidth() {
+		return width;
+	}
+
+	/**
+	 * @return the height
+	 */
+	public int getHeight() {
+		return height;
+	}
+
+	/**
+	 * @return the java.awt.Rectangle which bounds this GraphElement, in the
+	 * coordinate space of the Graph which contains it.
+	 */
+	public Rectangle getBoundingRectangle() {
+		return new Rectangle(x, y, width, height);
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RectangularGraphElement.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,95 @@
+/* RegionData
+ *
+ * $Id$:
+ *
+ * Created on Apr 14, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+/**
+ * Containing object for data associated with one region (month/year/etc) in the
+ * graph, including the:
+ *   label
+ *   highlighted value index
+ *   int array of values to graph within this region
+ *   the global max int value across all values in the overall graph
+ * @author brad
+ *
+ */
+public class RegionData {
+	private String label = null;
+	private int highlightedValue = -1;
+	private int values[] = null;
+	private int maxValue = -1;
+	/**
+	 * @param label the text label to draw for this region
+	 * @param highlightedValue the index of the value to "highlight" or -1, if
+	 * no values should be highlighted. Note that highlighting a value in a 
+	 * region causes the entire region to get a background highlight, also
+	 * @param values int array of raw values, each between 0 and 15.
+	 */
+	public RegionData(String label, int highlightedValue, int values[]) {
+		this.label = label;
+		this.highlightedValue = highlightedValue;
+		this.values = values;
+	}
+	/**
+	 * @return the String label for this region
+	 */
+	public String getLabel() {
+		return label;
+	}
+	/**
+	 * @return the index of the highlighted value in this region, or -1 if none
+	 * are highlighted
+	 */
+	public int getHighlightedValue() {
+		return highlightedValue;
+	}
+	/**
+	 * @return the raw array of values for this region
+	 */
+	public int[] getValues() {
+		return values;
+	}
+	/**
+	 * @return the global graph maximum value, used for normalizing values to
+	 * ensure the values use the entire Y axis.
+	 */
+	public int getMaxValue() {
+		return maxValue;
+	}
+	
+	/**
+	 * @param maxValue the global graph maximum value, used for normalizing 
+	 * values to ensure the values use the entire Y axis.
+	 */
+	public void setMaxValue(int maxValue) {
+		this.maxValue = maxValue;
+	}
+	/**
+	 * @return true if one of the values in this region is highlighted
+	 */
+	public boolean hasHighlightedValue() {
+		return (highlightedValue != -1);
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,87 @@
+/* RegionGraphElement
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+
+/**
+ * @author brad
+ *
+ */
+public class RegionGraphElement extends RectangularGraphElement {
+	private RegionData data = null;
+	private ValueGraphElements values = null;
+	private GraphConfiguration config = null;
+
+	/**
+	 * @param x the x coordinate for the region, in the global coordinate space
+	 * of the containing Graph
+	 * @param y the y coordinate for the region, in the global coordinate space
+	 * of the containing Graph
+	 * @param width the width of this region, in pixels
+	 * @param height the height of this region, in pixels
+	 * @param data the data to use for this region
+	 * @param config the GraphConfiguration for this Graph
+	 */
+	public RegionGraphElement(int x, int y, int width, int height,
+			RegionData data, GraphConfiguration config) {
+		super(x,y,width,height);
+//		System.err.format("Created region (%d,%d)-(%d,%d)\n",x,y,width,height);
+		this.data = data;
+		this.config = config;
+		int labelHeight = config.regionFontSize + (config.fontPadY * 2);
+		int valuesHeight = height - labelHeight;
+		this.values = new ValueGraphElements(x+1, y+1, width - 1, valuesHeight,
+				data.getHighlightedValue(), data.getValues(), 
+				data.getMaxValue(), config);
+	}
+	
+	/**
+	 * @return the RegionData for this region
+	 */
+	public RegionData getData() {
+		return data;
+	}
+	
+	public void draw(Graphics2D g2d) {
+		
+		if(data.hasHighlightedValue()) {
+			g2d.setColor(config.regionHighlightColor);
+			g2d.fillRect(x + 1, y+1, width - 1, height-2);
+		}
+		
+		g2d.setColor(config.regionBorderColor);
+		g2d.setStroke(config.regionBorderStroke);
+		g2d.drawLine(x, y, x, y + height);
+
+		int fontY = (y + height) - config.fontPadY;
+		
+		g2d.setColor(config.regionLabelColor);
+		g2d.setFont(config.getRegionLabelFont());
+		g2d.drawString(data.getLabel(), x + config.fontPadX, fontY);
+		values.draw(g2d);
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElement.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElement.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElement.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,59 @@
+/* ValueGraphElement
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+
+/**
+ * @author brad
+ *
+ */
+public class ValueGraphElement extends RectangularGraphElement {
+	boolean highlighted = false;
+	GraphConfiguration config = null;
+	/**
+	 * @param x the rectangles x in the global coordinate space
+	 * @param y the rectangles y in the global coordinate space
+	 * @param width the rectangles width
+	 * @param height the rectangles height
+	 * @param highlighted true if this value is highlighted 
+	 * @param config reference to the configuration for the graph
+	 */
+	public ValueGraphElement(int x, int y, int width, int height, 
+			boolean highlighted, GraphConfiguration config) {
+		super(x, y, width, height);
+		
+		this.highlighted = highlighted;
+		this.config = config;
+	}
+
+
+	public void draw(Graphics2D g2d) {
+		g2d.setColor(highlighted ? 
+				config.valueHighlightColor : config.valueColor);
+		g2d.fillRect(x, y, width, height);
+	}
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElement.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElements.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElements.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElements.java	2010-04-24 00:17:43 UTC (rev 3055)
@@ -0,0 +1,109 @@
+/* ValueGraphElements
+ *
+ * $Id$:
+ *
+ * Created on Apr 9, 2010.
+ *
+ * Copyright (C) 2006 Internet Archive.
+ *
+ * This file is part of Wayback.
+ *
+ * Wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * Wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with Wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.archive.wayback.util.graph;
+
+import java.awt.Graphics2D;
+import java.util.NoSuchElementException;
+
+/**
+ * @author brad
+ *
+ */
+public class ValueGraphElements extends RectangularGraphElement {
+	private int values[] = null;
+	private int highlightValue = -1;
+	private int maxValue = -1;
+	private GraphConfiguration config = null;
+
+	/**
+	 * @param x the rectangles x in the global coordinate space
+	 * @param y the rectangles y in the global coordinate space
+	 * @param width the rectangles width
+	 * @param height the rectangles height
+	 * @param hightlightValue the index of the value to highlight 
+	 * @param values array of int values, each must be 0-15
+	 * @param maxValue the global maximum value across all elements in the Graph
+	 * @param config the configuration for the Graph
+	 */
+	public ValueGraphElements(int x, int y, int width, int height, 
+			int hightlightValue, int values[], int maxValue,
+			GraphConfiguration config) {
+
+		super(x, y, width, height);
+//		System.err.format("Created VGEs (%d,%d)-(%d,%d)\n",x,y,width,height);
+
+		this.highlightValue = hightlightValue;
+		this.values = values;
+		this.config = config;
+		this.maxValue = maxValue;
+	}
+
+	/**
+	 * return the i'th ValueGraphElement
+	 * @param i the index of the element to return
+	 * @return the ValueGraphElement at index i
+	 */
+	public ValueGraphElement getElement(int i) {
+		if((i < 0) || (i >= values.length)) {
+			throw new NoSuchElementException();
+		}
+		int minHeight = config.valueMinHeight;
+		
+		// normalize height to value between 0 and 1:
+		float value = ((float) values[i]) / ((float) maxValue);
+		float usableHeight = height - minHeight;
+		int valueHeight = (int) (usableHeight * value) + minHeight;
+		
+		int elX = Graph.xlateX(width, values.length, i);
+		int elW = Graph.xlateX(width, values.length, i+1) - elX;
+		int elY = height - valueHeight;
+		boolean hot = i == highlightValue;
+		return new ValueGraphElement(x + elX, y + elY, elW, valueHeight, hot, config);
+	}
+	
+	public void draw(Graphics2D g2d) {
+		for(int i = 0; i < values.length; i++) {
+			if(values[i] > 0) {
+				getElement(i).draw(g2d);
+			}
+		}
+	}
+
+	/**
+	 * @return the index of the highlighted value
+	 */
+	public int getHighlightValue() {
+		return highlightValue;
+	}
+
+	/**
+	 * @return the raw int values for the graph
+	 */
+	public int[] getRawValues() {
+		return values;
+	}
+	
+}


Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/ValueGraphElements.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Revision Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2005	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (10)	Sep (36)	Oct (339)	Nov (103)	Dec (152)
2006	Jan (141)	Feb (102)	Mar (125)	Apr (203)	May (57)	Jun (30)	Jul (139)	Aug (46)	Sep (64)	Oct (105)	Nov (34)	Dec (162)
2007	Jan (81)	Feb (57)	Mar (141)	Apr (72)	May (9)	Jun (1)	Jul (144)	Aug (88)	Sep (40)	Oct (43)	Nov (34)	Dec (20)
2008	Jan (44)	Feb (45)	Mar (16)	Apr (36)	May (8)	Jun (77)	Jul (177)	Aug (66)	Sep (8)	Oct (33)	Nov (13)	Dec (37)
2009	Jan (2)	Feb (5)	Mar (8)	Apr	May (36)	Jun (19)	Jul (46)	Aug (8)	Sep (1)	Oct (66)	Nov (61)	Dec (10)
2010	Jan (13)	Feb (16)	Mar (38)	Apr (76)	May (47)	Jun (32)	Jul (35)	Aug (45)	Sep (20)	Oct (61)	Nov (24)	Dec (16)
2011	Jan (22)	Feb (34)	Mar (11)	Apr (8)	May (24)	Jun (23)	Jul (11)	Aug (42)	Sep (81)	Oct (48)	Nov (21)	Dec (20)
2012	Jan (30)	Feb (25)	Mar (4)	Apr (6)	May (1)	Jun (5)	Jul (5)	Aug (8)	Sep (6)	Oct (6)	Nov	Dec

archive-access-cvs Mailing List for Web Archive Access Utilities (Page 31)

archive-access-cvs — CVS commits