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=496a78f25054b4003f6115c7194a2a466c44197f;hp=3dd937d5017a050edd6c2bd936ba8fce0e9a5287;hpb=2564f09af31f666b30fc23889deeff9cd49c68c4;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index 3dd937d..73aa5d2 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -22,16 +22,17 @@ package jalview.io; import java.io.IOException; -import java.util.List; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import jalview.api.AlignViewControllerGuiI; +import jalview.api.ComplexAlignFile; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.SequenceI; import jalview.schemes.ColourSchemeI; -public class HtmlFile extends AlignFile +public class HtmlFile extends AlignFile implements ComplexAlignFile { public static final String FILE_EXT = "html"; @@ -41,7 +42,9 @@ public class HtmlFile extends AlignFile private boolean showSeqFeatures; - private List hiddenColumns; + private ColumnSelection columnSelection; + + private SequenceI[] hiddenSequences; public HtmlFile() { @@ -80,21 +83,14 @@ public class HtmlFile extends AlignFile this.annotations = jsonFile.getAnnotations(); this.showSeqFeatures = jsonFile.isShowSeqFeatures(); this.colourScheme = jsonFile.getColourScheme(); - this.hiddenColumns = jsonFile.getHiddenColumns(); + this.hiddenSequences = jsonFile.getHiddenSequences(); + this.columnSelection = jsonFile.getColumnSelection(); } catch (Exception e) { e.printStackTrace(); } } - public void applySettingsToAlignmentView(AlignViewControllerGuiI avc) - { - avc.setShowSeqFeatures(isShowSeqFeatures()); - avc.changeColour(getColourScheme()); - avc.setMenusForViewport(); - avc.hideColumns(hiddenColumns); - avc.syncHiddenSequences(); - } @Override public String print() @@ -123,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; + } + }