X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FImageExporter.java;h=ce1cb4663e0b98e7e3c486e7610f03bc98891ccb;hb=d654b1f014790b7ae25e6eec631847170a930987;hp=1f83b7cfe07a738a296dafe95ba17c45d5b9ad40;hpb=f9f0b83445a2da848d21614d94a909888484e25e;p=jalview.git
diff --git a/src/jalview/gui/ImageExporter.java b/src/jalview/gui/ImageExporter.java
index 1f83b7c..ce1cb46 100644
--- a/src/jalview/gui/ImageExporter.java
+++ b/src/jalview/gui/ImageExporter.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.gui;
import jalview.bin.Cache;
@@ -7,15 +27,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
*
@@ -40,8 +58,7 @@ public class ImageExporter
*/
public interface ImageWriterI
{
- void exportImage(Graphics g)
- throws Exception;
+ void exportImage(Graphics g) throws Exception;
}
private IProgressIndicator messageBoard;
@@ -88,6 +105,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 +139,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 +155,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 +166,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 +176,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 +207,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());
@@ -194,9 +220,8 @@ public class ImageExporter
messageId);
} catch (Exception e)
{
- System.out
- .println(String.format("Error creating %s file: %s", type,
- e.toString()));
+ System.out.println(String.format("Error creating %s file: %s", type,
+ e.toString()));
setStatus(MessageManager.formatMessage("info.error_creating_file",
type), messageId);
}
@@ -210,7 +235,7 @@ public class ImageExporter
*/
void setStatus(String msg, long id)
{
- if (messageBoard != null)
+ if (messageBoard != null && !Jalview.isHeadlessMode())
{
messageBoard.setProgressBar(msg, id);
}