X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FImageExporter.java;h=5fb69512a4c6cd5e5555a28970439a855b271673;hb=1e9f882c52f5b95d198c42973e7b2b1ce2b420df;hp=1f83b7cfe07a738a296dafe95ba17c45d5b9ad40;hpb=f9f0b83445a2da848d21614d94a909888484e25e;p=jalview.git
diff --git a/src/jalview/gui/ImageExporter.java b/src/jalview/gui/ImageExporter.java
index 1f83b7c..5fb6951 100644
--- a/src/jalview/gui/ImageExporter.java
+++ b/src/jalview/gui/ImageExporter.java
@@ -7,15 +7,13 @@ import jalview.io.JalviewFileView;
import jalview.util.ImageMaker;
import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
+import jalview.util.Platform;
import java.awt.Component;
import java.awt.Graphics;
import java.io.File;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.swing.JOptionPane;
-
/**
* A class that marshals steps in exporting a view in image graphics format
*
@@ -88,6 +86,10 @@ public class ImageExporter
String imageSource)
{
final long messageId = System.currentTimeMillis();
+ setStatus(
+ MessageManager.formatMessage(
+ "status.exporting_alignment_as_x_file", imageType),
+ messageId);
/*
* prompt user for output file if not provided
@@ -118,10 +120,15 @@ public class ImageExporter
/*
* Prompt for Text or Lineart (EPS/SVG) unless a preference is already set
* for this as EPS_RENDERING / SVG_RENDERING
+ * Always set to Text for JalviewJS as Lineart (glyph fonts) not available
*/
String renderStyle = Cache.getDefault(
imageType.getName() + "_RENDERING",
LineartOptions.PROMPT_EACH_TIME);
+ if (Platform.isJS())
+ {
+ renderStyle = "Text";
+ }
AtomicBoolean textSelected = new AtomicBoolean(
!"Lineart".equals(renderStyle));
if ((imageType == TYPE.EPS || imageType == TYPE.SVG)
@@ -129,7 +136,7 @@ public class ImageExporter
&& !Jalview.isHeadlessMode())
{
final File chosenFile = file;
- RunResponse okAction = new RunResponse(JOptionPane.OK_OPTION)
+ Runnable okAction = new Runnable()
{
@Override
public void run()
@@ -140,7 +147,7 @@ public class ImageExporter
};
LineartOptions epsOption = new LineartOptions(TYPE.EPS.getName(),
textSelected);
- epsOption.setResponseAction(new RunResponse(JOptionPane.NO_OPTION)
+ epsOption.setResponseAction(1, new Runnable()
{
@Override
public void run()
@@ -150,7 +157,7 @@ public class ImageExporter
imageType.getName()), messageId);
}
});
- epsOption.setResponseAction(okAction);
+ epsOption.setResponseAction(0, okAction);
epsOption.showDialog();
/* no code here - JalviewJS cannot execute it */
}
@@ -181,10 +188,10 @@ public class ImageExporter
String type = imageType.getName();
try
{
- setStatus(
- MessageManager.formatMessage(
- "status.exporting_alignment_as_x_file", type),
- messageId);
+// setStatus(
+// MessageManager.formatMessage(
+// "status.exporting_alignment_as_x_file", type),
+// messageId);
ImageMaker im = new ImageMaker(imageType, width, height, chosenFile,
title, asLineart);
imageWriter.exportImage(im.getGraphics());
@@ -210,7 +217,7 @@ public class ImageExporter
*/
void setStatus(String msg, long id)
{
- if (messageBoard != null)
+ if (messageBoard != null && !Jalview.isHeadlessMode())
{
messageBoard.setProgressBar(msg, id);
}