From 1e2d2f2495e8409b4be31ff947864167a67fd6bb Mon Sep 17 00:00:00 2001
From: tryan <tim@theryanfamily.info>
Date: Wed, 09 Apr 2014 20:55:29 -0400
Subject: [PATCH] Switch to self-hosted flotr2 graphs from Google Charts
---
src/main/java/com/gitblit/wicket/pages/SummaryPage.java | 82 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index fdc5d01..eb6eb07 100644
--- a/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
@@ -15,14 +15,17 @@
*/
package com.gitblit.wicket.pages;
-import java.awt.Color;
-import java.awt.Dimension;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -31,14 +34,6 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.wicketstuff.googlecharts.ChartAxis;
-import org.wicketstuff.googlecharts.ChartAxisType;
-import org.wicketstuff.googlecharts.ChartProvider;
-import org.wicketstuff.googlecharts.ChartType;
-import org.wicketstuff.googlecharts.IChartData;
-import org.wicketstuff.googlecharts.LineStyle;
-import org.wicketstuff.googlecharts.MarkerType;
-import org.wicketstuff.googlecharts.ShapeMarker;
import com.gitblit.Keys;
import com.gitblit.models.Metric;
@@ -53,7 +48,9 @@
import com.gitblit.wicket.MarkupProcessor.MarkupDocument;
import com.gitblit.wicket.MarkupProcessor.MarkupSyntax;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.charting.SecureChart;
+import com.gitblit.wicket.charting.Chart;
+import com.gitblit.wicket.charting.Charts;
+import com.gitblit.wicket.charting.Flotr2Charts;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.LogPanel;
@@ -159,38 +156,49 @@
// global, no readme on summary page
add(new Label("readme").setVisible(false));
}
-
- // Display an activity line graph
- insertActivityGraph(metrics);
+
+ Charts charts = createCharts(metrics);
+ add(new HeaderContributor(charts));
+
}
@Override
protected String getPageName() {
return getString("gb.summary");
}
-
- private void insertActivityGraph(List<Metric> metrics) {
- if ((metrics != null) && (metrics.size() > 0)
- && app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
- IChartData data = WicketUtils.getChartData(metrics);
-
- ChartProvider provider = new ChartProvider(new Dimension(290, 100), ChartType.LINE,
- data);
- ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
- dateAxis.setLabels(new String[] { metrics.get(0).name,
- metrics.get(metrics.size() / 2).name, metrics.get(metrics.size() - 1).name });
- provider.addAxis(dateAxis);
-
- ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
- commitAxis.setLabels(new String[] { "",
- String.valueOf((int) WicketUtils.maxValue(metrics)) });
- provider.addAxis(commitAxis);
- provider.setLineStyles(new LineStyle[] { new LineStyle(2, 4, 0), new LineStyle(0, 4, 1) });
- provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.decode("#002060"), 1, -1, 5));
-
- add(new SecureChart("commitsChart", provider));
- } else {
- add(WicketUtils.newBlankImage("commitsChart"));
+
+ private Charts createCharts(List<Metric> metrics) {
+
+ Charts charts = new Flotr2Charts();
+
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ String displayFormat = "MMM dd";
+ if(metrics.size() > 0 && metrics.get(0).name.length() == 7){
+ df = new SimpleDateFormat("yyyy-MM");
+ displayFormat = "yyyy MMM";
}
+ df.setTimeZone(getTimeZone());
+
+ // build google charts
+ Chart chart = charts.createLineChart("commitsChart", getString("gb.activity"), "day", getString("gb.commits"));
+ chart.setDateFormat(displayFormat);
+
+ for (Metric metric : metrics) {
+ Date date;
+ try {
+ date = df.parse(metric.name);
+ } catch (ParseException e) {
+ logger.error("Unable to parse date: " + metric.name);
+ return charts;
+ }
+ chart.addValue(date, (int)metric.count);
+ if(metric.tag > 0 ){
+ chart.addHighlight(date, (int)metric.count);
+ }
+ }
+ charts.addChart(chart);
+
+ return charts;
}
+
}
--
Gitblit v1.9.1