From db91a34ccb5135f733c7431fdba49669131e97da Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 19 Nov 2011 07:33:59 -0500
Subject: [PATCH] Reorganizing the recent activity feature
---
src/com/gitblit/wicket/charting/GooglePieChart.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/charting/GooglePieChart.java b/src/com/gitblit/wicket/charting/GooglePieChart.java
index 8367c42..119a824 100644
--- a/src/com/gitblit/wicket/charting/GooglePieChart.java
+++ b/src/com/gitblit/wicket/charting/GooglePieChart.java
@@ -18,6 +18,8 @@
import java.text.MessageFormat;
import java.util.Collections;
+import com.gitblit.utils.StringUtils;
+
/**
* Builds an interactive pie chart using the Visualization API.
*
@@ -43,13 +45,21 @@
Collections.sort(values);
+ StringBuilder colors = new StringBuilder("colors:[");
for (int i = 0; i < values.size(); i++) {
ChartValue value = values.get(i);
+ colors.append('\'');
+ colors.append(StringUtils.getColor(value.name));
+ colors.append('\'');
+ if (i < values.size() - 1) {
+ colors.append(',');
+ }
line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 0, ''{2}'');", dName, i,
value.name));
line(sb, MessageFormat.format("{0}.setValue({1,number,0}, 1, {2,number,0.0});", dName,
i, value.value));
}
+ colors.append(']');
// instantiate chart
String cName = "chart_" + dataName;
@@ -58,8 +68,8 @@
cName, tagId));
line(sb,
MessageFormat
- .format("{0}.draw({1}, '{'width: {2,number,0}, height: {3,number,0}, chartArea:'{'left:20,top:20'}', title: ''{4}'' '}');",
- cName, dName, width, height, title));
+ .format("{0}.draw({1}, '{'width: {2,number,0}, height: {3,number,0}, chartArea:'{'left:20,top:20'}', title: ''{4}'', {5} '}');",
+ cName, dName, width, height, title, colors.toString()));
line(sb, "");
}
}
\ No newline at end of file
--
Gitblit v1.9.1