\r
import javax.swing.*;\r
\r
+import java.util.Vector;\r
+\r
\r
/**\r
* DOCUMENT ME!\r
StringBuffer keyboardNo1;\r
StringBuffer keyboardNo2;\r
\r
+ java.net.URL linkImageURL;\r
+\r
/**\r
* Creates a new SeqPanel object.\r
*\r
*/\r
public SeqPanel(AlignViewport avp, AlignmentPanel p)\r
{\r
+ linkImageURL = getClass().getResource("/images/link.gif");\r
ToolTipManager.sharedInstance().registerComponent(this);\r
ToolTipManager.sharedInstance().setInitialDelay(0);\r
ToolTipManager.sharedInstance().setDismissDelay(10000);\r
return seq;\r
}\r
\r
+ Vector getAllFeaturesAtRes(SequenceI seq, int res)\r
+ {\r
+ Vector allFeatures = new Vector();\r
+ int index = 0;\r
+ if(seq.getSequenceFeatures()!=null)\r
+ {\r
+ while (index < seq.getSequenceFeatures().length)\r
+ {\r
+ SequenceFeature sf = seq.getSequenceFeatures()[index];\r
+ if (sf.getBegin() <= res &&\r
+ sf.getEnd() >= res)\r
+ {\r
+ if (av.featuresDisplayed.containsKey(sf.getType()))\r
+ {\r
+ allFeatures.addElement(sf);\r
+ }\r
+ }\r
+ index++;\r
+ }\r
+ }\r
+ return allFeatures;\r
+ }\r
+\r
void endEditing()\r
{\r
startseq = -1;\r
if(features!=null)\r
{\r
StringBuffer sbuffer = new StringBuffer("<html>");\r
+ StringBuffer seqSpecific = new StringBuffer();\r
\r
for (int i = 0; i < features.length; i++)\r
{\r
sbuffer.append("<br>");\r
sbuffer.append("disulfide bond " + features[i].getBegin() + ":" +\r
features[i].getEnd());\r
+ if (features[i].links != null)\r
+ sbuffer.append(" <img src=\"" + linkImageURL + "\">");\r
}\r
}\r
else\r
{\r
if (sbuffer.length() > 6)\r
sbuffer.append("<br>");\r
- if(features[i].featureGroup!=null)\r
- sbuffer.append(features[i].featureGroup+";");\r
\r
- sbuffer.append(features[i].getType());\r
+ sbuffer.append(features[i].getType() + " " +\r
+ features[i].begin);\r
+ if (features[i].begin != features[i].end)\r
+ sbuffer.append(" " + features[i].end);\r
\r
if (features[i].getDescription() != null\r
&& !features[i].description.equals(features[i].getType()))\r
sbuffer.append("; " + features[i].getDescription());\r
\r
- if (features[i].getStatus() != null && features[i].getStatus().length()>0)\r
+ if (features[i].getValue("status") != null)\r
{\r
- sbuffer.append("; (" + features[i].getStatus() + ")");\r
+ sbuffer.append("; (" + features[i].getValue("status") + ")");\r
}\r
+ if (features[i].links != null)\r
+ sbuffer.append(" <img src=\"" + linkImageURL + "\">");\r
+\r
}\r
}\r
+ else if(features[i].begin==0 && features[i].end==0)\r
+ {\r
+ // seqSpecific.append(features[i].featureGroup+": "\r
+ // + features[i].getType()+" "\r
+ // +features[i].getDescription()+"<br>");\r
\r
+ }\r
}\r
\r
+ if(seqSpecific.length()>0)\r
+ seqSpecific.setLength(seqSpecific.length()-4);\r
+\r
+ sbuffer.append(seqSpecific);\r
sbuffer.append("</html>");\r
if(sbuffer.length()==13) // <html></html>\r
setToolTipText("");\r
*/\r
public void mouseDragged(MouseEvent evt)\r
{\r
- if(mouseWheelPressed)\r
+ if (mouseWheelPressed)\r
{\r
int oldWidth = av.charWidth;\r
\r
//Which is bigger, left-right or up-down?\r
- if( Math.abs(evt.getY()-lastMousePress.getY())\r
- > Math.abs(evt.getX()-lastMousePress.getX()))\r
- {\r
- int fontSize = av.font.getSize();\r
-\r
- if (evt.getY() < lastMousePress.getY() && av.charHeight > 1)\r
- {\r
- fontSize--;\r
- }\r
- else if (evt.getY() > lastMousePress.getY())\r
- {\r
- fontSize++;\r
- }\r
+ if (Math.abs(evt.getY() - lastMousePress.getY())\r
+ > Math.abs(evt.getX() - lastMousePress.getX()))\r
+ {\r
+ int fontSize = av.font.getSize();\r
\r
- av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));\r
- av.charWidth = oldWidth;\r
- ap.fontChanged();\r
+ if (evt.getY() < lastMousePress.getY())\r
+ {\r
+ fontSize--;\r
+ }\r
+ else if (evt.getY() > lastMousePress.getY())\r
+ {\r
+ fontSize++;\r
+ }\r
\r
+ if(fontSize<1)\r
+ fontSize = 1;\r
\r
- }\r
- else\r
- {\r
- if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)\r
- {\r
- av.charWidth--;\r
- }\r
- else if (evt.getX() > lastMousePress.getX())\r
- {\r
- av.charWidth++;\r
- }\r
+ av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize));\r
+ av.charWidth = oldWidth;\r
+ ap.fontChanged();\r
+ }\r
+ else\r
+ {\r
+ if (evt.getX() < lastMousePress.getX() && av.charWidth > 1)\r
+ {\r
+ av.charWidth--;\r
+ }\r
+ else if (evt.getX() > lastMousePress.getX())\r
+ {\r
+ av.charWidth++;\r
+ }\r
\r
- ap.repaint();\r
- }\r
+ ap.repaint();\r
+ }\r
\r
- FontMetrics fm = getFontMetrics(av.getFont());\r
- av.showText = (fm.charWidth('M') < av.charWidth);\r
- // && fm.getHeight()<av.charHeight\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
+ av.validCharWidth = fm.charWidth('M') <= av.charWidth;\r
\r
lastMousePress = evt.getPoint();\r
\r
"Cannot edit annotations in wrapped view.",\r
"Wrapped view - no edit",\r
JOptionPane.WARNING_MESSAGE);\r
- return;\r
+ return;\r
}\r
\r
if(seq<0 || res<0)\r
(allGroups[i].getEndRes() >= res))\r
{\r
stretchGroup = allGroups[i];\r
- av.setSelectionGroup(stretchGroup);\r
-\r
break;\r
}\r
}\r
}\r
+\r
+ av.setSelectionGroup(stretchGroup);\r
+\r
}\r
\r
if (av.cursorMode)\r
}\r
\r
\r
- if (stretchGroup == null)\r
+ if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
{\r
- // define a new group here\r
- SequenceGroup sg = new SequenceGroup();\r
- sg.setStartRes(res);\r
- sg.setEndRes(res);\r
- sg.addSequence(sequence, false);\r
- av.setSelectionGroup(sg);\r
- stretchGroup = sg;\r
-\r
- if (av.getConservationSelected())\r
+ Vector allFeatures = getAllFeaturesAtRes(sequence.getDatasetSequence(),\r
+ sequence.findPosition(res));\r
+ Vector links = new Vector();;\r
+ for (int i = 0; i < allFeatures.size(); i++)\r
{\r
- SliderPanel.setConservationSlider(ap,\r
- av.getGlobalColourScheme(), "Background");\r
+ SequenceFeature sf = (SequenceFeature) allFeatures.elementAt(i);\r
+ if (sf.links != null)\r
+ {\r
+ for (int j = 0; j < sf.links.size(); j++)\r
+ {\r
+ links.addElement(sf.links.elementAt(j));\r
+ }\r
+ }\r
}\r
\r
- if (av.getAbovePIDThreshold())\r
- {\r
- SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
- "Background");\r
- }\r
+\r
+ jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);\r
+ pop.show(this, evt.getX(), evt.getY());\r
}\r
- else if (javax.swing.SwingUtilities.isRightMouseButton(evt))\r
+ else if (stretchGroup == null)\r
{\r
- jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null);\r
- pop.show(this, evt.getX(), evt.getY());\r
+ //Only if left mouse button do we want to change group sizes\r
\r
- // edit the properties of existing group\r
- }\r
+ // define a new group here\r
+ SequenceGroup sg = new SequenceGroup();\r
+ sg.setStartRes(res);\r
+ sg.setEndRes(res);\r
+ sg.addSequence(sequence, false);\r
+ av.setSelectionGroup(sg);\r
+ stretchGroup = sg;\r
\r
- if ((stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
- {\r
+ if (av.getConservationSelected())\r
+ {\r
+ SliderPanel.setConservationSlider(ap,\r
+ av.getGlobalColourScheme(),\r
+ "Background");\r
+ }\r
+\r
+ if (av.getAbovePIDThreshold())\r
+ {\r
+ SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(),\r
+ "Background");\r
+ }\r
+ if ( (stretchGroup != null) && (stretchGroup.getEndRes() == res))\r
+ {\r
// Edit end res position of selected group\r
changeEndRes = true;\r
- }\r
- else if ((stretchGroup != null) && (stretchGroup.getStartRes() == res))\r
- {\r
+ }\r
+ else if ( (stretchGroup != null) &&\r
+ (stretchGroup.getStartRes() == res))\r
+ {\r
// Edit end res position of selected group\r
changeStartRes = true;\r
+ }\r
+ stretchGroup.getWidth();\r
}\r
\r
- stretchGroup.getWidth();\r
-\r
seqCanvas.repaint();\r
}\r
\r
git://source.jalview.org / jalview.git / blobdiff