X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=e0c327f769e17409f8dbf9f3df67102b55bc068a;hb=49057b644ae4dc904a3245b695ba86678ac01ede;hp=81b999f009ad9875d1db939f254bace5eb9c65f1;hpb=e78af69b55f5b95978094c6643ce884ba78efad2;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 81b999f..e0c327f 100755 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -65,6 +65,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener annotationPanel = new AnnotationPanel(this); alabels = new AnnotationLabels(this); + setAnnotationVisible(av.showAnnotation); + idPanelHolder.add(idPanel, BorderLayout.CENTER); idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER); annotationScroller.add(annotationPanel); @@ -78,9 +80,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener hscroll.addAdjustmentListener(this); vscroll.addAdjustmentListener(this); - seqPanel.seqCanvas.addKeyListener(new MyKeyAdapter()); - idPanel.idCanvas.addKeyListener(new MyKeyAdapter()); - addComponentListener(new ComponentAdapter() { public void componentResized(ComponentEvent evt) @@ -103,79 +102,27 @@ public class AlignmentPanel extends Panel implements AdjustmentListener } - class MyKeyAdapter - extends KeyAdapter - { - public void keyPressed(KeyEvent evt) - { - // System.out.println(evt.getKeyCode()); log. - switch (evt.getKeyCode()) - { - case 27: // escape key - alignFrame.deselectAllSequenceMenuItem_actionPerformed(null); - break; - case KeyEvent.VK_X: - if (evt.isControlDown()) - { - alignFrame.cut_actionPerformed(null); - } - break; - case KeyEvent.VK_C: - if (evt.isControlDown()) - { - alignFrame.copy_actionPerformed(null); - } - break; - case KeyEvent.VK_V: - if (evt.isControlDown()) - { - alignFrame.paste(true); - } - break; - case KeyEvent.VK_A: - if (evt.isControlDown()) - { - alignFrame.selectAllSequenceMenuItem_actionPerformed(null); - } - break; - case KeyEvent.VK_DOWN: - alignFrame.moveSelectedSequences(false); - break; - case KeyEvent.VK_UP: - alignFrame.moveSelectedSequences(true); - break; - case KeyEvent.VK_F: - if (evt.isControlDown()) - { - alignFrame.findMenuItem_actionPerformed(null); - } - break; - case KeyEvent.VK_BACK_SPACE: - case KeyEvent.VK_DELETE: - alignFrame.cut_actionPerformed(null); - break; - - } - } - } public void fontChanged() { // set idCanvas bufferedImage to null // to prevent drawing old image + idPanel.idCanvas.image =null; FontMetrics fm = getFontMetrics(av.getFont()); scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent())); idwidthAdjuster.setSize(new Dimension(10, av.charHeight + fm.getDescent())); - annotationPanel.adjustPanelHeight(); + int ap = annotationPanel.adjustPanelHeight(); annotationPanel.repaint(); Dimension d = calculateIdWidth(); d.setSize(d.width + 4, seqPanel.seqCanvas.getSize().height); + alabels.setSize(d.width+4, ap ); idPanel.idCanvas.setSize(d); hscrollFillerPanel.setSize(d); - alignFrame.pack(); + validate(); + repaint(); if(overviewPanel!=null) overviewPanel.updateOverviewImage(); @@ -238,25 +185,51 @@ public class AlignmentPanel extends Panel implements AdjustmentListener return new Dimension(idWidth, idPanel.idCanvas.getSize().height); } - public void highlightSearchResults(int[] results) + public void highlightSearchResults(SearchResults results) { seqPanel.seqCanvas.highlightSearchResults(results); - // do we need to scroll the panel? + // do we need to scroll the panel? if (results != null) { - SequenceI seq = av.alignment.getSequenceAt(results[0]); - int start = seq.findIndex(results[1]) - 1; - int end = seq.findIndex(results[2]) - 1; - if (av.getStartRes() > start - || av.getEndRes() < end - || (av.getStartSeq() > results[0] - || av.getEndSeq() < results[0])) - { - setScrollValues(start, results[0]); - } + SequenceI seq = results.getResultSequence(0); + int seqIndex = av.alignment.findIndex(seq); + int start = seq.findIndex(results.getResultStart(0)) - 1; + int end = seq.findIndex(results.getResultEnd(0)) - 1; + + if(!av.wrapAlignment) + { + if ( (av.getStartRes() > end) || (av.getEndRes() < start) || + ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex))) + { + if (start > av.alignment.getWidth() - hextent) + { + start = av.alignment.getWidth() - hextent; + if (start < 0) + start = 0; + } + if (seqIndex > av.alignment.getHeight() - vextent) + { + seqIndex = av.alignment.getHeight() - vextent; + if (seqIndex < 0) + seqIndex = 0; + } + setScrollValues(start, seqIndex); + } + } + else + { + int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel. + seqCanvas.getSize().width); + if (start < av.getStartRes() || start > (av.getStartRes() + cwidth)) + { + vscroll.setValue(start / cwidth); + av.startRes = vscroll.getValue() * cwidth; + } + } } + repaint(); } public OverviewPanel getOverviewPanel() @@ -284,6 +257,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { av.startSeq = 0; scalePanelHolder.setVisible(!wrap); + + hscroll.setVisible(!wrap); idwidthAdjuster.setVisible(!wrap); @@ -298,8 +273,11 @@ public class AlignmentPanel extends Panel implements AdjustmentListener annotationSpaceFillerHolder.setVisible(true); } + idSpaceFillerPanel1.setVisible(!wrap); + fontChanged();//This is so that the scalePanel is resized correctly + validate(); repaint(); @@ -318,8 +296,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { return false; } - fastPaint = false; - vscroll.setValue(vscroll.getValue() - 1); + setScrollValues(hscroll.getValue(), vscroll.getValue()-1); } else { @@ -327,10 +304,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { return false; } - fastPaint = false; - vscroll.setValue(vscroll.getValue() + 1); + setScrollValues(hscroll.getValue(), vscroll.getValue()+1); } - fastPaint = true; + repaint(); return true; } @@ -343,8 +319,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { return false; } - fastPaint = false; - hscroll.setValue(hscroll.getValue() - 1); + setScrollValues(hscroll.getValue()-1, vscroll.getValue()); } else { @@ -352,16 +327,15 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { return false; } - fastPaint = false; - hscroll.setValue(hscroll.getValue() + 1); + setScrollValues(hscroll.getValue()+1, vscroll.getValue()); } - fastPaint = true; + + repaint(); return true; } public void setScrollValues(int x, int y) { - av.setStartRes(x); av.setStartSeq(y); av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1); @@ -407,7 +381,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener av.setEndSeq(endSeq); hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth()); vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight()); - } public void adjustmentValueChanged(AdjustmentEvent evt) @@ -415,7 +388,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener int oldX = av.getStartRes(); int oldY = av.getStartSeq(); - if (evt.getSource() == hscroll) + + if (evt==null || evt.getSource() == hscroll) { int x = hscroll.getValue(); av.setStartRes(x); @@ -423,7 +397,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener 1); } - if (evt.getSource() == vscroll) + + if (evt==null || evt.getSource() == vscroll) { int offy = vscroll.getValue(); if (av.getWrapAlignment()) @@ -446,15 +421,27 @@ public class AlignmentPanel extends Panel implements AdjustmentListener overviewPanel.setBoxPosition(); } + int scrollX = av.startRes - oldX; + int scrollY = av.startSeq - oldY; + if (av.getWrapAlignment() || !fastPaint || MAC) { repaint(); } else { - idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY); - seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX, - av.getStartSeq() - oldY); + // Make sure we're not trying to draw a panel + // larger than the visible window + if(scrollX>av.endRes-av.startRes) + { + scrollX = av.endRes - av.startRes; + } + else if(scrollX