X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FHTMLOutput.java;h=fd51823c9277734de36dd88550ef599f111df726;hb=24efbd38f2c3dceaf6d3e305eef41ba0b0c9ebdc;hp=7988182beaba5b4076a2936b0374c4e5e1fc10e8;hpb=54e2b67f5548b7f009fda7059b86e6b430448576;p=jalview.git
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index 7988182..fd51823 100755
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -11,20 +11,25 @@ import java.util.*;
public class HTMLOutput
{
-
+ AlignViewport av;
+ SequenceRenderer sr;
+ Color color;
public HTMLOutput(AlignViewport av)
{
- SequenceRenderer sr = new SequenceRenderer(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"}, "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", choice);
try{
PrintWriter out = new java.io.PrintWriter(new java.io.FileWriter(choice));
out.println("");
@@ -45,62 +50,188 @@ public class HTMLOutput
out.println("-->");
out.println("");
out.println("
");
- out.println("\n");
- out.println("\n");
- //////////////
- SequenceGroup group;
- SequenceI seq;
- ColourSchemeI cs;
- AlignmentI alignment = av.getAlignment();
- String r,g,b;
- for (int i = 0; i < alignment.getHeight(); i++)
- {
- seq = alignment.getSequenceAt(i);
- group = alignment.findGroup( seq );
- out.println(""+seq.getDisplayId()+" | ");
- for (int res = 0; res < seq.getLength(); res++)
- {
- if(group!=null && group.getStartRes()<=res && group.getEndRes()>=res)
- cs = group.cs;
- else
- cs = av.getGlobalColourScheme();
-
-
- color = sr.getResidueBoxColour(cs, seq, res);
-
- if(color.getRGB()<-1)
- {
- r = Integer.toHexString(color.getRed());
- if(r.length()<2)
- r = "0"+r;
- g = Integer.toHexString(color.getGreen());
- if(g.length()<2)
- g = "0"+g;
- b = Integer.toHexString(color.getBlue());
- if(b.length()<2)
- b = "0"+b;
- 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