X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAnnotationLabels.java;h=1a6400da691434a3b7670ff613795e60c789d168;hb=9b7ee35c6b9909b030b5b04e33266acf8d5ad637;hp=cef84ccd25edb687b97bdaabdb65ebc5a6992099;hpb=dca8d7b5caa5c263b01d7750098da075c892c9f4;p=jalview.git diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java index cef84cc..1a6400d 100755 --- a/src/jalview/appletgui/AnnotationLabels.java +++ b/src/jalview/appletgui/AnnotationLabels.java @@ -67,31 +67,21 @@ public class AnnotationLabels extends Panel implements ActionListener, setLayout(null); /** - * this retrieves the adjustable height glyph from resources. we don't use it at the moment. - java.net.URL url = getClass().getResource("/images/idwidth.gif"); - Image temp = null; - - if (url != null) - { - temp = java.awt.Toolkit.getDefaultToolkit().createImage(url); - } - - try - { - MediaTracker mt = new MediaTracker(this); - mt.addImage(temp, 0); - mt.waitForID(0); - } catch (Exception ex) - { - } - - BufferedImage bi = new BufferedImage(temp.getHeight(this), - temp.getWidth(this), BufferedImage.TYPE_INT_RGB); - Graphics2D g = (Graphics2D) bi.getGraphics(); - g.rotate(Math.toRadians(90)); - g.drawImage(temp, 0, -bi.getWidth(this), this); - image = (Image) bi; -*/ + * this retrieves the adjustable height glyph from resources. we don't use + * it at the moment. java.net.URL url = + * getClass().getResource("/images/idwidth.gif"); Image temp = null; + * + * if (url != null) { temp = + * java.awt.Toolkit.getDefaultToolkit().createImage(url); } + * + * try { MediaTracker mt = new MediaTracker(this); mt.addImage(temp, 0); + * mt.waitForID(0); } catch (Exception ex) { } + * + * BufferedImage bi = new BufferedImage(temp.getHeight(this), + * temp.getWidth(this), BufferedImage.TYPE_INT_RGB); Graphics2D g = + * (Graphics2D) bi.getGraphics(); g.rotate(Math.toRadians(90)); + * g.drawImage(temp, 0, -bi.getWidth(this), this); image = (Image) bi; + */ addMouseListener(this); addMouseMotionListener(this); } @@ -232,8 +222,7 @@ public class AnnotationLabels extends Panel implements ActionListener, public void mouseMoved(MouseEvent evt) { - resizePanel = evt.getY() < 10; - + resizePanel = evt.getY() < 10 && evt.getX() < 14; int row = getSelectedRow(evt.getY() + scrollOffset); if (row > -1) @@ -255,39 +244,82 @@ public class AnnotationLabels extends Panel implements ActionListener, { tooltip.setTip(""); } - } + /** + * curent drag position + */ MouseEvent dragEvent = null; + /** + * flag to indicate drag events should be ignored + */ + private boolean dragCancelled = false; + + /** + * clear any drag events in progress + */ + public void cancelDrag() + { + dragEvent = null; + dragCancelled = true; + } + public void mouseDragged(MouseEvent evt) { + if (dragCancelled) + { + return; + } + ; dragEvent = evt; if (resizePanel) { - Dimension d = ap.annotationPanelHolder.getSize(),e = ap.annotationSpaceFillerHolder.getSize();; + Dimension d = ap.annotationPanelHolder.getSize(), e = ap.annotationSpaceFillerHolder + .getSize(), f = ap.seqPanelHolder.getSize(); int dif = evt.getY() - oldY; dif /= ap.av.charHeight; dif *= ap.av.charHeight; - if ((d.height - dif) > 20) + if ((d.height - dif) > 20 && (f.height + dif) > 20) { - - setSize(new Dimension(e.width,d.height-dif)); - ap.annotationSpaceFillerHolder.setSize(new Dimension(e.width, d.height - dif)); - ap.annotationPanelHolder.setSize(new Dimension(d.width, d.height - dif)); - ap.apvscroll.setValues(ap.apvscroll.getValue(), d.height-dif, 0, ap.annotationPanel.adjustPanelHeight(false)); - + ap.annotationPanel.setSize(d.width, d.height - dif); + setSize(new Dimension(e.width, d.height - dif)); + ap.annotationSpaceFillerHolder.setSize(new Dimension(e.width, + d.height - dif)); + ap.annotationPanelHolder.setSize(new Dimension(d.width, d.height + - dif)); + ap.apvscroll.setValues(ap.apvscroll.getValue(), d.height - dif, 0, + ap.annotationPanel.calcPanelHeight()); + f.height += dif; + ap.seqPanelHolder.setPreferredSize(f); + ap.setScrollValues(av.getStartRes(), av.getStartSeq()); ap.validate(); - //ap.paintAlignment(true); + // ap.paintAlignment(true); + ap.addNotify(); } - ap.addNotify(); } else { + int diff; + if ((diff = 6 - evt.getY()) > 0) + { + // nudge scroll up + ap.apvscroll.setValue(ap.apvscroll.getValue() - diff); + ap.adjustmentValueChanged(null); + + } + else if ((0 < (diff = 6 + - ap.annotationSpaceFillerHolder.getSize().height + + evt.getY()))) + { + // nudge scroll down + ap.apvscroll.setValue(ap.apvscroll.getValue() + diff); + ap.adjustmentValueChanged(null); + } repaint(); } } @@ -298,15 +330,38 @@ public class AnnotationLabels extends Panel implements ActionListener, public void mouseReleased(MouseEvent evt) { + if (!resizePanel && !dragCancelled) + { + int start = selectedRow; + + int end = getSelectedRow(evt.getY() + scrollOffset); + + if (start>-1 && start != end) + { + // Swap these annotations + AlignmentAnnotation startAA = ap.av.alignment + .getAlignmentAnnotation()[start]; + if (end == -1) + { + end = ap.av.alignment.getAlignmentAnnotation().length - 1; + } + AlignmentAnnotation endAA = ap.av.alignment + .getAlignmentAnnotation()[end]; + + ap.av.alignment.getAlignmentAnnotation()[end] = startAA; + ap.av.alignment.getAlignmentAnnotation()[start] = endAA; + } + } resizePanel = false; dragEvent = null; + dragCancelled = false; repaint(); ap.annotationPanel.repaint(); } public void mouseEntered(MouseEvent evt) { - if (evt.getY() < 10) + if (evt.getY() < 10 && evt.getX() < 14) { resizePanel = true; repaint(); @@ -315,6 +370,7 @@ public class AnnotationLabels extends Panel implements ActionListener, public void mouseExited(MouseEvent evt) { + dragCancelled = false; if (dragEvent == null) { @@ -333,6 +389,11 @@ public class AnnotationLabels extends Panel implements ActionListener, public void mousePressed(MouseEvent evt) { oldY = evt.getY(); + if (resizePanel) + { + return; + } + dragCancelled=false; // todo: move below to mouseClicked ? selectedRow = getSelectedRow(evt.getY() + scrollOffset); @@ -377,27 +438,123 @@ public class AnnotationLabels extends Panel implements ActionListener, item = new MenuItem(OUTPUT_TEXT); item.addActionListener(this); popup.add(item); - - if (aa[selectedRow] == ap.av.consensus) + if (selectedRow < aa.length) { - popup.addSeparator(); - final CheckboxMenuItem cbmi = new CheckboxMenuItem( - "Ignore Gaps In Consensus", ap.av.getIgnoreGapsConsensus()); - - cbmi.addItemListener(new ItemListener() + if (aa[selectedRow].autoCalculated) { - public void itemStateChanged(ItemEvent e) + if (aa[selectedRow].label.indexOf("Consensus") > -1) { - ap.av.setIgnoreGapsConsensus(cbmi.getState()); - ap.paintAlignment(true); + popup.addSeparator(); + final CheckboxMenuItem cbmi = new CheckboxMenuItem( + "Ignore Gaps In Consensus", + (aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef + .getIgnoreGapsConsensus() : ap.av + .getIgnoreGapsConsensus()); + final AlignmentAnnotation aaa = aa[selectedRow]; + cbmi.addItemListener(new ItemListener() + { + public void itemStateChanged(ItemEvent e) + { + if (aaa.groupRef != null) + { + // TODO: pass on reference to ap so the view can be updated. + aaa.groupRef.setIgnoreGapsConsensus(cbmi.getState()); + } + else + { + ap.av.setIgnoreGapsConsensus(cbmi.getState()); + } + ap.paintAlignment(true); + } + }); + popup.add(cbmi); + if (aaa.groupRef != null) + { + final CheckboxMenuItem chist = new CheckboxMenuItem( + "Show Group Histogram", + aa[selectedRow].groupRef.isShowConsensusHistogram()); + chist.addItemListener(new ItemListener() + { + public void itemStateChanged(ItemEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setShowConsensusHistogram(chist.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + popup.add(chist); + final CheckboxMenuItem cprofl = new CheckboxMenuItem( + "Show Group Logo", + aa[selectedRow].groupRef.isShowSequenceLogo()); + cprofl.addItemListener(new ItemListener() + { + public void itemStateChanged(ItemEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setshowSequenceLogo(cprofl.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + popup.add(cprofl); + } + else + { + final CheckboxMenuItem chist = new CheckboxMenuItem( + "Show Histogram", av.isShowConsensusHistogram()); + chist.addItemListener(new ItemListener() + { + public void itemStateChanged(ItemEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.setShowConsensusHistogram(chist.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + popup.add(chist); + final CheckboxMenuItem cprof = new CheckboxMenuItem( + "Show Logo", av.isShowSequenceLogo()); + cprof.addItemListener(new ItemListener() + { + public void itemStateChanged(ItemEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.setShowSequenceLogo(cprof.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + popup.add(cprof); + } + + item = new MenuItem(COPYCONS_SEQ); + item.addActionListener(this); + popup.add(item); } - }); - popup.add(cbmi); - item = new MenuItem(COPYCONS_SEQ); - item.addActionListener(this); - popup.add(item); + } } - popup.show(this, evt.getX(), evt.getY()); } else @@ -490,7 +647,8 @@ public class AnnotationLabels extends Panel implements ActionListener, public void paint(Graphics g) { int w = getSize().width; - if (image == null || w != image.getWidth(this)) + int h = getSize().height; + if (image == null || w != image.getWidth(this) || h!=image.getHeight(this) ) { image = createImage(w, ap.annotationPanel.getSize().height); } @@ -540,7 +698,7 @@ public class AnnotationLabels extends Panel implements ActionListener, g.drawLine(2, 8, 5, 2); g.drawLine(5, 2, 8, 8); } - else if (dragEvent != null && aa != null) + else if (!dragCancelled && dragEvent != null && aa != null) { g.setColor(Color.lightGray); g.drawString(aa[selectedRow].label, dragEvent.getX(), @@ -554,5 +712,4 @@ public class AnnotationLabels extends Panel implements ActionListener, g.drawString("to add annotation", 2, 18); } } - }