X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2Fstyles%2FViewStyle.java;h=91f2f0cdbc4b1a4f40388d9aa4b90ac5283c47c8;hb=2aa652e077b8479ff637b87df5f0dea161c7cde2;hp=f01047d611d7a7fd666313ea9a65789a017f14c9;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/src/jalview/viewmodel/styles/ViewStyle.java b/src/jalview/viewmodel/styles/ViewStyle.java index f01047d..91f2f0c 100644 --- a/src/jalview/viewmodel/styles/ViewStyle.java +++ b/src/jalview/viewmodel/styles/ViewStyle.java @@ -213,6 +213,8 @@ public class ViewStyle implements ViewStyleI setShowNPFeats(vs.isShowNPFeats()); setShowSequenceFeaturesHeight(vs.isShowSequenceFeaturesHeight()); setShowSequenceFeatures(vs.isShowSequenceFeatures()); + setShowComplementFeatures(vs.isShowComplementFeatures()); + setShowComplementFeaturesOnTop(vs.isShowComplementFeaturesOnTop()); setShowText(vs.getShowText()); setShowUnconserved(vs.getShowUnconserved()); setTextColour(vs.getTextColour()); @@ -275,26 +277,26 @@ public class ViewStyle implements ViewStyleI && isShowSequenceFeaturesHeight() == vs .isShowSequenceFeaturesHeight() && isShowSequenceFeatures() == vs.isShowSequenceFeatures() + && isShowComplementFeatures() == vs.isShowComplementFeatures() + && isShowComplementFeaturesOnTop() == vs + .isShowComplementFeaturesOnTop() && getShowText() == vs.getShowText() && getShowUnconserved() == vs.getShowUnconserved() && getThreshold() == vs.getThreshold() && getThresholdTextColour() == vs.getThresholdTextColour() && isUpperCasebold() == vs.isUpperCasebold() - && getWrapAlignment() == vs.getWrapAlignment() && getWrappedWidth() == vs - .getWrappedWidth()); + && getWrapAlignment() == vs.getWrapAlignment() + && getWrappedWidth() == vs.getWrappedWidth()); /* * and compare non-primitive types; syntax below will match null with null * values */ - match = match - && String.valueOf(getFontName()).equals( - String.valueOf(vs.getFontName())); - match = match - && String.valueOf(getTextColour()).equals( - String.valueOf(vs.getTextColour())); - match = match - && String.valueOf(getTextColour2()).equals( - String.valueOf(vs.getTextColour2())); + match = match && String.valueOf(getFontName()) + .equals(String.valueOf(vs.getFontName())); + match = match && String.valueOf(getTextColour()) + .equals(String.valueOf(vs.getTextColour())); + match = match && String.valueOf(getTextColour2()) + .equals(String.valueOf(vs.getTextColour2())); return match; // return equivalent(this, (ViewStyle) other); } @@ -368,6 +370,10 @@ public class ViewStyle implements ViewStyleI private int fontStyle; + private boolean showComplementFeatures; + + private boolean showComplementFeaturesOnTop; + /** * GUI state * @@ -1114,4 +1120,28 @@ public class ViewStyle implements ViewStyleI { proteinFontAsCdna = b; } + + @Override + public void setShowComplementFeatures(boolean b) + { + showComplementFeatures = b; + } + + @Override + public boolean isShowComplementFeatures() + { + return showComplementFeatures; + } + + @Override + public void setShowComplementFeaturesOnTop(boolean b) + { + showComplementFeaturesOnTop = b; + } + + @Override + public boolean isShowComplementFeaturesOnTop() + { + return showComplementFeaturesOnTop; + } }