X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;h=b5fdc2c4012a68400b9645e3cfa4785b476157ed;hb=c932f0e85a8852824cdd8ce790af68682732c85c;hp=2fabe9a66c8b76d829bf137c8c073384e03cef0a;hpb=26371ff5c38bbb092e432d5616313bc1088e87a2;p=jalview.git

diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java
index 2fabe9a..b5fdc2c 100644
--- a/src/jalview/io/HtmlSvgOutput.java
+++ b/src/jalview/io/HtmlSvgOutput.java
@@ -20,71 +20,37 @@
  */
 package jalview.io;
 
-import jalview.exceptions.NoFileSelectedException;
-import jalview.gui.AlignmentPanel;
-import jalview.gui.HTMLOptions;
-import jalview.gui.OOMWarning;
-import jalview.math.AlignmentDimension;
-import jalview.util.MessageManager;
-
 import java.awt.Graphics;
 import java.awt.print.PrinterException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.jfree.graphics2d.svg.SVGGraphics2D;
 import org.jfree.graphics2d.svg.SVGHints;
 
+import jalview.bin.Cache;
+import jalview.gui.AlignmentPanel;
+import jalview.gui.LineartOptions;
+import jalview.gui.OOMWarning;
+import jalview.math.AlignmentDimension;
+import jalview.util.MessageManager;
+
 public class HtmlSvgOutput extends HTMLOutput
 {
-
-
   public HtmlSvgOutput(AlignmentPanel ap)
   {
-    super(ap);
-  }
-
-  @Override
-  public void exportHTML(String outputFile)
-  {
-    exportStarted();
-    try
-    {
-      if (outputFile == null)
-      {
-        outputFile = getOutputFile();
-      }
-      generatedFile = new File(outputFile);
-    } catch (NoFileSelectedException e)
-    {
-      setProgressMessage(MessageManager.formatMessage(
-              "status.cancelled_image_export_operation", "HTML"));
-      return;
-    } catch (Exception e)
-    {
-      setProgressMessage(MessageManager.formatMessage(
-              "info.error_creating_file", "HTML"));
-      e.printStackTrace();
-      return;
-    }
-    new Thread(this).start();
-  }
-
-
-  static JalviewFileChooser getHTMLChooser()
-  {
-    return new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
-            new String[] { "html" },
-            new String[] { "Hypertext Markup Language" },
-            "Hypertext Markup Language");
+    super(ap, "HTML");
   }
 
-  public int printUnwrapped(int pwidth, int pheight, int pi, Graphics... pg)
+  public int printUnwrapped(int pwidth, int pheight, int pi,
+          Graphics idGraphics, Graphics alignmentGraphics)
           throws PrinterException
   {
-    return ap.printUnwrapped(pwidth, pheight, pi, pg);
+    return ap.printUnwrapped(pwidth, pheight, pi, idGraphics,
+            alignmentGraphics);
   }
 
   public int printWrapped(int pwidth, int pheight, int pi, Graphics... pg)
@@ -93,17 +59,20 @@ public class HtmlSvgOutput extends HTMLOutput
     return ap.printWrappedAlignment(pwidth, pheight, pi, pg[0]);
   }
 
