projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update turnon_telebt to use new approach for saving cal value on TeleBT
[fw/altos]
/
altosuilib
/
AltosUIGraph.java
diff --git
a/altosuilib/AltosUIGraph.java
b/altosuilib/AltosUIGraph.java
index efc3d493cd840794fc8f4ada944c544701cd2066..098e9a52f17ebe28add7f8f3829f10f86279f278 100644
(file)
--- a/
altosuilib/AltosUIGraph.java
+++ b/
altosuilib/AltosUIGraph.java
@@
-16,7
+16,7
@@
* 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
2
;
+package org.altusmetrum.altosuilib_1
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-24,7
+24,7
@@
import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1
2
.*;
+import org.altusmetrum.altoslib_1
3
.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
@@
-36,7
+36,7
@@
import org.jfree.chart.labels.*;
import org.jfree.data.xy.*;
import org.jfree.data.*;
import org.jfree.data.xy.*;
import org.jfree.data.*;
-public class AltosUIGraph implements AltosUnitsListener {
+public class AltosUIGraph implements AltosUnitsListener
, AltosShapeListener
{
XYPlot plot;
JFreeChart chart;
XYPlot plot;
JFreeChart chart;
@@
-56,14
+56,14
@@
public class AltosUIGraph implements AltosUnitsListener {
return panel;
}
return panel;
}
- public AltosUIAxis newAxis(String label, AltosUnits units,
Color color
, int flags) {
- AltosUIAxis axis = new AltosUIAxis(label, units,
color
, axis_index++, flags);
+ public AltosUIAxis newAxis(String label, AltosUnits units,
AltosUILineStyle line_style
, int flags) {
+ AltosUIAxis axis = new AltosUIAxis(label, units,
line_style
, axis_index++, flags);
plot.setRangeAxis(axis.index, axis);
return axis;
}
plot.setRangeAxis(axis.index, axis);
return axis;
}
- public AltosUIAxis newAxis(String label, AltosUnits units,
Color color
) {
- return newAxis(label, units,
color
, AltosUIAxis.axis_default);
+ public AltosUIAxis newAxis(String label, AltosUnits units,
AltosUILineStyle line_style
) {
+ return newAxis(label, units,
line_style
, AltosUIAxis.axis_default);
}
void addAxis(AltosUIAxis axis) {
}
void addAxis(AltosUIAxis axis) {
@@
-99,6
+99,16
@@
public class AltosUIGraph implements AltosUnitsListener {
units_changed(false);
}
units_changed(false);
}
+ public void set_shapes_visible(boolean visible) {
+ for (AltosUITimeSeries s : series)
+ s.set_shapes_visible(visible);
+ }
+
+ public void set_line_width(float width) {
+ for (AltosUITimeSeries s : series)
+ s.set_line_width(width);
+ }
+
public void setName (String name) {
chart.setTitle(name);
}
public void setName (String name) {
chart.setTitle(name);
}
@@
-127,6
+137,8
@@
public class AltosUIGraph implements AltosUnitsListener {
this.series = null;
this.axis_index = 0;
this.series = null;
this.axis_index = 0;
+ enable.register_shape_listener(this);
+
axes_added = new Hashtable<Integer,Boolean>();
xAxis = new NumberAxis("Time (s)");
axes_added = new Hashtable<Integer,Boolean>();
xAxis = new NumberAxis("Time (s)");