X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=50f747162b3cd18b72a3c33347ac6182c5784ced;hb=2ba9716bbffe4b35f640f8a85be4b60fe5fb2fdd;hp=14a6ccb0ac5330d833b08ed42b2c50a1456da9b1;hpb=b7dc93a1799176e0fb0941595c18069f8925959d;p=jalview.git
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 14a6ccb..50f7471 100755
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -11,67 +11,222 @@ import java.util.*;
public class HTMLOutput
{
- SequenceRenderer sr = new SequenceRenderer(null);
+ AlignViewport av;
+ SequenceRenderer sr;
+ Color color;
- public HTMLOutput(AlignmentI alignment, ColourSchemeI cs)
+ public HTMLOutput(AlignViewport av)
{
- Color color;
- JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);
+ this.av = av;
+ sr = new SequenceRenderer(av);
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+ new String[]{"html"},
+ new String[]{"HTML files"},
+ "HTML files");
+
+ chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Save as HTML");
chooser.setToolTipText("Save");
int value = chooser.showSaveDialog(null);
- if(value == JFileChooser.APPROVE_OPTION)
+ if(value == JalviewFileChooser.APPROVE_OPTION)
{
String choice = chooser.getSelectedFile().getPath();
- jalview.bin.Cache.LAST_DIRECTORY = choice;
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile().getParent());
try{
PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(choice));
out.println("");
out.println("");
out.println("
");
- out.println("\n");
- out.println("\n");
- //////////////
- for (int i = 0; i < alignment.getHeight(); i++)
- {
- SequenceI seq = alignment.getSequenceAt(i);
- out.println(""+seq.getName()+" | ");
- for (int res = 0; res < seq.getLength(); res++)
- {
- color = sr.getResidueBoxColour(cs, seq, res);
-
- if(color.getRGB()<-1)
- {
- out.println(""+seq.getCharAt(res)+" | ");
- }
- else
- out.println(""+seq.getCharAt(res)+" | ");
-
- }
-
- out.println(" ");
- }
- //////////////
- out.println(" ");
- out.println(" |
\n\n");
+ if(av.getWrapAlignment())
+ drawWrappedAlignment(out);
+ else
+ drawUnwrappedAlignment(out);
+ out.println("\n