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
Remove start end for now??
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationLabels.java
diff --git
a/src/jalview/gui/AnnotationLabels.java
b/src/jalview/gui/AnnotationLabels.java
index
bbc5c04
..
5667f84
100755
(executable)
--- a/
src/jalview/gui/AnnotationLabels.java
+++ b/
src/jalview/gui/AnnotationLabels.java
@@
-40,7
+40,7
@@
public class AnnotationLabels extends JPanel implements MouseListener,
static String HIDE = "Hide This Row";
\r
static String DELETE = "Delete This Row";
\r
static String SHOWALL = "Show All Hidden Rows";
\r
static String HIDE = "Hide This Row";
\r
static String DELETE = "Delete This Row";
\r
static String SHOWALL = "Show All Hidden Rows";
\r
- static String OUTPUT_TEXT = "Show Values In Textbox";
\r
+ static String OUTPUT_TEXT = "Export Annotation";
\r
boolean resizePanel = false;
\r
Image image;
\r
AlignmentPanel ap;
\r
boolean resizePanel = false;
\r
Image image;
\r
AlignmentPanel ap;
\r
@@
-198,11
+198,11
@@
public class AnnotationLabels extends JPanel implements MouseListener,
}
\r
else if (evt.getActionCommand().equals(OUTPUT_TEXT))
\r
{
\r
}
\r
else if (evt.getActionCommand().equals(OUTPUT_TEXT))
\r
{
\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer();
\r
- Desktop.addInternalFrame(cap,
\r
- ap.alignFrame.getTitle() + " - " + aa[selectedRow].label, 500,
\r
- 100);
\r
- cap.setText(aa[selectedRow].toString());
\r
+ new AnnotationExporter().exportAnnotations(
\r
+ ap,
\r
+ new AlignmentAnnotation[]
\r
+ {aa[selectedRow]}
\r
+ );
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-230,7
+230,7
@@
public class AnnotationLabels extends JPanel implements MouseListener,
public void mouseReleased(MouseEvent evt)
\r
{
\r
int start = selectedRow;
\r
public void mouseReleased(MouseEvent evt)
\r
{
\r
int start = selectedRow;
\r
- getSelectedRow(evt.getY());
\r
+ getSelectedRow(evt.getY() - scrollOffset);
\r
int end = selectedRow;
\r
\r
if(start!=end)
\r
int end = selectedRow;
\r
\r
if(start!=end)
\r
@@
-520,7
+520,7
@@
public class AnnotationLabels extends JPanel implements MouseListener,
else if (dragEvent != null)
\r
{
\r
g.setColor(Color.lightGray);
\r
else if (dragEvent != null)
\r
{
\r
g.setColor(Color.lightGray);
\r
- g.drawString(aa[selectedRow].label, dragEvent.getX(), dragEvent.getY());
\r
+ g.drawString(aa[selectedRow].label, dragEvent.getX(), dragEvent.getY() - scrollOffset);
\r
}
\r
\r
\r
}
\r
\r
\r