import jalview.schemes.*;\r
\r
public class SeqPanel\r
- extends Panel\r
+ extends Panel implements MouseMotionListener, MouseListener\r
{\r
\r
public SeqCanvas seqCanvas;\r
\r
ap = p;\r
\r
- seqCanvas.addMouseMotionListener(new MouseMotionAdapter()\r
- {\r
- public void mouseMoved(MouseEvent evt)\r
- {\r
- doMouseMoved(evt);\r
- }\r
-\r
- public void mouseDragged(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- doMouseDragged(evt);\r
- }\r
- else\r
- {\r
- doMouseDraggedDefineMode(evt);\r
- }\r
- }\r
- });\r
-\r
- seqCanvas.addMouseListener(new MouseAdapter()\r
- {\r
- public void mouseReleased(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- doMouseReleased(evt);\r
- }\r
- else\r
- {\r
- doMouseReleasedDefineMode(evt);\r
- }\r
-\r
- }\r
-\r
- public void mousePressed(MouseEvent evt)\r
- {\r
- if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
- {\r
- if (evt.isAltDown() || evt.isControlDown())\r
- {\r
- groupEditing = true;\r
- }\r
+ seqCanvas.addMouseMotionListener(this);\r
+ seqCanvas.addMouseListener(this);\r
\r
- editingSeqs = true;\r
- doMousePressed(evt);\r
- }\r
- else\r
- {\r
- doMousePressedDefineMode(evt);\r
- }\r
- }\r
+ seqCanvas.repaint();\r
+ }\r
\r
- public void mouseExited(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- return;\r
- }\r
- doMouseExitedDefineMode(evt);\r
\r
- }\r
+ public void mousePressed(MouseEvent evt)\r
+ {\r
+ if (evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())\r
+ {\r
+ if (evt.isAltDown() || evt.isControlDown())\r
+ {\r
+ groupEditing = true;\r
+ }\r
+\r
+ editingSeqs = true;\r
+ doMousePressed(evt);\r
+ }\r
+ else\r
+ {\r
+ doMousePressedDefineMode(evt);\r
+ }\r
+ }\r
\r
- public void mouseEntered(MouseEvent evt)\r
- {\r
- if (editingSeqs)\r
- {\r
- return;\r
- }\r
- doMouseEnteredDefineMode(evt);\r
- }\r
+ public void mouseClicked(MouseEvent evt){}\r
\r
- });\r
- seqCanvas.repaint();\r
- }\r
\r
- public void doMouseReleased(MouseEvent evt)\r
+ public void mouseReleased(MouseEvent evt)\r
{\r
+ if (!editingSeqs)\r
+ {\r
+ doMouseReleasedDefineMode(evt);\r
+ return;\r
+ }\r
+\r
\r
if (seqEditOccurred > -1)\r
{\r
return;\r
}\r
\r
- public void doMouseMoved(MouseEvent evt)\r
+ public void mouseMoved(MouseEvent evt)\r
{\r
int res = findRes(evt);\r
int seq = findSeq(evt);\r
// use aa to see if the mouse pointer is on a\r
if (av.showSequenceFeatures && sequence.getSequenceFeatures()!=null)\r
{\r
- Vector features = sequence.getSequenceFeatures();\r
- Enumeration e = features.elements();\r
- text.append(" Sequence Feature: ");\r
-\r
- while (e.hasMoreElements())\r
+ int index = 0;\r
+ sequence.getSequenceFeatures();\r
+ boolean first = true;\r
+ while (index < sequence.getSequenceFeatures().length)\r
{\r
- SequenceFeature sf = (SequenceFeature) e.nextElement();\r
+ SequenceFeature sf = sequence.getSequenceFeatures()[index];\r
if (sf.getBegin() <= sequence.findPosition(res) &&\r
sf.getEnd() >= sequence.findPosition(res))\r
{\r
- text.append(sf.getDescription());\r
- if (sf.getStatus().length() > 0)\r
+ if(!av.featuresDisplayed.containsKey(sf.getType()))\r
+ {\r
+ index++;\r
+ continue;\r
+ }\r
+\r
+ if(first)\r
+ {\r
+ text.append(" Sequence Feature:");\r
+ first = false;\r
+ }\r
+\r
+ text.append(" "+sf.getType());\r
+\r
+ if(sf.getDescription()!=null)\r
+ text.append(" "+sf.getDescription());\r
+\r
+ if (sf.getStatus()!=null && sf.getStatus().length() > 0)\r
{\r
text.append(" (" + sf.getStatus() + ")");\r
}\r
text.append("; ");\r
}\r
\r
+ index++;\r
+\r
}\r
}\r
\r
\r
}\r
\r
- public void doMouseDragged(MouseEvent evt)\r
+ public void mouseDragged(MouseEvent evt)\r
{\r
+ if (!editingSeqs)\r
+ {\r
+ doMouseDraggedDefineMode(evt);\r
+ return;\r
+ }\r
\r
// If we're dragging we're editing\r
int res = findRes(evt);\r
\r
public void drawChars(int seqstart, int seqend, int start)\r
{\r
- seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart, seqend,\r
- av.getStartRes(), av.getStartSeq(), 0);\r
+ seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart, seqend, 0);\r
seqCanvas.repaint();\r
}\r
\r
seqCanvas.repaint();\r
}\r
\r
- public void doMouseEnteredDefineMode(MouseEvent e)\r
+ public void mouseEntered(MouseEvent e)\r
{\r
- if (scrollThread != null)\r
+ if (editingSeqs && scrollThread != null)\r
{\r
scrollThread.running = false;\r
}\r
}\r
\r
- public void doMouseExitedDefineMode(MouseEvent e)\r
+ public void mouseExited(MouseEvent e)\r
{\r
if (mouseDragging)\r
{\r