git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3878 update branch from 2.12 merge from 2.11.2
[jalview.git]
/
src
/
jalview
/
viewmodel
/
styles
/
ViewStyle.java
diff --git
a/src/jalview/viewmodel/styles/ViewStyle.java
b/src/jalview/viewmodel/styles/ViewStyle.java
index
d68227b
..
91f2f0c
100644
(file)
--- a/
src/jalview/viewmodel/styles/ViewStyle.java
+++ b/
src/jalview/viewmodel/styles/ViewStyle.java
@@
-214,6
+214,7
@@
public class ViewStyle implements ViewStyleI
setShowSequenceFeaturesHeight(vs.isShowSequenceFeaturesHeight());
setShowSequenceFeatures(vs.isShowSequenceFeatures());
setShowComplementFeatures(vs.isShowComplementFeatures());
setShowSequenceFeaturesHeight(vs.isShowSequenceFeaturesHeight());
setShowSequenceFeatures(vs.isShowSequenceFeatures());
setShowComplementFeatures(vs.isShowComplementFeatures());
+ setShowComplementFeaturesOnTop(vs.isShowComplementFeaturesOnTop());
setShowText(vs.getShowText());
setShowUnconserved(vs.getShowUnconserved());
setTextColour(vs.getTextColour());
setShowText(vs.getShowText());
setShowUnconserved(vs.getShowUnconserved());
setTextColour(vs.getTextColour());
@@
-277,6
+278,8
@@
public class ViewStyle implements ViewStyleI
.isShowSequenceFeaturesHeight()
&& isShowSequenceFeatures() == vs.isShowSequenceFeatures()
&& isShowComplementFeatures() == vs.isShowComplementFeatures()
.isShowSequenceFeaturesHeight()
&& isShowSequenceFeatures() == vs.isShowSequenceFeatures()
&& isShowComplementFeatures() == vs.isShowComplementFeatures()
+ && isShowComplementFeaturesOnTop() == vs
+ .isShowComplementFeaturesOnTop()
&& getShowText() == vs.getShowText()
&& getShowUnconserved() == vs.getShowUnconserved()
&& getThreshold() == vs.getThreshold()
&& getShowText() == vs.getShowText()
&& getShowUnconserved() == vs.getShowUnconserved()
&& getThreshold() == vs.getThreshold()
@@
-369,6
+372,8
@@
public class ViewStyle implements ViewStyleI
private boolean showComplementFeatures;
private boolean showComplementFeatures;
+ private boolean showComplementFeaturesOnTop;
+
/**
* GUI state
*
/**
* GUI state
*
@@
-1127,4
+1132,16
@@
public class ViewStyle implements ViewStyleI
{
return showComplementFeatures;
}
{
return showComplementFeatures;
}
+
+ @Override
+ public void setShowComplementFeaturesOnTop(boolean b)
+ {
+ showComplementFeaturesOnTop = b;
+ }
+
+ @Override
+ public boolean isShowComplementFeaturesOnTop()
+ {
+ return showComplementFeaturesOnTop;
+ }
}
}