[Archive-access-cvs] SF.net SVN: archive-access:[3215] trunk/archive-access/projects/wayback

[<bra...@us...>]

Revision: 3215
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3215&view=rev
Author:   bradtofel
Date:     2010-08-10 18:49:52 +0000 (Tue, 10 Aug 2010)

Log Message:
-----------
HACK: extra flag argument now available to disable the highlighting of the active month

Modified Paths:
--------------
    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/RegionData.java
    trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/graph.jsp

Modified: 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	2010-08-09 23:53:22 UTC (rev 3214)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphEncoder.java	2010-08-10 18:49:52 UTC (rev 3215)
@@ -37,13 +37,18 @@
 	 * convert a String-encoded graph into a usable Graph object, using 
 	 * default GraphConfiguration
 	 * @param encodedGraph String encoded graph, as returned by getEncoded()
+	 * @param noMonth if true, disable the month highlight color
 	 * @return a Graph, ready to use
 	 * @throws GraphEncodingException if there were problems with the encoded 
 	 * data
 	 */
-	public static Graph decode(String encodedGraph) 
+	public static Graph decode(String encodedGraph, boolean noMonth) 
 	throws GraphEncodingException {
-		return decode(encodedGraph, new GraphConfiguration());
+		GraphConfiguration config = new GraphConfiguration();
+		if(noMonth) {
+			config.valueHighlightColor = config.valueColor;
+		}
+		return decode(encodedGraph, config);
 	}
 	/**
 	 * convert a String-encoded graph into a usable Graph object, using 

Modified: 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	2010-08-09 23:53:22 UTC (rev 3214)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionData.java	2010-08-10 18:49:52 UTC (rev 3215)
@@ -67,6 +67,7 @@
 	}
 	/**
 	 * sets the highlighted value index, or removes highlight if -1 is used
+	 * @param highlightedValue the index of the bar to highlight.
 	 */
 	public void setHighlightedValue(int highlightedValue) {
 		this.highlightedValue = highlightedValue;

Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/graph.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/graph.jsp	2010-08-09 23:53:22 UTC (rev 3214)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/graph.jsp	2010-08-10 18:49:52 UTC (rev 3215)
@@ -9,12 +9,14 @@
 %><%
 Date now = new Date();
 String arg = request.getParameter("graphdata");
+String noMonthArg = request.getParameter("nomonth");
+boolean noMonth = (noMonthArg != null);
 if(arg == null) {
 	arg = "(No Data specified)";
 }
 GraphRenderer r = new GraphRenderer();
 response.setContentType(GraphRenderer.RENDERED_IMAGE_MIME);
-Graph graph = GraphEncoder.decode(arg);
+Graph graph = GraphEncoder.decode(arg,noMonth);
 try {
 	r.render(response.getOutputStream(),graph);
 } catch(Exception e) {


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