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
Save and load graph type
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationLabels.java
diff --git
a/src/jalview/appletgui/AnnotationLabels.java
b/src/jalview/appletgui/AnnotationLabels.java
index
651d44c
..
3ef61e6
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationLabels.java
+++ b/
src/jalview/appletgui/AnnotationLabels.java
@@
-29,6
+29,7
@@
public class AnnotationLabels
{
\r
boolean active = false;
\r
AlignmentPanel ap;
\r
{
\r
boolean active = false;
\r
AlignmentPanel ap;
\r
+ AlignViewport av;
\r
boolean resizing = false;
\r
int oldY, mouseX;
\r
static String ADDNEW = "Add new row";
\r
boolean resizing = false;
\r
int oldY, mouseX;
\r
static String ADDNEW = "Add new row";
\r
@@
-42,6
+43,7
@@
public class AnnotationLabels
public AnnotationLabels(AlignmentPanel ap)
\r
{
\r
this.ap = ap;
\r
public AnnotationLabels(AlignmentPanel ap)
\r
{
\r
this.ap = ap;
\r
+ this.av = ap.av;
\r
setLayout(null);
\r
addMouseListener(new MouseAdapter()
\r
{
\r
setLayout(null);
\r
addMouseListener(new MouseAdapter()
\r
{
\r
@@
-52,6
+54,12
@@
public class AnnotationLabels
});
\r
}
\r
\r
});
\r
}
\r
\r
+ public AnnotationLabels(AlignViewport av)
\r
+{
\r
+ this.av = av;
\r
+}
\r
+
\r
+
\r
public void setScrollOffset(int y)
\r
{
\r
scrollOffset = y;
\r
public void setScrollOffset(int y)
\r
{
\r
scrollOffset = y;
\r
@@
-60,7
+68,7
@@
public class AnnotationLabels
\r
public void actionPerformed(ActionEvent evt)
\r
{
\r
\r
public void actionPerformed(ActionEvent evt)
\r
{
\r
- AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
\r
+ AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
\r
if (evt.getActionCommand().equals(HIDE))
\r
{
\r
\r
if (evt.getActionCommand().equals(HIDE))
\r
{
\r
@@
-75,7
+83,7
@@
public class AnnotationLabels
}
\r
else if (evt.getActionCommand().equals(OUTPUT_TEXT))
\r
{
\r
}
\r
else if (evt.getActionCommand().equals(OUTPUT_TEXT))
\r
{
\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame.applet);
\r
Frame frame = new Frame();
\r
frame.add(cap);
\r
jalview.bin.JalviewLite.addFrame(frame,
\r
Frame frame = new Frame();
\r
frame.add(cap);
\r
jalview.bin.JalviewLite.addFrame(frame,
\r
@@
-126,7
+134,7
@@
public class AnnotationLabels
{
\r
pop.addSeparator();
\r
final CheckboxMenuItem cbmi = new CheckboxMenuItem(
\r
{
\r
pop.addSeparator();
\r
final CheckboxMenuItem cbmi = new CheckboxMenuItem(
\r
- "Ignore gaps in consensus",
\r
+ "Ignore Gaps In Consensus",
\r
ap.av.getIgnoreGapsConsensus());
\r
\r
cbmi.addItemListener(new ItemListener()
\r
ap.av.getIgnoreGapsConsensus());
\r
\r
cbmi.addItemListener(new ItemListener()
\r
@@
-146,10
+154,10
@@
public class AnnotationLabels
\r
public void paint(Graphics g)
\r
{
\r
\r
public void paint(Graphics g)
\r
{
\r
- drawComponent(g);
\r
+ drawComponent(g, getSize().width);
\r
}
\r
\r
}
\r
\r
- public void drawComponent(Graphics g)
\r
+ public void drawComponent(Graphics g, int width)
\r
{
\r
FontMetrics fm = g.getFontMetrics(g.getFont());
\r
g.setColor(Color.white);
\r
{
\r
FontMetrics fm = g.getFontMetrics(g.getFont());
\r
g.setColor(Color.white);
\r
@@
-158,7
+166,7
@@
public class AnnotationLabels
g.translate(0, scrollOffset);
\r
g.setColor(Color.black);
\r
\r
g.translate(0, scrollOffset);
\r
g.setColor(Color.black);
\r
\r
- AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();
\r
+ AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
int y = g.getFont().getSize();
\r
int x = 0;
\r
\r
int y = g.getFont().getSize();
\r
int x = 0;
\r
\r
@@
-171,16
+179,16
@@
public class AnnotationLabels
continue;
\r
}
\r
\r
continue;
\r
}
\r
\r
- x = getSize().width - fm.stringWidth(aa[i].label) - 3;
\r
+ x = width - fm.stringWidth(aa[i].label) - 3;
\r
\r
\r
- if (aa[i].isGraph)
\r
+ if (aa[i].graph>0)
\r
{
\r
y += (aa[i].height / 3);
\r
}
\r
\r
g.drawString(aa[i].label, x, y);
\r
\r
{
\r
y += (aa[i].height / 3);
\r
}
\r
\r
g.drawString(aa[i].label, x, y);
\r
\r
- if (aa[i].isGraph)
\r
+ if (aa[i].graph>0)
\r
{
\r
y += (2 * aa[i].height / 3);
\r
}
\r
{
\r
y += (2 * aa[i].height / 3);
\r
}
\r