X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;fp=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;h=7e02118acbeb040e69cac01bd93d8dcf2a0d93b4;hb=294cc8b0cf3d28310a95e1ffdb2a0f871304b70d;hp=db34c2fccbcd19e9a4b871427a67988690f5c293;hpb=263ae64817c7604150961e1c9c76554936ab994b;p=jalview.git diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java index db34c2f..7e02118 100644 --- a/src/jalview/io/HtmlSvgOutput.java +++ b/src/jalview/io/HtmlSvgOutput.java @@ -1,10 +1,9 @@ package jalview.io; +import jalview.api.FeatureRenderer; import jalview.datamodel.SequenceI; import jalview.gui.AlignViewport; import jalview.gui.AlignmentPanel; -import jalview.gui.AnnotationPanel; -import jalview.gui.FeatureRenderer; import jalview.gui.HTMLOptions; import jalview.math.AlignmentDimension; import jalview.util.MessageManager; @@ -27,15 +26,12 @@ public class HtmlSvgOutput FeatureRenderer fr; AlignmentPanel ap; - AnnotationPanel annotationPanel; public HtmlSvgOutput(File file, AlignmentPanel ap) { - - this.av = ap.av; - this.ap = ap; - av.setFeatureRenderer(new FeatureRenderer(ap)); - this.annotationPanel = ap.getAnnotationPanel(); + this.av = ap.av; + this.ap = ap; + fr = ap.cloneFeatureRenderer(); generateHtmlSvgOutput(file); } @@ -101,7 +97,7 @@ public class HtmlSvgOutput String titleSvgData = g1.getSVGDocument(); String alignSvgData = g2.getSVGDocument(); - String jsonData = JSONFile.getJSONData(av); + String jsonData = JSONFile.getJSONData(ap); String htmlData = getHtml(titleSvgData, alignSvgData, jsonData); out.write(htmlData.getBytes());