git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3068 LineartOptions for EPS/HTML/SVG, new preferences, i18n
[jalview.git]
/
src
/
jalview
/
util
/
ImageMaker.java
diff --git
a/src/jalview/util/ImageMaker.java
b/src/jalview/util/ImageMaker.java
index
cf5a6b6
..
284b7be
100755
(executable)
--- a/
src/jalview/util/ImageMaker.java
+++ b/
src/jalview/util/ImageMaker.java
@@
-21,9
+21,8
@@
package jalview.util;
import jalview.bin.Jalview;
package jalview.util;
import jalview.bin.Jalview;
-import jalview.gui.EPSOptions;
import jalview.gui.IProgressIndicator;
import jalview.gui.IProgressIndicator;
-import jalview.gui.SVGOptions;
+import jalview.gui.LineartOptions;
import jalview.io.JalviewFileChooser;
import java.awt.Component;
import jalview.io.JalviewFileChooser;
import java.awt.Component;
@@
-224,7
+223,7
@@
public class ImageMaker
&& !(System.getProperty("java.awt.headless") != null && System
.getProperty("java.awt.headless").equals("true")))
{
&& !(System.getProperty("java.awt.headless") != null && System
.getProperty("java.awt.headless").equals("true")))
{
- EPSOptions eps = new EPSOptions();
+ LineartOptions eps = new LineartOptions("EPS_RENDERING", "EPS");
renderStyle = eps.getValue();
if (renderStyle == null || eps.cancelled)
renderStyle = eps.getValue();
if (renderStyle == null || eps.cancelled)
@@
-284,7
+283,7
@@
public class ImageMaker
&& !(System.getProperty("java.awt.headless") != null && System
.getProperty("java.awt.headless").equals("true")))
{
&& !(System.getProperty("java.awt.headless") != null && System
.getProperty("java.awt.headless").equals("true")))
{
- SVGOptions svgOption = new SVGOptions();
+ LineartOptions svgOption = new LineartOptions("SVG_RENDERING", "SVG");
renderStyle = svgOption.getValue();
if (renderStyle == null || svgOption.cancelled)
renderStyle = svgOption.getValue();
if (renderStyle == null || svgOption.cancelled)