Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3130] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/util/graph
|
From: <bra...@us...> - 2010-05-28 23:18:48
|
Revision: 3130
http://archive-access.svn.sourceforge.net/archive-access/?rev=3130&view=rev
Author: bradtofel
Date: 2010-05-28 23:18:42 +0000 (Fri, 28 May 2010)
Log Message:
-----------
HACKED out labels, made image type transparent, turned off line anti-aliasing, changes dashed stroke to 1:1
Modified Paths:
--------------
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/GraphRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java
Modified: 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 2010-05-28 03:27:24 UTC (rev 3129)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/Graph.java 2010-05-28 23:18:42 UTC (rev 3130)
@@ -92,12 +92,12 @@
}
// 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);
+// 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) {
Modified: 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 2010-05-28 03:27:24 UTC (rev 3129)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphConfiguration.java 2010-05-28 23:18:42 UTC (rev 3130)
@@ -31,22 +31,28 @@
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Stroke;
+import java.awt.image.BufferedImage;
/**
* @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);
+ 1.0f, new float[] {1.0f}, 0.0f);
+ /**
+ * type of BufferedImage to create, specifically the final constructor arg.
+ */
+ public static int imageType = BufferedImage.TRANSLUCENT;
+
/**
* Main background color for graphs
*/
- public Color backgroundColor = Color.white;
+ public Color backgroundColor = new Color(255,255,255,90);
+// public Color backgroundColor = Color.white;
/**
* font size for Year/Month labels
@@ -85,16 +91,16 @@
/**
* Background color for active/selected Year/Month
*/
- public Color regionHighlightColor = Color.lightGray;
+ public Color regionHighlightColor = new Color(255,255,25,128);
/**
* color for non-active/selected graph values
*/
- public Color valueColor = Color.blue;
+ public Color valueColor = Color.black;
/**
* color for active/selected graph values
*/
- public Color valueHighlightColor = Color.green;
+ public Color valueHighlightColor = Color.red;
/**
* Minimum pixel height for non-zero graph values
@@ -120,8 +126,10 @@
* @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_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
+ RenderingHints.VALUE_ANTIALIAS_OFF);
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
}
Modified: 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 2010-05-28 03:27:24 UTC (rev 3129)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/GraphRenderer.java 2010-05-28 23:18:42 UTC (rev 3130)
@@ -93,7 +93,8 @@
public void render(OutputStream target, Graph graph) throws IOException {
BufferedImage bi =
- new BufferedImage(graph.width, graph.height, BufferedImage.TYPE_INT_RGB);
+ new BufferedImage(graph.width, graph.height,
+ GraphConfiguration.imageType);
Graphics2D g2d = bi.createGraphics();
graph.draw(g2d);
ImageIO.write(bi, "png", target);
Modified: 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 2010-05-28 03:27:24 UTC (rev 3129)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/graph/RegionGraphElement.java 2010-05-28 23:18:42 UTC (rev 3130)
@@ -52,7 +52,8 @@
// 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 labelHeight = config.regionFontSize + (config.fontPadY * 2);
+ int labelHeight = 0;
int valuesHeight = height - labelHeight;
this.values = new ValueGraphElements(x+1, y+1, width - 1, valuesHeight,
data.getHighlightedValue(), data.getValues(),
@@ -77,11 +78,11 @@
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);
+// 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);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
