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
javadoc on contigs
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
549d531
..
497fc2a
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-418,8
+418,8
@@
public class AnnotationPanel extends JPanel implements MouseListener,
if(graphStretch>-1)
\r
{
\r
av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight += graphStretchY - evt.getY();
\r
if(graphStretch>-1)
\r
{
\r
av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight += graphStretchY - evt.getY();
\r
- if(av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight <10)
\r
- av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight = 10;
\r
+ if(av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight <0)
\r
+ av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight = 0;
\r
graphStretchY = evt.getY();
\r
adjustPanelHeight();
\r
ap.repaint();
\r
graphStretchY = evt.getY();
\r
adjustPanelHeight();
\r
ap.repaint();
\r
@@
-708,7
+708,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
\r
if (row.hasText)
\r
{
\r
\r
if (row.hasText)
\r
{
\r
- iconOffset = av.charHeight / 2;
\r
+ iconOffset = av.charHeight / 2 + 4;
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
@@
-773,7
+773,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
{
\r
g.drawString(row.annotations[column].displayCharacter,
\r
(x*av.charWidth)+charOffset,
\r
{
\r
g.drawString(row.annotations[column].displayCharacter,
\r
(x*av.charWidth)+charOffset,
\r
- y + iconOffset + 3);
\r
+ y + iconOffset );
\r
}
\r
else if (
\r
row.annotations[column - 1] == null
\r
}
\r
else if (
\r
row.annotations[column - 1] == null
\r
@@
-785,7
+785,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
{
\r
g.drawString(row.annotations[column].displayCharacter,
\r
x*av.charWidth+charOffset,
\r
{
\r
g.drawString(row.annotations[column].displayCharacter,
\r
x*av.charWidth+charOffset,
\r
- y + iconOffset + 3);
\r
+ y + iconOffset );
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-952,7
+952,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
}
\r
}
\r
\r
}
\r
}
\r
\r
- if (row.graph>0)
\r
+ if (row.graph>0 && row.graphHeight>0)
\r
{
\r
if(row.graph == AlignmentAnnotation.LINE_GRAPH )
\r
{
\r
{
\r
if(row.graph == AlignmentAnnotation.LINE_GRAPH )
\r
{
\r