-  private String getHtml(String titleSvg, String alignmentSvg,
-          String jsonData, boolean wrapped)
+  String getHtml(String titleSvg, String alignmentSvg, String jsonData,
+          boolean wrapped)
   {
     StringBuilder htmlSvg = new StringBuilder();
     htmlSvg.append("<html>\n");
     if (jsonData != null)
     {
-      htmlSvg.append("<button onclick=\"javascipt:openJalviewUsingCurrentUrl();\">Launch in Jalview</button> &nbsp;");
-      htmlSvg.append("<input type=\"submit\" value=\"View raw BioJSON Data\" onclick=\"jQuery.facebox({ div:'#seqData' }); return false;\" />");
-      htmlSvg.append("<div style=\"display: none;\" name=\"seqData\" id=\"seqData\" >"
-              + jsonData + "</div>");
+      htmlSvg.append(
+              "<button onclick=\"javascipt:openJalviewUsingCurrentUrl();\">Launch in Jalview</button> &nbsp;");
+      htmlSvg.append(
+              "<input type=\"submit\" value=\"View raw BioJSON Data\" onclick=\"jQuery.facebox({ div:'#seqData' }); return false;\" />");
+      htmlSvg.append(
+              "<div style=\"display: none;\" name=\"seqData\" id=\"seqData\" >"
+                      + jsonData + "</div>");
       htmlSvg.append("<br/>&nbsp;");
     }
     htmlSvg.append("\n<style type=\"text/css\"> "
@@ -116,72 +85,80 @@ public class HtmlSvgOutput extends HTMLOutput
     if (jsonData != null)
     {
       // facebox style sheet for displaying raw BioJSON data
-      htmlSvg.append("#facebox { position: absolute;  top: 0;   left: 0; z-index: 100; text-align: left; }\n"
-              + "#facebox .popup{ position:relative; border:3px solid rgba(0,0,0,0); -webkit-border-radius:5px;"
-              + "-moz-border-radius:5px; border-radius:5px; -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4); -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);"
-              + "box-shadow:0 0 18px rgba(0,0,0,0.4); }\n"
-              + "#facebox .content { display:table; width: 98%; padding: 10px; background: #fff; -webkit-border-radius:4px; -moz-border-radius:4px;"
-              + " border-radius:4px; }\n"
-              + "#facebox .content > p:first-child{ margin-top:0; }\n"
-              + "#facebox .content > p:last-child{ margin-bottom:0; }\n"
-              + "#facebox .close{ position:absolute; top:5px; right:5px; padding:2px; background:#fff; }\n"
-              + "#facebox .close img{ opacity:0.3; }\n"
-              + "#facebox .close:hover img{ opacity:1.0; }\n"
-              + "#facebox .loading { text-align: center; }\n"
-              + "#facebox .image { text-align: center;}\n"
-              + "#facebox img { border: 0;  margin: 0; }\n"
-              + "#facebox_overlay { position: fixed; top: 0px; left: 0px; height:100%; width:100%; }\n"
-              + ".facebox_hide { z-index:-100; }\n"
-              + ".facebox_overlayBG { background-color: #000;  z-index: 99;  }");
+      htmlSvg.append(
+              "#facebox { position: absolute;  top: 0;   left: 0; z-index: 100; text-align: left; }\n"
+                      + "#facebox .popup{ position:relative; border:3px solid rgba(0,0,0,0); -webkit-border-radius:5px;"
+                      + "-moz-border-radius:5px; border-radius:5px; -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4); -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);"
+                      + "box-shadow:0 0 18px rgba(0,0,0,0.4); }\n"
+                      + "#facebox .content { display:table; width: 98%; padding: 10px; background: #fff; -webkit-border-radius:4px; -moz-border-radius:4px;"
+                      + " border-radius:4px; }\n"
+                      + "#facebox .content > p:first-child{ margin-top:0; }\n"
+                      + "#facebox .content > p:last-child{ margin-bottom:0; }\n"
+                      + "#facebox .close{ position:absolute; top:5px; right:5px; padding:2px; background:#fff; }\n"
+                      + "#facebox .close img{ opacity:0.3; }\n"
+                      + "#facebox .close:hover img{ opacity:1.0; }\n"
+                      + "#facebox .loading { text-align: center; }\n"
+                      + "#facebox .image { text-align: center;}\n"
+                      + "#facebox img { border: 0;  margin: 0; }\n"
+                      + "#facebox_overlay { position: fixed; top: 0px; left: 0px; height:100%; width:100%; }\n"
+                      + ".facebox_hide { z-index:-100; }\n"
+                      + ".facebox_overlayBG { background-color: #000;  z-index: 99;  }");
     }
     htmlSvg.append("</style>");
     if (!wrapped)
     {
-    htmlSvg.append("<div class=\"main-container\" \n>");
-    htmlSvg.append("<div class=\"titlex\">\n");
-    htmlSvg.append("<div class=\"sub-category-container\"> \n");
-    htmlSvg.append(titleSvg);
-    htmlSvg.append("</div>");
-    htmlSvg.append("</div>\n\n<!-- ========================================================================================== -->\n\n");
-    htmlSvg.append("<div class=\"align\" >");
-    htmlSvg.append(
-            "<div class=\"sub-category-container\"> <div style=\"overflow-x: scroll;\">")
-            .append(alignmentSvg).append("</div></div>").append("</div>");
-    htmlSvg.append("</div>");
+      htmlSvg.append("<div class=\"main-container\" \n>");
+      htmlSvg.append("<div class=\"titlex\">\n");
+      htmlSvg.append("<div class=\"sub-category-container\"> \n");
+      htmlSvg.append(titleSvg);
+      htmlSvg.append("</div>");
+      htmlSvg.append(
+              "</div>\n\n<!-- ========================================================================================== -->\n\n");
+      htmlSvg.append("<div class=\"align\" >");
+      htmlSvg.append(
+              "<div class=\"sub-category-container\"> <div style=\"overflow-x: scroll;\">")
+              .append(alignmentSvg).append("</div></div>").append("</div>");
+      htmlSvg.append("</div>");
 
-    htmlSvg.append("<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
-            + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n"
-            + "<script>\n"
-            + "var subCatContainer = $(\".sub-category-container\");\n"
-            + "subCatContainer.scroll(\nfunction() {\n"
-            + "subCatContainer.scrollTop($(this).scrollTop());\n});\n");
+      htmlSvg.append(
+              "<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
+                      + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n"
+                      + "<script>\n"
+                      + "var subCatContainer = $(\".sub-category-container\");\n"
+                      + "subCatContainer.scroll(\nfunction() {\n"
+                      + "subCatContainer.scrollTop($(this).scrollTop());\n});\n");
 
-    htmlSvg.append("</script>\n");
+      htmlSvg.append("</script>\n");
     }
     else
     {
-      htmlSvg.append("<div>\n")
-              .append(alignmentSvg).append("</div>");
-      htmlSvg.append("<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
-              + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n");
+      htmlSvg.append("<div>\n").append(alignmentSvg).append("</div>");
+      htmlSvg.append(
+              "<script language=\"JavaScript\" type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js\"></script>\n"
+                      + "<script language=\"JavaScript\" type=\"text/javascript\"  src=\"http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js\"></script>\n");
     }
 
     // javascript for launching file in Jalview
     htmlSvg.append("<script language=\"JavaScript\">\n");
     htmlSvg.append("function openJalviewUsingCurrentUrl(){\n");
-    htmlSvg.append("    var json = JSON.parse(document.getElementById(\"seqData\").innerHTML);\n");
-    htmlSvg.append("    var jalviewVersion = json['appSettings'].version;\n");
+    htmlSvg.append(
+            "    var json = JSON.parse(document.getElementById(\"seqData\").innerHTML);\n");
+    htmlSvg.append(
+            "    var jalviewVersion = json['appSettings'].version;\n");
     htmlSvg.append("    var url = json['appSettings'].webStartUrl;\n");
-    htmlSvg.append("    var myForm = document.createElement(\"form\");\n\n");
+    htmlSvg.append(
+            "    var myForm = document.createElement(\"form\");\n\n");
     htmlSvg.append("    var heap = document.createElement(\"input\");\n");
     htmlSvg.append("    heap.setAttribute(\"name\", \"jvm-max-heap\") ;\n");
     htmlSvg.append("    heap.setAttribute(\"value\", \"2G\");\n\n");
     htmlSvg.append("    var target = document.createElement(\"input\");\n");
     htmlSvg.append("    target.setAttribute(\"name\", \"open\");\n");
     htmlSvg.append("    target.setAttribute(\"value\", document.URL);\n\n");
-    htmlSvg.append("    var jvVersion = document.createElement(\"input\");\n");
+    htmlSvg.append(
+            "    var jvVersion = document.createElement(\"input\");\n");
     htmlSvg.append("    jvVersion.setAttribute(\"name\", \"version\") ;\n");
-    htmlSvg.append("    jvVersion.setAttribute(\"value\", jalviewVersion);\n\n");
+    htmlSvg.append(
+            "    jvVersion.setAttribute(\"value\", jalviewVersion);\n\n");
     htmlSvg.append("    myForm.action = url;\n");
     htmlSvg.append("    myForm.appendChild(heap);\n");
     htmlSvg.append("    myForm.appendChild(target);\n");
@@ -212,8 +189,8 @@ public class HtmlSvgOutput extends HTMLOutput
   @Override
   public boolean isEmbedData()
   {
-    return Boolean.valueOf(jalview.bin.Cache.getDefault(
-            "EXPORT_EMBBED_BIOJSON", "true"));
+    return Boolean
+            .valueOf(Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true"));
   }
 
   @Override
@@ -223,44 +200,83 @@ public class HtmlSvgOutput extends HTMLOutput
   }
 
   @Override
-  public File getExportedFile()
+  public void run()
   {
-    return generatedFile;
+    run(null);
   }
 
   @Override
-  public void run()
+  public void run(String renderer)
   {
     try
     {
-      setProgressMessage(null);
-      setProgressMessage(MessageManager.formatMessage(
-              "status.exporting_alignment_as_x_file", "HTML"));
-      AlignmentDimension aDimension = ap.getAlignmentDimension();
-      SVGGraphics2D idPanelGraphics = new SVGGraphics2D(
-              aDimension.getWidth(), aDimension.getHeight());
-      SVGGraphics2D alignPanelGraphics = new SVGGraphics2D(
-              aDimension.getWidth(), aDimension.getHeight());
+      String renderStyle = renderer == null
+              ? Cache.getDefault("HTML_RENDERING",
+                      LineartOptions.PROMPT_EACH_TIME)
+              : renderer;
+      AtomicBoolean textOption = new AtomicBoolean(
+              !"lineart".equals(renderStyle.toLowerCase(Locale.ROOT)));
 
-      String renderStyle = jalview.bin.Cache.getDefault("HTML_RENDERING",
-              "Prompt each time");
+      /*
+       * configure the action to run on OK in the dialog
+       */
+      Runnable okAction = () -> {
+        doOutput(textOption.get());
+      };
 
-      // If we need to prompt, and if the GUI is visible then
-      // Prompt for rendering style
-      if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless())
+      /*
+       * Prompt for character rendering style if preference is not set
+       */
+      if (renderStyle.equalsIgnoreCase(LineartOptions.PROMPT_EACH_TIME)
+              && !isHeadless())
       {
-        HTMLOptions svgOption = new HTMLOptions();
-        renderStyle = svgOption.getValue();
-
-        if (renderStyle == null || svgOption.cancelled)
-        {
+        LineartOptions svgOption = new LineartOptions("HTML", textOption);
+        svgOption.setResponseAction(1, () -> {
           setProgressMessage(MessageManager.formatMessage(
-                  "status.cancelled_image_export_operation", "HTML"));
-          return;
-        }
+                  "status.cancelled_image_export_operation",
+                  getDescription()));
+        });
+        svgOption.setResponseAction(0, okAction);
+        svgOption.showDialog();
+        /* no code here - JalviewJS cannot execute it */
+      }
+      else
+      {
+        /*
+         * else (if preference set) just do the export action
+         */
+        doOutput(textOption.get());
       }
+    } catch (OutOfMemoryError err)
+    {
+      jalview.bin.Console.outPrintln("########################\n" + "OUT OF MEMORY "
+              + generatedFile + "\n" + "########################");
+      new OOMWarning("Creating Image for " + generatedFile, err);
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+      setProgressMessage(MessageManager
+              .formatMessage("info.error_creating_file", getDescription()));
+    }
+  }
 
