X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJSONFile.java;h=816346a9622e594d51b61db6f8159597b5a53f84;hb=ef660a21d6304c84f215341a9a29e112c82119fd;hp=e89dcfb06e06cd469ebe442f57ab401ef87b44bb;hpb=1b911af46e474fd504a4d505327e02b684d9a397;p=jalview.git diff --git a/src/jalview/io/JSONFile.java b/src/jalview/io/JSONFile.java index e89dcfb..816346a 100644 --- a/src/jalview/io/JSONFile.java +++ b/src/jalview/io/JSONFile.java @@ -47,6 +47,7 @@ import jalview.json.binding.biojson.v1.SequenceFeaturesPojo; import jalview.json.binding.biojson.v1.SequenceGrpPojo; import jalview.json.binding.biojson.v1.SequencePojo; import jalview.renderer.seqfeatures.FeatureColourFinder; +import jalview.schemes.ColourSchemeProperty; import jalview.schemes.JalviewColourScheme; import jalview.schemes.ResidueColourScheme; import jalview.util.ColorUtils; @@ -238,8 +239,8 @@ public class JSONFile extends AlignFile implements ComplexAlignFile { SequenceGrpPojo seqGrpPojo = new SequenceGrpPojo(); seqGrpPojo.setGroupName(seqGrp.getName()); - seqGrpPojo.setColourScheme(seqGrp.getColourScheme() - .getSchemeName()); + seqGrpPojo.setColourScheme(ColourSchemeProperty + .getColourName(seqGrp.getColourScheme())); seqGrpPojo.setColourText(seqGrp.getColourText()); seqGrpPojo.setDescription(seqGrp.getDescription()); seqGrpPojo.setDisplayBoxes(seqGrp.getDisplayBoxes()); @@ -280,7 +281,7 @@ public class JSONFile extends AlignFile implements ComplexAlignFile { List hiddenCols = getViewport().getAlignment() .getHiddenColumns() - .getListOfCols(); + .getHiddenRegions(); StringBuilder hiddenColsBuilder = new StringBuilder(); for (int[] range : hiddenCols) { @@ -766,7 +767,8 @@ public class JSONFile extends AlignFile implements ComplexAlignFile } } } - globalColourScheme = viewport.getGlobalColourScheme().getSchemeName(); + globalColourScheme = ColourSchemeProperty.getColourName(viewport + .getGlobalColourScheme()); setDisplayedFeatures(viewport.getFeaturesDisplayed()); showSeqFeatures = viewport.isShowSequenceFeatures();