X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;fp=src%2Fjalview%2Fio%2FHtmlFile.java;h=73aa5d2e6120a42ce14529f8b069d170bd7f799d;hb=2a9991ef1eb02d97e9c8ed1644f292117ae6f600;hp=75e99a6c7a6641c78d91523e6a7a71a3cf84c224;hpb=2ce465aaa3047e1ef758a26af2fbfcf8626b4a69;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index 75e99a6..73aa5d2 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -21,16 +21,18 @@ package jalview.io; -import jalview.api.AlignViewControllerGuiI; -import jalview.schemes.ColourSchemeI; - import java.io.IOException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -public class HtmlFile extends AlignFile +import jalview.api.ComplexAlignFile; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.SequenceI; +import jalview.schemes.ColourSchemeI; + +public class HtmlFile extends AlignFile implements ComplexAlignFile { public static final String FILE_EXT = "html"; @@ -40,6 +42,10 @@ public class HtmlFile extends AlignFile private boolean showSeqFeatures; + private ColumnSelection columnSelection; + + private SequenceI[] hiddenSequences; + public HtmlFile() { super(); @@ -72,24 +78,19 @@ public class HtmlFile extends AlignFile String alignmentJsonString = content.val(); JSONFile jsonFile = new JSONFile().parse(alignmentJsonString); - seqs = jsonFile.getSeqs(); - seqGroups = jsonFile.getSeqGroups(); - annotations = jsonFile.getAnnotations(); - showSeqFeatures = jsonFile.isShowSeqFeatures(); - colourScheme = jsonFile.getColourScheme(); + this.seqs = jsonFile.getSeqs(); + this.seqGroups = jsonFile.getSeqGroups(); + this.annotations = jsonFile.getAnnotations(); + this.showSeqFeatures = jsonFile.isShowSeqFeatures(); + this.colourScheme = jsonFile.getColourScheme(); + this.hiddenSequences = jsonFile.getHiddenSequences(); + this.columnSelection = jsonFile.getColumnSelection(); } catch (Exception e) { e.printStackTrace(); } } - public void applySettingsToAlignFrame(AlignViewControllerGuiI af) - { - af.setShowSeqFeatures(isShowSeqFeatures()); - af.changeColour(getColourScheme()); - af.setMenusForViewport(); - } - @Override public String print() @@ -118,4 +119,24 @@ public class HtmlFile extends AlignFile this.colourScheme = colourScheme; } + public ColumnSelection getColumnSelection() + { + return columnSelection; + } + + public void setColumnSelection(ColumnSelection columnSelection) + { + this.columnSelection = columnSelection; + } + + public SequenceI[] getHiddenSequences() + { + return hiddenSequences; + } + + public void setHiddenSequences(SequenceI[] hiddenSequences) + { + this.hiddenSequences = hiddenSequences; + } + }