fda/ch.psi.plot
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added title font property to plots.

Browse Source
This commit is contained in:
gobbo_a
2014-09-09 09:17:34 +02:00
parent f6539cc630
commit 4c86952b79
7 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ch.psi.plot/src/main/java/ch/psi/plot/LinePlotBase.java
View File

@@ -17,10 +17,10 @@ import javax.swing.JPanel;
/**
* TODO: FDA calls to .update -> requestUpdate()
*/
abstract public class LinePlotBase extends PlotBase<LinePlotSeries> implements LinePlot {
abstract public class LinePlotBase extends PlotBase<LinePlotSeries> implements LinePlot {
private String xAxisLabel = "X";
private String yAxisLabel = "Y";
protected LinePlotBase() {
this(null);
@@ -31,6 +31,7 @@ abstract public class LinePlotBase extends PlotBase<LinePlotSeries> implements L
}
@Override
protected void createChart() {
super.createChart();
@@ -122,6 +123,8 @@ abstract public class LinePlotBase extends PlotBase<LinePlotSeries> implements L
try {
LinePlot p = newPlot(e.getActionCommand());
p.setTitle(getTitle());
if (getTitleFont()!=null)
p.setTitleFont(getTitleFont());
p.getAxis(AxisId.X).setLabel(getAxis(AxisId.X).getLabel());
p.getAxis(AxisId.Y).setLabel(getAxis(AxisId.Y).getLabel());
for (LinePlotSeries series : getAllSeries()) {

4
ch.psi.plot/src/main/java/ch/psi/plot/Plot.java
View File

@@ -3,6 +3,7 @@
*/
package ch.psi.plot;
import java.awt.Font;
import java.awt.image.BufferedImage;
import java.io.IOException;
import javax.swing.JPanel;
@@ -21,8 +22,9 @@ public interface Plot<T extends PlotSeries>{
//Generic properties
public void setTitle(String title);
public String getTitle();
public void setTitleFont(Font font);
public Font getTitleFont();
//Generic operations
public void saveData(String filename) throws IOException;

14
ch.psi.plot/src/main/java/ch/psi/plot/PlotBase.java
View File

@@ -8,6 +8,7 @@ import ch.psi.plot.utils.MonitoredPanel;
import ch.psi.plot.utils.SwingUtils;
import ch.psi.plot.utils.SwingUtils.ExtensionFileFilter;
import ch.psi.plot.utils.SwingUtils.ImageTransferHandler;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Toolkit;
@@ -87,6 +88,19 @@ abstract public class PlotBase<T extends PlotSeries> extends MonitoredPanel impl
public String getTitle() {
return title;
}
Font titleFont;
public void setTitleFont(Font font) {
this.titleFont = font;
if (instantiated)
onTitleChanged();
}
public Font getTitleFont() {
return titleFont;
}
volatile boolean bUpdating;

5
ch.psi.plot/src/main/java/ch/psi/plot/jfree/LinePlot.java
View File

@@ -202,7 +202,10 @@ public class LinePlot extends LinePlotBase {
@Override
protected void onTitleChanged() {
chartPanel.setName(getTitle());
chart.setTitle(getTitle());
chart.setTitle(getTitle());
if(getTitleFont()!=null)
chart.getTitle().setFont(getTitleFont());
}
@Override

2
ch.psi.plot/src/main/java/ch/psi/plot/jfree/MatrixPlot.java
View File

@@ -99,6 +99,8 @@ public class MatrixPlot extends MatrixPlotBase {
protected void onTitleChanged() {
chartPanel.setName(getTitle());
chart.setTitle(getTitle());
if(getTitleFont()!=null)
chart.getTitle().setFont(getTitleFont());
}
@Override

2
ch.psi.plot/src/main/java/ch/psi/plot/jlchart/LinePlot.java
View File

@@ -185,6 +185,8 @@ public class LinePlot extends LinePlotBase {
@Override
protected void onTitleChanged() {
plot.setHeader(getTitle());
if(getTitleFont()!=null)
plot.setHeaderFont(getTitleFont());
}
@Override

4
ch.psi.plot/src/test/java/LinePlotTest.java
View File

@@ -20,8 +20,8 @@ public class LinePlotTest {
//for(int i=0;i<10;i++)
{
//LinePlot linePlot = ServiceLoader.load(LinePlot.class).iterator().next();
//LinePlot linePlot = new ch.psi.plot.jlchart.LinePlot();
LinePlot linePlot = new ch.psi.plot.jfree.LinePlot();
LinePlot linePlot = new ch.psi.plot.jlchart.LinePlot();
//LinePlot linePlot = new ch.psi.plot.jfree.LinePlot();
//LinePlot linePlot = new ch.psi.plot.javafx.LinePlot() ;
linePlot.setTitle("Title");