projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ChangeLog for 1.7 release
[fw/altos]
/
altosuilib
/
AltosUISeries.java
diff --git
a/altosuilib/AltosUISeries.java
b/altosuilib/AltosUISeries.java
index 1f2a1c3f6a18c528a5ebd70802283ec0e3bfdb17..66cc7d69a6133ffe3540f576d15f690bb8959e55 100644
(file)
--- a/
altosuilib/AltosUISeries.java
+++ b/
altosuilib/AltosUISeries.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,14
+16,14
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_1
1
;
import java.io.*;
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import java.io.*;
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
3
.*;
+import org.altusmetrum.altoslib_
11
.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
@@
-38,7
+39,7
@@
class AltosUITime extends AltosUnits {
public double value(double v, boolean imperial_units) { return v; }
public double inverse(double v, boolean imperial_unis) { return v; }
public double value(double v, boolean imperial_units) { return v; }
public double inverse(double v, boolean imperial_unis) { return v; }
-
+
public String show_units(boolean imperial_units) { return "s"; }
public String say_units(boolean imperial_units) { return "seconds"; }
public String show_units(boolean imperial_units) { return "s"; }
public String say_units(boolean imperial_units) { return "seconds"; }
@@
-60,7
+61,7
@@
public class AltosUISeries extends XYSeries implements AltosUIGrapher {
XYItemRenderer renderer;
int fetch;
boolean enable;
XYItemRenderer renderer;
int fetch;
boolean enable;
-
+
public void set_units() {
axis.set_units();
StandardXYToolTipGenerator ttg;
public void set_units() {
axis.set_units();
StandardXYToolTipGenerator ttg;
@@
-69,7
+70,7
@@
public class AltosUISeries extends XYSeries implements AltosUIGrapher {
String example = units.graph_format(7);
ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
String example = units.graph_format(7);
ttg = new StandardXYToolTipGenerator(String.format("{1}s: {2}%s ({0})",
- units.
show
_units()),
+ units.
graph
_units()),
new java.text.DecimalFormat(time_example),
new java.text.DecimalFormat(example));
renderer.setBaseToolTipGenerator(ttg);
new java.text.DecimalFormat(time_example),
new java.text.DecimalFormat(example));
renderer.setBaseToolTipGenerator(ttg);
@@
-85,7
+86,7
@@
public class AltosUISeries extends XYSeries implements AltosUIGrapher {
public void add(AltosUIDataPoint dataPoint) {
try {
public void add(AltosUIDataPoint dataPoint) {
try {
- super.add(dataPoint.x(), units.value(dataPoint.y(fetch)));
+ super.add(dataPoint.x(), units.
graph_
value(dataPoint.y(fetch)));
} catch (AltosUIDataMissing dm) {
}
}
} catch (AltosUIDataMissing dm) {
}
}
@@
-104,6
+105,7
@@
public class AltosUISeries extends XYSeries implements AltosUIGrapher {
renderer = new XYLineAndShapeRenderer(true, false);
renderer.setSeriesPaint(0, color);
renderer = new XYLineAndShapeRenderer(true, false);
renderer.setSeriesPaint(0, color);
+ renderer.setSeriesStroke(0, new BasicStroke(2, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
renderer.setSeriesVisible(0, enable);
set_units();
}
renderer.setSeriesVisible(0, enable);
set_units();
}