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
Modified for wrappingAlignment
[jalview.git]
/
src
/
jalview
/
gui
/
IdPanel.java
diff --git
a/src/jalview/gui/IdPanel.java
b/src/jalview/gui/IdPanel.java
index
644d2ce
..
0e528a2
100755
(executable)
--- a/
src/jalview/gui/IdPanel.java
+++ b/
src/jalview/gui/IdPanel.java
@@
-33,7
+33,8
@@
public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
public void mouseMoved(MouseEvent e) {}
\r
\r
public void selectSeqs(int start, int end) {
\r
public void mouseMoved(MouseEvent e) {}
\r
\r
public void selectSeqs(int start, int end) {
\r
- if (end < start) {
\r
+ if (end < start)
\r
+ {
\r
int tmp = start;
\r
start = end;
\r
end = tmp;
\r
int tmp = start;
\r
start = end;
\r
end = tmp;
\r
@@
-72,11
+73,10
@@
public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
\r
public void mouseDragged(MouseEvent e) {
\r
int y = e.getY();
\r
\r
public void mouseDragged(MouseEvent e) {
\r
int y = e.getY();
\r
+ if(av.getWrapAlignment())
\r
+ y-=2*av.charHeight;
\r
int seq = av.getIndex(y);
\r
\r
int seq = av.getIndex(y);
\r
\r
-
\r
-
\r
-
\r
if (seq < lastid)
\r
selectSeqs(lastid - 1, seq);
\r
else if (seq > lastid)
\r
if (seq < lastid)
\r
selectSeqs(lastid - 1, seq);
\r
else if (seq > lastid)
\r
@@
-91,7
+91,11
@@
public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
{
\r
if (e.getClickCount() == 2)
\r
{
\r
{
\r
if (e.getClickCount() == 2)
\r
{
\r
- int seq = av.getIndex(e.getY());
\r
+ int y = e.getY();
\r
+ if(av.getWrapAlignment())
\r
+ y-=2*av.charHeight;
\r
+
\r
+ int seq = av.getIndex(y);
\r
String id = av.getAlignment().getSequenceAt(seq).getName();
\r
\r
try{
\r
String id = av.getAlignment().getSequenceAt(seq).getName();
\r
\r
try{
\r
@@
-110,52
+114,39
@@
public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
return;
\r
\r
int y = e.getY();
\r
return;
\r
\r
int y = e.getY();
\r
- int seq = av.getIndex(y);
\r
+ if(av.getWrapAlignment())
\r
+ y-=2*av.charHeight;
\r
\r
\r
+ int seq = av.getIndex(y);
\r
\r
\r
- if( javax.swing.SwingUtilities.isRightMouseButton(e))
\r
- {
\r
- jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu( av , alignPanel.seqPanel);
\r
- pop.show(this, e.getX(), y);
\r
+ if (javax.swing.SwingUtilities.isRightMouseButton(e))
\r
+ {
\r
+ jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel,
\r
+ av.getAlignment().getSequenceAt(seq));
\r
+ pop.show(this, e.getX(), y);
\r
+ return;
\r
+ }
\r
\r
\r
\r
\r
- /* String id = av.getAlignment().getSequenceAt(seq).getName();
\r
- String s = (String)JOptionPane.showInternalInputDialog(
\r
- this,
\r
- "Edit sequence name",
\r
- "Edit sequence name",
\r
- JOptionPane.PLAIN_MESSAGE,
\r
- null,
\r
- null,
\r
- id);
\r
\r
\r
- if(s!=null)
\r
- {
\r
- av.getAlignment().getSequenceAt(seq).setName(s);
\r
- alignPanel.RefreshPanels();
\r
- }*/
\r
+ if(av.getRubberbandGroup()!=null && (av.getRubberbandGroup().getSize() == av.getSelection().size()))
\r
+ selectedSequenceGroup = av.getRubberbandGroup();
\r
\r
\r
- }
\r
- else
\r
- {
\r
+ if (selectedSequenceGroup == null)
\r
+ {
\r
+ selectedSequenceGroup = new SequenceGroup();
\r
+ av.setRubberbandGroup(selectedSequenceGroup);
\r
+ }
\r
\r
\r
- selectedSequenceGroup = av.getRubberbandGroup();
\r
- if(selectedSequenceGroup==null)
\r
- {
\r
- selectedSequenceGroup = new SequenceGroup();
\r
- av.setRubberbandGroup(selectedSequenceGroup);
\r
- }
\r
+ selectedSequenceGroup.setStartRes(0);
\r
+ selectedSequenceGroup.setEndRes(av.getAlignment().getWidth() - 1);
\r
\r
\r
- selectedSequenceGroup.setStartRes(0);
\r
- selectedSequenceGroup.setEndRes( av.getAlignment().getWidth()-1 );
\r
+ if (seq != -1)
\r
+ selectSeqs(seq, seq);
\r
\r
\r
- // selectedSequenceGroup = av.alignment.findGroup(seq);
\r
+ lastid = seq;
\r
\r
\r
- if (seq != -1)
\r
- selectSeqs(seq,seq);
\r
\r
\r
- lastid = seq;
\r
- }
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r