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
Can edit annotation name/description
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
315b141
..
e0b36d3
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-279,7
+279,6
@@
public class AnnotationPanel extends JPanel implements MouseListener,
public void mousePressed(MouseEvent evt)
\r
{
\r
\r
public void mousePressed(MouseEvent evt)
\r
{
\r
\r
-
\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
if(aa==null)
\r
return;
\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
if(aa==null)
\r
return;
\r
@@
-349,6
+348,9
@@
public class AnnotationPanel extends JPanel implements MouseListener,
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
+ if(av.hasHiddenColumns)
\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);
\r
+
\r
min = res;
\r
max = res;
\r
\r
min = res;
\r
max = res;
\r
\r
@@
-430,6
+432,9
@@
public class AnnotationPanel extends JPanel implements MouseListener,
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
+ if(av.hasHiddenColumns)
\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);
\r
+
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
if (res < min)
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
if (res < min)
\r
@@
-753,7
+758,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
}
\r
}
\r
\r
}
\r
}
\r
\r
- if (av.updatingConsensus && aa[i].label.equals("Consensus"))
\r
+ if (av.updatingConsensus && aa[i]==av.consensus)
\r
{
\r
y += av.charHeight;
\r
\r
{
\r
y += av.charHeight;
\r
\r
@@
-1030,7
+1035,6
@@
public class AnnotationPanel extends JPanel implements MouseListener,
\r
default:
\r
g.setColor(Color.gray);
\r
\r
default:
\r
g.setColor(Color.gray);
\r
- if(!av.wrapAlignment || endRes==av.endRes)
\r
g.fillRect(lastSSX, y + 6 + iconOffset,
\r
(x*av.charWidth) - lastSSX, 2);
\r
\r
g.fillRect(lastSSX, y + 6 + iconOffset,
\r
(x*av.charWidth) - lastSSX, 2);
\r
\r