X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=4ea3a12b062e6c6e46ceab9c36009791782bb601;hb=ce5285b1d45799f2433f94a85449e7d086ffc7e9;hp=b57305a48cd7089a43064825c318a1076624139f;hpb=4059c82f431d3f98931b290d9a72da2a54a0fc95;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index b57305a..4ea3a12 100755 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -179,7 +179,6 @@ public class SeqPanel extends JPanel implements MouseListener, { Vector tmp = new Vector(); SequenceFeature[] features = sequence.getSequenceFeatures(); - if (features != null) { for (int i = 0; i < features.length; i++) @@ -188,8 +187,8 @@ public class SeqPanel extends JPanel implements MouseListener, || !av.featuresDisplayed.containsKey(features[i].getType())) continue; - if ( (features[i].getBegin() <= sequence.findPosition(res)) && - (features[i].getEnd() >= sequence.findPosition(res))) + if ( (features[i].getBegin() <= res) && + (features[i].getEnd() >= res)) { tmp.addElement(features[i]); } @@ -558,7 +557,7 @@ public class SeqPanel extends JPanel implements MouseListener, tooltipText.setLength(6); // Cuts the buffer back to SequenceFeature[] features = findFeaturesAtRes( - sequence.getDatasetSequence(), res); + sequence.getDatasetSequence(), sequence.findPosition(res)); if(features!=null) { @@ -649,7 +648,6 @@ public class SeqPanel extends JPanel implements MouseListener, } } - if(tooltipText.length()==6) // { @@ -1202,17 +1200,35 @@ public class SeqPanel extends JPanel implements MouseListener, public void mouseClicked(MouseEvent evt) { + SequenceI sequence = av.alignment.getSequenceAt( findSeq(evt) ); if(evt.getClickCount()>1) { + if (av.getSelectionGroup().getSize(false) == 1 + && av.getSelectionGroup().getEndRes() + - av.getSelectionGroup().getStartRes() < 2) + av.setSelectionGroup(null); SequenceFeature[] features = findFeaturesAtRes( - av.alignment.getSequenceAt( findSeq(evt) ).getDatasetSequence(), - findRes(evt) + sequence.getDatasetSequence(), + sequence.findPosition( findRes(evt) ) ); - for(int f=0; f0) + { + seqCanvas.getFeatureRenderer().amendFeatures( + new SequenceI[] + {sequence}, features, false); + + seqCanvas.highlightSearchResults(null); + } } } @@ -1412,11 +1428,16 @@ public class SeqPanel extends JPanel implements MouseListener, stretchGroup.getWidth()); } + if (stretchGroup.cs instanceof Blosum62ColourScheme + || stretchGroup.cs instanceof PIDColourScheme + || stretchGroup.cs.conservationApplied() + || stretchGroup.cs.getThreshold()>0) + stretchGroup.recalcConservation(); + if (stretchGroup.cs.conservationApplied()) { SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup.getName()); - stretchGroup.recalcConservation(); } else { @@ -1449,7 +1470,7 @@ public class SeqPanel extends JPanel implements MouseListener, return; } - if(res> av.alignment.getWidth()) + if(res>= av.alignment.getWidth()) { res = av.alignment.getWidth()-1; }