-      if (renderStyle.equalsIgnoreCase("Lineart"))
+  /**
+   * Builds and writes the image to the file specified by field
+   * <code>generatedFile</code>
+   * 
+   * @param textCharacters
+   *          true for Text character rendering, false for Lineart
+   */
+  protected void doOutput(boolean textCharacters)
+  {
+    try
+    {
+      AlignmentDimension aDimension = ap.getAlignmentDimension();
+      SVGGraphics2D idPanelGraphics = new SVGGraphics2D(
+              aDimension.getWidth(), aDimension.getHeight());
+      SVGGraphics2D alignPanelGraphics = new SVGGraphics2D(
+              aDimension.getWidth(), aDimension.getHeight());
+      if (!textCharacters) // Lineart selected
       {
         idPanelGraphics.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE,
                 SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR);
@@ -281,25 +297,20 @@ public class HtmlSvgOutput extends HTMLOutput
       String idPanelSvgData = idPanelGraphics.getSVGDocument();
       String alignPanelSvgData = alignPanelGraphics.getSVGDocument();
       String jsonData = getBioJSONData();
-      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData,
-              jsonData, ap.av.getWrapAlignment());
+      String htmlData = getHtml(idPanelSvgData, alignPanelSvgData, jsonData,
+              ap.av.getWrapAlignment());
       FileOutputStream out = new FileOutputStream(generatedFile);
       out.write(htmlData.getBytes());
       out.flush();
       out.close();
-      setProgressMessage(MessageManager.formatMessage(
-              "status.export_complete", "HTML"));
+      setProgressMessage(MessageManager
+              .formatMessage("status.export_complete", getDescription()));
       exportCompleted();
-    } catch (OutOfMemoryError err)
-    {
-      System.out.println("########################\n" + "OUT OF MEMORY "
-              + generatedFile + "\n" + "########################");
-      new OOMWarning("Creating Image for " + generatedFile, err);
     } catch (Exception e)
     {
       e.printStackTrace();
-      setProgressMessage(MessageManager.formatMessage(
-              "info.error_creating_file", "HTML"));
+      setProgressMessage(MessageManager
+              .formatMessage("info.error_creating_file", getDescription()));
     }
   }
 }
