X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=f81e471e67966cb9aed1bb31f35455791399d9e0;hb=8d191d32a84aa42a0d901f03d7919dc1f1df7911;hp=1a48af6fbe1471e03fd96d4fbbb6dc0825674cb5;hpb=6e71f42b0a3713ddbc3054e7ea9d8f5088130ec9;p=jalview.git diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 1a48af6..f81e471 100755 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -18,29 +18,37 @@ */ package jalview.gui; -import java.io.*; -import javax.imageio.*; +import jalview.datamodel.*; + +import jalview.jbgui.*; + +import jalview.schemes.*; import java.awt.*; import java.awt.event.*; -import java.awt.image.*; import java.awt.print.*; + +import java.io.*; + import javax.swing.*; -import org.jibble.epsgraphics.*; -import jalview.analysis.*; -import jalview.datamodel.*; -import jalview.jbgui.*; -import jalview.schemes.*; -public class AlignmentPanel - extends GAlignmentPanel implements AdjustmentListener, Printable +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class AlignmentPanel extends GAlignmentPanel + implements AdjustmentListener, Printable { - AlignViewport av; + public AlignViewport av; OverviewPanel overviewPanel; SeqPanel seqPanel; IdPanel idPanel; IdwidthAdjuster idwidthAdjuster; + + /** DOCUMENT ME!! */ public AlignFrame alignFrame; ScalePanel scalePanel; AnnotationPanel annotationPanel; @@ -51,6 +59,12 @@ public class AlignmentPanel int hextent = 0; int vextent = 0; + /** + * Creates a new AlignmentPanel object. + * + * @param af DOCUMENT ME! + * @param av DOCUMENT ME! + */ public AlignmentPanel(AlignFrame af, final AlignViewport av) { alignFrame = af; @@ -67,9 +81,7 @@ public class AlignmentPanel annotationPanel = new AnnotationPanel(this); alabels = new AnnotationLabels(this); - annotationSpaceFillerHolder.setPreferredSize(annotationPanel. - getPreferredSize()); - annotationScroller.setPreferredSize(annotationPanel.getPreferredSize()); + annotationScroller.setViewportView(annotationPanel); annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER); @@ -80,11 +92,17 @@ public class AlignmentPanel setScrollValues(0, 0); + annotationPanel.adjustPanelHeight(); + annotationSpaceFillerHolder.setPreferredSize(annotationPanel. + getPreferredSize()); + annotationScroller.setPreferredSize(annotationPanel. + getPreferredSize()); + setAnnotationVisible(av.getShowAnnotation()); + hscroll.addAdjustmentListener(this); vscroll.addAdjustmentListener(this); - setFocusable(true); - addKeyListener(new KeyAdapter() + af.addKeyListener(new KeyAdapter() { public void keyPressed(KeyEvent evt) { @@ -105,11 +123,26 @@ public class AlignmentPanel alignFrame.moveSelectedSequences(true); break; + + case KeyEvent.VK_BACK_SPACE: + case KeyEvent.VK_DELETE: + alignFrame.cut_actionPerformed(null); + break; + + case KeyEvent.VK_P: + seqPanel.seqCanvas.increaseAARatio(); + break; + case KeyEvent.VK_L: + seqPanel.seqCanvas.decreaseAARation(); + break; } } }); } + /** + * DOCUMENT ME! + */ public void fontChanged() { // set idCanvas bufferedImage to null @@ -122,27 +155,43 @@ public class AlignmentPanel av.charHeight + fm.getDescent())); idPanel.idCanvas.gg = null; + seqPanel.seqCanvas.img = null; annotationPanel.adjustPanelHeight(); Dimension d = calculateIdWidth(); d.setSize(d.width + 4, d.height); idPanel.idCanvas.setPreferredSize(d); hscrollFillerPanel.setPreferredSize(d); + + if (av.getWrapAlignment()) + { + int max = av.alignment.getWidth() / + seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth()); + vscroll.setMaximum(max); + vscroll.setUnitIncrement(1); + vscroll.setVisibleAmount(1); + } + else + { + setScrollValues(av.getStartRes(), av.getStartSeq()); + } + + if (overviewPanel != null) + overviewPanel.setBoxPosition(); + repaint(); } - Dimension calculateIdWidth() + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Dimension calculateIdWidth() { - Graphics g = this.getGraphics(); + Container c = new Container(); - if (g == null) - { - javax.swing.JFrame f = new javax.swing.JFrame(); - f.addNotify(); - g = f.getGraphics(); - } - - FontMetrics fm = g.getFontMetrics(av.font); + FontMetrics fm = c.getFontMetrics(av.font); AlignmentI al = av.getAlignment(); int i = 0; @@ -153,14 +202,7 @@ public class AlignmentPanel { SequenceI s = al.getSequenceAt(i); - if (av.getShowFullId()) - { - id = s.getDisplayId(); - } - else - { - id = s.getName(); - } + id = s.getDisplayId(av.getShowJVSuffix()); if (fm.stringWidth(id) > idWidth) { @@ -175,7 +217,7 @@ public class AlignmentPanel if (al.getAlignmentAnnotation() != null) { - fm = g.getFontMetrics(alabels.getFont()); + fm = c.getFontMetrics(alabels.getFont()); while (i < al.getAlignmentAnnotation().length) { @@ -193,75 +235,102 @@ public class AlignmentPanel return new Dimension(idWidth, 12); } - public void highlightSearchResults(int[] results) + /** + * DOCUMENT ME! + * + * @param results DOCUMENT ME! + */ + public void highlightSearchResults(SearchResults results) { seqPanel.seqCanvas.highlightSearchResults(results); // 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; + 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.getStartRes() > start) || (av.getEndRes() < end) || - ( (av.getStartSeq() > results[0]) || - (av.getEndSeq() < results[0]))) + if(!av.wrapAlignment) + { + if ( (av.getStartRes() > end) || (av.getEndRes() < start) || + ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex))) + { + setScrollValues(start, seqIndex); + } + } + else { - setScrollValues(start, results[0]); + int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth()); + if( start(av.getStartRes()+cwidth) ) + { + vscroll.setValue(start / cwidth); + av.startRes = vscroll.getValue() * cwidth; + } } } } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ public OverviewPanel getOverviewPanel() { return overviewPanel; } + /** + * DOCUMENT ME! + * + * @param op DOCUMENT ME! + */ public void setOverviewPanel(OverviewPanel op) { overviewPanel = op; } + /** + * DOCUMENT ME! + * + * @param b DOCUMENT ME! + */ public void setAnnotationVisible(boolean b) { - annotationSpaceFillerHolder.setVisible(b); - annotationScroller.setVisible(b); + if (!av.wrapAlignment) + { + annotationSpaceFillerHolder.setVisible(b); + annotationScroller.setVisible(b); + } + repaint(); } + /** + * DOCUMENT ME! + * + * @param wrap DOCUMENT ME! + */ public void setWrapAlignment(boolean wrap) { + av.startSeq = 0; scalePanelHolder.setVisible(!wrap); hscroll.setVisible(!wrap); idwidthAdjuster.setVisible(!wrap); - av.setShowAnnotation(!wrap); - annotationScroller.setVisible(!wrap); - annotationSpaceFillerHolder.setVisible(!wrap); - idSpaceFillerPanel1.setVisible(!wrap); - - repaint(); - } - - public void setColourScheme() - { - ColourSchemeI cs = av.getGlobalColourScheme(); - - if (av.getConservationSelected()) + if (wrap) { - Alignment al = (Alignment) av.getAlignment(); - Conservation c = new Conservation("All", - ResidueProperties.propHash, 3, - al.getSequences(), 0, - al.getWidth()); - - c.calculate(); - c.verdict(false, av.ConsPercGaps); - - ConservationColourScheme ccs = new ConservationColourScheme(c, cs); - - av.setGlobalColourScheme(ccs); + annotationScroller.setVisible(false); + annotationSpaceFillerHolder.setVisible(false); } + else if (av.showAnnotation) + { + annotationScroller.setVisible(true); + annotationSpaceFillerHolder.setVisible(true); + } + + idSpaceFillerPanel1.setVisible(!wrap); repaint(); } @@ -295,6 +364,13 @@ public class AlignmentPanel return true; } + /** + * DOCUMENT ME! + * + * @param right DOCUMENT ME! + * + * @return DOCUMENT ME! + */ public boolean scrollRight(boolean right) { if (right) @@ -323,6 +399,12 @@ public class AlignmentPanel return true; } + /** + * DOCUMENT ME! + * + * @param x DOCUMENT ME! + * @param y DOCUMENT ME! + */ public void setScrollValues(int x, int y) { av.setEndRes( (x + (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - @@ -365,8 +447,14 @@ public class AlignmentPanel vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight()); } + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ public void adjustmentValueChanged(AdjustmentEvent evt) { + int oldX = av.getStartRes(); int oldY = av.getStartSeq(); @@ -402,25 +490,42 @@ public class AlignmentPanel overviewPanel.setBoxPosition(); } + int scrollX = av.startRes - oldX; + int scrollY = av.startSeq - oldY; + if (av.getWrapAlignment() || !fastPaint) { repaint(); } else { - idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY); - seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX, - av.getStartSeq() - oldY); - - scalePanel.repaint(); - - if (av.getShowAnnotation()) + // 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" + + ""); + + for (s = 0; s < sSize; s++) + { + sy = s * av.charHeight + scaleHeight; + + SequenceI seq = av.alignment.getSequenceAt(s); + java.util.Vector features = seq.getDatasetSequence().getSequenceFeatures(); + SequenceGroup[] groups = av.alignment.findAllGroups(seq); + for(res =0; resres) + text.append("
" + groups[g].getName() + ""); + } + + if (features != null) + { + if(text.length()<1) + { + text.append("= seq.findPosition(res))) + { + if (sf.getType().equals("disulfide bond")) + { + if (sf.getBegin() == seq.findPosition(res) + || sf.getEnd() == seq.findPosition(res)) + { + text.append("
disulfide bond " + sf.getBegin() + ":" + + sf.getEnd()); + } + } + else + { + text.append("
"); + text.append(sf.getType()); + if (sf.getDescription() != null && !sf.getType().equals(sf.getDescription())) + text.append(" " + sf.getDescription()); + + if (sf.getStatus() != null && sf.getStatus().length()>0) + { + text.append(" (" + sf.getStatus() + ")"); + } + } + } + + } + } + if(text.length()>1) + { + text.append("')\"; onMouseOut=\"toolTip()\"; href=\"#\">"); + out.println(text.toString()); + } + } + } + out.println("
"); + out.close(); - if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION) + } + catch (Exception ex) { - return; + ex.printStackTrace(); } + } ///////////END OF IMAGE MAP - jalview.bin.Cache.setProperty("LAST_DIRECTORY", - chooser.getSelectedFile().getParent()); - - FileOutputStream out = new FileOutputStream(chooser.getSelectedFile()); + } - BufferedImage bi = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - Graphics2D png = (Graphics2D) bi.getGraphics(); + int getWrappedHeight() + { - png.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); + int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth( + seqPanel.seqCanvas.getWidth()); - if (av.getWrapAlignment()) - { - printWrappedAlignment(png, width, height, 0); - } - else - { - printUnwrapped(png, width, height, 0); - } + int hgap = av.charHeight; + if (av.scaleAboveWrapped) + hgap += av.charHeight; - ImageIO.write(bi, "png", out); - out.close(); - } - catch (Exception ex) + int annotationHeight = 0; + if (av.showAnnotation) { - ex.printStackTrace(); + annotationHeight = annotationPanel.adjustPanelHeight(); } - } -} -class Preview - extends JFrame -{ - public Preview(Image image) - { - setResizable(true); - setSize(image.getWidth(this), image.getHeight(this)); - setVisible(true); - getContentPane().setLayout(new BorderLayout()); - getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER); - validate(); - repaint(); - } -} + int cHeight = av.getAlignment().getHeight() * av.charHeight + + hgap + + annotationHeight; -class PreviewPanel - extends JPanel -{ - Image image; + int height = ( (av.alignment.getWidth() / chunkWidth) + 1) * cHeight; + + return height; + } - public PreviewPanel(Image image) + /** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ + class Preview + extends JFrame { - this.image = image; + /** + * Creates a new Preview object. + * + * @param image DOCUMENT ME! + */ + public Preview(Image image) + { + setResizable(true); + setSize(image.getWidth(this), image.getHeight(this)); + setVisible(true); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER); + validate(); + repaint(); + } } - public void paintComponent(Graphics g) + /** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ + class PreviewPanel + extends JPanel { - if (image != null) + Image image; + + /** + * Creates a new PreviewPanel object. + * + * @param image DOCUMENT ME! + */ + public PreviewPanel(Image image) { - g.drawImage(image, 0, 0, this); + this.image = image; } - else + + /** + * DOCUMENT ME! + * + * @param g DOCUMENT ME! + */ + public void paintComponent(Graphics g) { - System.out.println("DEBUG:image is null"); + if (image != null) + { + g.drawImage(image, 0, 0, this); + } + else + { + System.out.println("DEBUG:image is null"); + } } } }