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
Merge branch 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[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
91f2f0c
..
eaa77cb
100644
(file)
--- a/
src/jalview/viewmodel/styles/ViewStyle.java
+++ b/
src/jalview/viewmodel/styles/ViewStyle.java
@@
-20,10
+20,10
@@
*/
package jalview.viewmodel.styles;
*/
package jalview.viewmodel.styles;
-import jalview.api.ViewStyleI;
-
import java.awt.Color;
import java.awt.Color;
+import jalview.api.ViewStyleI;
+
/**
* A container for holding alignment view properties. View properties are
* data-independent, which means they can be safely copied between views
/**
* A container for holding alignment view properties. View properties are
* data-independent, which means they can be safely copied between views
@@
-124,6
+124,12
@@
public class ViewStyle implements ViewStyleI
boolean showSequenceFeatures = false;
/**
boolean showSequenceFeatures = false;
/**
+ * display setting for showing/hiding annotation tracks reporting sequence
+ * feature counts in columns of alignment view
+ */
+ boolean showSequenceFeatureCounts = false;
+
+ /**
* display sequence symbols
*/
boolean showText = true;
* display sequence symbols
*/
boolean showText = true;
@@
-213,6
+219,7
@@
public class ViewStyle implements ViewStyleI
setShowNPFeats(vs.isShowNPFeats());
setShowSequenceFeaturesHeight(vs.isShowSequenceFeaturesHeight());
setShowSequenceFeatures(vs.isShowSequenceFeatures());
setShowNPFeats(vs.isShowNPFeats());
setShowSequenceFeaturesHeight(vs.isShowSequenceFeaturesHeight());
setShowSequenceFeatures(vs.isShowSequenceFeatures());
+ setShowSequenceFeatureCounts(vs.isShowSequenceFeatureCounts());
setShowComplementFeatures(vs.isShowComplementFeatures());
setShowComplementFeaturesOnTop(vs.isShowComplementFeaturesOnTop());
setShowText(vs.getShowText());
setShowComplementFeatures(vs.isShowComplementFeatures());
setShowComplementFeaturesOnTop(vs.isShowComplementFeaturesOnTop());
setShowText(vs.getShowText());
@@
-276,6
+283,8
@@
public class ViewStyle implements ViewStyleI
&& isShowNPFeats() == vs.isShowNPFeats()
&& isShowSequenceFeaturesHeight() == vs
.isShowSequenceFeaturesHeight()
&& isShowNPFeats() == vs.isShowNPFeats()
&& isShowSequenceFeaturesHeight() == vs
.isShowSequenceFeaturesHeight()
+ && isShowSequenceFeatureCounts() == vs
+ .isShowSequenceFeatureCounts()
&& isShowSequenceFeatures() == vs.isShowSequenceFeatures()
&& isShowComplementFeatures() == vs.isShowComplementFeatures()
&& isShowComplementFeaturesOnTop() == vs
&& isShowSequenceFeatures() == vs.isShowSequenceFeatures()
&& isShowComplementFeatures() == vs.isShowComplementFeatures()
&& isShowComplementFeaturesOnTop() == vs
@@
-1144,4
+1153,16
@@
public class ViewStyle implements ViewStyleI
{
return showComplementFeaturesOnTop;
}
{
return showComplementFeaturesOnTop;
}
+
+ @Override
+ public void setShowSequenceFeatureCounts(boolean show)
+ {
+ showSequenceFeatureCounts = show;
+ }
+
+ @Override
+ public boolean isShowSequenceFeatureCounts()
+ {
+ return showSequenceFeatureCounts;
+ }
}
}