git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1780 JAL-653 moved AlignExportSettings reference on AlignViewportI to FileParse...
[jalview.git]
/
src
/
jalview
/
io
/
HtmlSvgOutput.java
diff --git
a/src/jalview/io/HtmlSvgOutput.java
b/src/jalview/io/HtmlSvgOutput.java
index
db34c2f
..
7e02118
100644
(file)
--- a/
src/jalview/io/HtmlSvgOutput.java
+++ b/
src/jalview/io/HtmlSvgOutput.java
@@
-1,10
+1,9
@@
package jalview.io;
package jalview.io;
+import jalview.api.FeatureRenderer;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignViewport;
import jalview.gui.AlignmentPanel;
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;
import jalview.gui.HTMLOptions;
import jalview.math.AlignmentDimension;
import jalview.util.MessageManager;
@@
-27,15
+26,12
@@
public class HtmlSvgOutput
FeatureRenderer fr;
AlignmentPanel ap;
FeatureRenderer fr;
AlignmentPanel ap;
- AnnotationPanel annotationPanel;
public HtmlSvgOutput(File file, AlignmentPanel ap)
{
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);
}
generateHtmlSvgOutput(file);
}
@@
-101,7
+97,7
@@
public class HtmlSvgOutput
String titleSvgData = g1.getSVGDocument();
String alignSvgData = g2.getSVGDocument();
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());
String htmlData = getHtml(titleSvgData, alignSvgData, jsonData);
out.write(htmlData.getBytes());