archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GraphsPane: fix for graph reaching above 100% (issue #31)

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@805 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-08-31 19:15:59 +00:00
parent 98c60fb878
commit 220f136848
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/micropolisj/gui/GraphsPane.java
View file

@ -182,6 +182,17 @@ public class GraphsPane extends JPanel
return btn; return btn;
} }
int getHistoryMax()
{
int max = 0;
for (GraphData g : GraphData.values()) {
for (int pos = 0; pos < 240; pos++) {
max = Math.max(max, getHistoryValue(g, pos));
}
}
return max;
}
int getHistoryValue(GraphData graph, int pos) int getHistoryValue(GraphData graph, int pos)
{ {
assert pos >= 0 && pos < 240; assert pos >= 0 && pos < 240;
@ -265,6 +276,7 @@ public class GraphsPane extends JPanel
int H = isOneTwenty ? 239 : 119; int H = isOneTwenty ? 239 : 119;
final HashMap<GraphData, Path2D.Double> paths = new HashMap<GraphData,Path2D.Double>(); final HashMap<GraphData, Path2D.Double> paths = new HashMap<GraphData,Path2D.Double>();
double scale = Math.max(256.0, getHistoryMax());
for (GraphData gd : GraphData.values()) for (GraphData gd : GraphData.values())
{ {
if (dataBtns.get(gd).isSelected()) { if (dataBtns.get(gd).isSelected()) {
@ -272,7 +284,7 @@ public class GraphsPane extends JPanel
Path2D.Double path = new Path2D.Double(); Path2D.Double path = new Path2D.Double();
for (int i = 0; i < 120; i++) { for (int i = 0; i < 120; i++) {
double xp = leftEdge + i * x_interval; double xp = leftEdge + i * x_interval;
double yp = bottomEdge - getHistoryValue(gd,H-i) * (bottomEdge-topEdge) / 256.0; double yp = bottomEdge - getHistoryValue(gd,H-i) * (bottomEdge-topEdge) / scale;
if (i == 0) { if (i == 0) {
path.moveTo(xp, yp); path.moveTo(xp, yp);
} else { } else {