git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e40f37b
)
Is secondary structure label modified
author
amwaterhouse
<Andrew Waterhouse>
Thu, 18 Jan 2007 16:16:34 +0000
(16:16 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 18 Jan 2007 16:16:34 +0000
(16:16 +0000)
src/jalview/datamodel/AlignmentAnnotation.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/AlignmentAnnotation.java
b/src/jalview/datamodel/AlignmentAnnotation.java
index
d6eb3ea
..
a97ca7f
100755
(executable)
--- a/
src/jalview/datamodel/AlignmentAnnotation.java
+++ b/
src/jalview/datamodel/AlignmentAnnotation.java
@@
-120,11
+120,16
@@
public class AlignmentAnnotation
hasIcons = true;
}
hasIcons = true;
}
- if (annotations[i].secondaryStructure != 'H'
- && annotations[i].secondaryStructure != 'E'
- && annotations[i].secondaryStructure != '-')
+ if (annotations[i].displayCharacter.length()==1
+ && !annotations[i].displayCharacter.equals("H")
+ && !annotations[i].displayCharacter.equals("E")
+ && !annotations[i].displayCharacter.equals("-"))
{
{
- nonSSLabel = true;
+ if(jalview.schemes.ResidueProperties.aaIndex
+ [annotations[i].displayCharacter.charAt(0)]>0)
+ {
+ nonSSLabel = true;
+ }
}
if (annotations[i].displayCharacter.length() > 0)
}
if (annotations[i].displayCharacter.length() > 0)
@@
-143,8
+148,6
@@
public class AlignmentAnnotation
annotations[j].displayCharacter
=String.valueOf(annotations[j].secondaryStructure);
annotations[j].secondaryStructure = ' ';
annotations[j].displayCharacter
=String.valueOf(annotations[j].secondaryStructure);
annotations[j].secondaryStructure = ' ';
- if(annotations[j].description.length()<1)
- annotations[j].description = annotations[j].displayCharacter;
}
}
}
}