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-1863 allow RNA secondary structure rows exported by Jalview to be imported again
[jalview.git]
/
src
/
jalview
/
viewmodel
/
seqfeatures
/
FeatureRendererModel.java
diff --git
a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index
30d14c2
..
19c6ca8
100644
(file)
--- a/
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@
-246,6
+246,7
@@
public abstract class FeatureRendererModel implements
{
ArrayList<SequenceFeature> tmp = new ArrayList<SequenceFeature>();
SequenceFeature[] features = sequence.getSequenceFeatures();
{
ArrayList<SequenceFeature> tmp = new ArrayList<SequenceFeature>();
SequenceFeature[] features = sequence.getSequenceFeatures();
+
if (features != null)
{
for (int i = 0; i < features.length; i++)
if (features != null)
{
for (int i = 0; i < features.length; i++)
@@
-322,9
+323,7
@@
public abstract class FeatureRendererModel implements
for (int i = 0; i < alignment.getHeight(); i++)
{
SequenceI asq = alignment.getSequenceAt(i);
for (int i = 0; i < alignment.getHeight(); i++)
{
SequenceI asq = alignment.getSequenceAt(i);
- SequenceI dasq = asq.getDatasetSequence();
- SequenceFeature[] features = dasq != null ? dasq
- .getSequenceFeatures() : asq.getSequenceFeatures();
+ SequenceFeature[] features = asq.getSequenceFeatures();
if (features == null)
{
if (features == null)
{
@@
-370,7
+369,7
@@
public abstract class FeatureRendererModel implements
{
allfeatures.add(features[index].getType());
}
{
allfeatures.add(features[index].getType());
}
- if (features[index].score != Float.NaN)
+ if (!Float.isNaN(features[index].score))
{
int nonpos = features[index].getBegin() >= 1 ? 0 : 1;
float[][] mm = (float[][]) minmax.get(features[index].getType());
{
int nonpos = features[index].getBegin() >= 1 ? 0 : 1;
float[][] mm = (float[][]) minmax.get(features[index].getType());
@@
-900,7
+899,7
@@
public abstract class FeatureRendererModel implements
{
for (int i = 0; i < typ.length; i++)
{
{
for (int i = 0; i < typ.length; i++)
{
- if (feature_disp.isVisible(typ[i]))
+ if (!feature_disp.isVisible(typ[i]))
{
typ[i] = null;
}
{
typ[i] = null;
}