提交 a1db878c 编写于 作者: F Frankie Wu

add id prefix for text columns

上级 d883535b
......@@ -15,16 +15,6 @@ public abstract class AbstractGraphPayload implements GraphPayload {
m_axisYLabel = axisYLabel;
}
public final double[] getValues() {
if (m_values == null) {
m_values = loadValues();
}
return m_values;
}
protected abstract double[] loadValues();
@Override
public String getAxisXLabel(int index) {
return String.valueOf(index);
......@@ -65,6 +55,17 @@ public abstract class AbstractGraphPayload implements GraphPayload {
return 250;
}
@Override
public String getIdPrefix() {
Class<?> clazz = getClass();
if (clazz.isAnonymousClass()) {
return "a";
} else {
return clazz.getSimpleName().substring(0, 1);
}
}
@Override
public int getMarginBottom() {
return 60;
......@@ -95,6 +96,14 @@ public abstract class AbstractGraphPayload implements GraphPayload {
return m_title;
}
public final double[] getValues() {
if (m_values == null) {
m_values = loadValues();
}
return m_values;
}
@Override
public int getWidth() {
return 580;
......@@ -109,4 +118,6 @@ public abstract class AbstractGraphPayload implements GraphPayload {
public boolean isAxisXLabelSkipped() {
return getValues().length >= 16;
}
protected abstract double[] loadValues();
}
......@@ -41,6 +41,7 @@ public class DefaultGraphBuilder implements GraphBuilder {
int cols = payload.getColumns();
int xstep = w / cols;
int[] pixels = m_translater.translate(h, maxValue, values);
String idPrefix = payload.getIdPrefix();
b.tag1("g", "id", "bar", "fill", "red");
......@@ -49,7 +50,7 @@ public class DefaultGraphBuilder implements GraphBuilder {
int x = left + xstep * i;
int y = top + h - pixel;
b.tag("rect", "id", "b" + i, "x", x, "y", y, "width", xstep - 1, "height", pixel);
b.tag("rect", "id", idPrefix + i, "x", x, "y", y, "width", xstep - 1, "height", pixel);
}
b.tag2("g");
......
package com.dianping.cat.report.graph;
public interface GraphPayload {
public String getAxisXLabel(int index);
public String getAxisXTitle();
public String getAxisYTitle();
public String getAxisXLabel(int index);
public int getColumns();
public String getDescription();
public int getDisplayHeight();
public int getDisplayWidth();
public int getHeight();
public String getIdPrefix();
public int getMarginBottom();
public int getMarginLeft();
......@@ -29,10 +35,6 @@ public interface GraphPayload {
public int getWidth();
public int getDisplayHeight();
public int getDisplayWidth();
public boolean isAxisXLabelRotated();
public boolean isAxisXLabelSkipped();
......
......@@ -153,8 +153,8 @@ public class Handler implements PageHandler<Context>, Initializable {
}
@Override
public int getWidth() {
return super.getWidth() + 120;
public String getAxisXLabel(int index) {
return String.valueOf(index * 5);
}
@Override
......@@ -168,9 +168,10 @@ public class Handler implements PageHandler<Context>, Initializable {
}
@Override
public String getAxisXLabel(int index) {
return String.valueOf(index * 5);
public int getWidth() {
return super.getWidth() + 120;
}
}
final class AverageTimePayload extends AbstractPayload {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册