git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
RefreshPanels after a colour change
[jalview.git] / src / jalview / io / HTMLOutput.java
diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java
index b238383..d15a6e8 100755 (executable)
--- a/src/jalview/io/HTMLOutput.java
+++ b/src/jalview/io/HTMLOutput.java
@@ -11,10 +11,11 @@ import java.util.*;
 \r
 public class HTMLOutput\r
 {\r
-  SequenceRenderer sr = new SequenceRenderer(null);\r
+\r
 \r
   public HTMLOutput(AlignViewport av)\r
   {\r
+    SequenceRenderer sr = new SequenceRenderer(av);\r
     Color color;\r
     JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);\r
     chooser.setDialogTitle("Save as HTML");\r
@@ -29,7 +30,18 @@ public class HTMLOutput
         out.println("<HTML>");\r
         out.println("<style type=\"text/css\">");\r
         out.println("<!--");\r
-        out.println("td {font-family: \"Courier New\", Courier, mono;; font-size: medium; text-align: center; }");\r
+        out.print("td {font-family: \""+av.getFont().getFamily()+"\", \""+av.getFont().getName()+ "\", mono; "\r
+                   +"font-size: "+av.getFont().getSize()+"px; ");\r
+\r
+\r
+        if (av.getFont().getStyle() == Font.BOLD)\r
+           out.print("font-weight: BOLD; ");\r
+\r
+        if (av.getFont().getStyle() == Font.ITALIC)\r
+           out.print("font-style: italic; ");\r
+\r
+        out.println("text-align: center; }");\r
+\r
         out.println("-->");\r
         out.println("</style>");\r
         out.println("<BODY>");\r
@@ -38,22 +50,42 @@ public class HTMLOutput
 \r
 \r
         //////////////\r
-        SequenceGroup group;\r
+        SequenceGroup [] groups;\r
         SequenceI seq;\r
-        ColourSchemeI cs;\r
+        ColourSchemeI cs = null;\r
         AlignmentI alignment = av.getAlignment();\r
         String r,g,b;\r
-        for (int i = 0; i < alignment.getHeight(); i++)\r
+\r
+      // draws the top row, the measure rule\r
+        out.println("<tr><td colspan=\"6\"></td>");\r
+        int i=0;\r
+        for(i=10; i<alignment.getWidth()-10; i+=10)\r
+          out.println("<td colspan=\"9\">"+i+"<br>|</td><td></td>");\r
+\r
+        out.println("<td colspan=\"3\"></td><td colspan=\"3\">"+i+"<br>|</td>");\r
+        out.println("</tr>");\r
+\r
+        for (i = 0; i < alignment.getHeight(); i++)\r
         {\r
           seq = alignment.getSequenceAt(i);\r
-          group = alignment.findGroup( seq );\r
-          out.println("<tr><td>"+seq.getName()+"&nbsp;&nbsp;</td>");\r
+          groups = alignment.findAllGroups( seq );\r
+          out.println("<tr><td nowrap>"+seq.getDisplayId()+"&nbsp;&nbsp;</td>");\r
+\r
+\r
           for (int res = 0; res < seq.getLength(); res++)\r
           {\r
-            if(group!=null && group.getStartRes()<=res && group.getEndRes()>=res)\r
-              cs = group.cs;\r
-            else\r
-              cs = av.getGlobalColourScheme();\r
+            cs = av.getGlobalColourScheme();\r
+\r
+            if(groups!=null)\r
+             {\r
+               for (int k = 0; k < groups.length; k++)\r
+                 if (groups[k].getStartRes() <= res && groups[k].getEndRes() >= res)\r
+                 {\r
+                   cs = groups[k].cs;\r
+                   break;\r
+                 }\r
+             }\r
+\r
 \r
             color = sr.getResidueBoxColour(cs, seq, res);\r
 \r
@@ -83,9 +115,9 @@ public class HTMLOutput
 \r
         out.close();\r
 \r
-        jalview.util.BrowserLauncher.openURL( choice );\r
+        jalview.util.BrowserLauncher.openURL( "file:///"+choice );\r
       }\r
-      catch(Exception ex){}\r
+      catch(Exception ex){ex.printStackTrace();}\r
     }\r
   }\r
 \r