X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlFile.java;h=3dd937d5017a050edd6c2bd936ba8fce0e9a5287;hb=4660fcf0745dbc1f6f6e7241b398301f93edb548;hp=75e99a6c7a6641c78d91523e6a7a71a3cf84c224;hpb=fd9ed8df6a98c86228100aa4e9d6698c87a61c08;p=jalview.git diff --git a/src/jalview/io/HtmlFile.java b/src/jalview/io/HtmlFile.java index 75e99a6..3dd937d 100644 --- a/src/jalview/io/HtmlFile.java +++ b/src/jalview/io/HtmlFile.java @@ -21,15 +21,16 @@ package jalview.io; -import jalview.api.AlignViewControllerGuiI; -import jalview.schemes.ColourSchemeI; - 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.schemes.ColourSchemeI; + public class HtmlFile extends AlignFile { public static final String FILE_EXT = "html"; @@ -40,6 +41,8 @@ public class HtmlFile extends AlignFile private boolean showSeqFeatures; + private List hiddenColumns; + public HtmlFile() { super(); @@ -72,25 +75,27 @@ 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.hiddenColumns = jsonFile.getHiddenColumns(); } catch (Exception e) { e.printStackTrace(); } } - public void applySettingsToAlignFrame(AlignViewControllerGuiI af) + public void applySettingsToAlignmentView(AlignViewControllerGuiI avc) { - af.setShowSeqFeatures(isShowSeqFeatures()); - af.changeColour(getColourScheme()); - af.setMenusForViewport(); + avc.setShowSeqFeatures(isShowSeqFeatures()); + avc.changeColour(getColourScheme()); + avc.setMenusForViewport(); + avc.hideColumns(hiddenColumns); + avc.syncHiddenSequences(); } - @Override public String print() {