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
Hidden representatives moved from sequence to viewport
[jalview.git]
/
src
/
jalview
/
gui
/
IdCanvas.java
diff --git
a/src/jalview/gui/IdCanvas.java
b/src/jalview/gui/IdCanvas.java
index
d1f130b
..
168b50d
100755
(executable)
--- a/
src/jalview/gui/IdCanvas.java
+++ b/
src/jalview/gui/IdCanvas.java
@@
-82,7
+82,7
@@
public class IdCanvas extends JPanel
gg.setColor(Color.white);
\r
}
\r
else if ((av.getSelectionGroup() != null) &&
\r
gg.setColor(Color.white);
\r
}
\r
else if ((av.getSelectionGroup() != null) &&
\r
- av.getSelectionGroup().getSequences(false).contains(s))
\r
+ av.getSelectionGroup().getSequences(null).contains(s))
\r
{
\r
gg.setColor(Color.lightGray);
\r
gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
\r
{
\r
gg.setColor(Color.lightGray);
\r
gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
\r
@@
-271,14
+271,14
@@
public class IdCanvas extends JPanel
{
\r
for (int i = starty; i < alheight; i++)
\r
{
\r
{
\r
for (int i = starty; i < alheight; i++)
\r
{
\r
+ SequenceI s = av.alignment.getSequenceAt(i);
\r
if (av.hasHiddenRows)
\r
{
\r
if (av.hasHiddenRows)
\r
{
\r
- setHiddenFont(i);
\r
+ setHiddenFont(s);
\r
}
\r
else
\r
gg.setFont(italic);
\r
\r
}
\r
else
\r
gg.setFont(italic);
\r
\r
- SequenceI s = av.alignment.getSequenceAt(i);
\r
drawIdString(gg, s, i, 0, ypos);
\r
}
\r
\r
drawIdString(gg, s, i, 0, ypos);
\r
}
\r
\r
@@
-310,7
+310,7
@@
public class IdCanvas extends JPanel
\r
if (av.hasHiddenRows)
\r
{
\r
\r
if (av.hasHiddenRows)
\r
{
\r
- setHiddenFont(i);
\r
+ setHiddenFont(sequence);
\r
}
\r
\r
// Selected sequence colours
\r
}
\r
\r
// Selected sequence colours
\r
@@
-321,7
+321,7
@@
public class IdCanvas extends JPanel
currentTextColor = Color.white;
\r
}
\r
else if ( (av.getSelectionGroup() != null) &&
\r
currentTextColor = Color.white;
\r
}
\r
else if ( (av.getSelectionGroup() != null) &&
\r
- av.getSelectionGroup().getSequences(false).contains(
\r
+ av.getSelectionGroup().getSequences(null).contains(
\r
sequence))
\r
{
\r
currentColor = Color.lightGray;
\r
sequence))
\r
{
\r
currentColor = Color.lightGray;
\r
@@
-419,7
+419,7
@@
public class IdCanvas extends JPanel
}
\r
}
\r
\r
}
\r
}
\r
\r
- void setHiddenFont(int i)
\r
+ void setHiddenFont(SequenceI seq)
\r
{
\r
Font italic = new Font(av.getFont().getName(), Font.ITALIC,
\r
av.getFont().getSize());
\r
{
\r
Font italic = new Font(av.getFont().getName(), Font.ITALIC,
\r
av.getFont().getSize());
\r
@@
-427,8
+427,8
@@
public class IdCanvas extends JPanel
av.getFont().getSize());
\r
\r
\r
av.getFont().getSize());
\r
\r
\r
- if (av.alignment.getSequenceAt(i)!=null
\r
- && av.alignment.getSequenceAt(i).getHiddenSequences() != null)
\r
+ if (av.hiddenRepSequences!=null &&
\r
+ av.hiddenRepSequences.containsKey(seq))
\r
gg.setFont(bold);
\r
else
\r
gg.setFont(italic);
\r
gg.setFont(bold);
\r
else
\r
gg.setFont(italic);
\r