Skip to content

Commit b68da8e

Browse files
maarztmaarzt
committed
Remove dependencies and code for displaying plots
SciJava Plot should not depend on any swing dependent libraries like JFreeChart or scijava-ui-swing. The code for displaying plots is therefor moved to scijava-ui-swing * This includes the converters: * XYPlot -> JFreeChart * CategoryChart -> JFreeChart * An io plugin to save plots as SVG, * Displays for JFreeChart The code for converting plots to ImagePlus and Img is moved to imagej-legacy as it depends on ImagePlus. A converter from plot to java.awt.image.BufferedImage will be added to scijava-ui-swing.
1 parent 2e3f44c commit b68da8e

33 files changed

Lines changed: 7 additions & 2229 deletions

‎pom.xml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -104,39 +104,10 @@
104104
</repositories>
105105

106106
<dependencies>
107-
<dependency>
108-
<groupId>net.imagej</groupId>
109-
<artifactId>imagej-common</artifactId>
110-
</dependency>
111107
<dependency>
112108
<groupId>org.scijava</groupId>
113109
<artifactId>scijava-common</artifactId>
114110
</dependency>
115-
<dependency>
116-
<groupId>org.apache.commons</groupId>
117-
<artifactId>commons-math3</artifactId>
118-
</dependency>
119-
<dependency>
120-
<groupId>org.scijava</groupId>
121-
<artifactId>scijava-ui-swing</artifactId>
122-
</dependency>
123-
<dependency>
124-
<groupId>sc.fiji</groupId>
125-
<artifactId>fiji-lib</artifactId>
126-
</dependency>
127-
<dependency>
128-
<groupId>org.jfree</groupId>
129-
<artifactId>jfreechart</artifactId>
130-
</dependency>
131-
<dependency>
132-
<groupId>org.jfree</groupId>
133-
<artifactId>jfreesvg</artifactId>
134-
<version>3.2</version>
135-
</dependency>
136-
<dependency>
137-
<groupId>net.imglib2</groupId>
138-
<artifactId>imglib2-ij</artifactId>
139-
</dependency>
140111
<dependency>
141112
<groupId>junit</groupId>
142113
<artifactId>junit</artifactId>

‎src/main/java/org/scijava/plot/PlotService.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
package org.scijava.plot;
3333

34-
import net.imagej.ImageJService;
34+
import org.scijava.service.SciJavaService;
3535
import org.scijava.util.ColorRGB;
3636

3737
/**
@@ -40,7 +40,8 @@
4040
*
4141
* @author Matthias Arzt
4242
*/
43-
public interface PlotService extends ImageJService {
43+
public interface PlotService extends SciJavaService
44+
{
4445

4546
SeriesStyle newSeriesStyle(ColorRGB color, LineStyle lineStyle, MarkerStyle markerStyle);
4647

‎src/main/java/org/scijava/plot/convert/PlotToImagePlusConverter.java‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/main/java/org/scijava/plot/convert/PlotToImgConverter.java‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/main/java/org/scijava/plot/defaultplot/DefaultXYPlot.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
package org.scijava.plot.defaultplot;
3333

34-
import net.imagej.plot.*;
3534
import org.scijava.plot.NumberAxis;
3635
import org.scijava.plot.XYPlot;
3736
import org.scijava.plot.XYPlotItem;

‎src/main/java/org/scijava/plot/io/PlotSvgIOPlugin.java‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎src/main/java/org/scijava/ui/swing/viewer/plot/SwingPlotDisplayPanel.java‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)