X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=e1b5abb3c2e6571347faec893b4acb813d0d058f;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=bfbaf4d0bb8262a591714564d75ce4c7a605d0c8;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index bfbaf4d..e1b5abb 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1,38 +1,57 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.beans.*; -import java.io.*; -import java.util.Hashtable; -import java.util.Vector; - -import java.awt.*; -import java.awt.event.*; -import java.awt.print.*; -import javax.swing.*; - +import jalview.analysis.AnnotationSorter; import jalview.api.AlignmentViewPanel; import jalview.bin.Cache; -import jalview.datamodel.*; -import jalview.jbgui.*; -import jalview.schemes.*; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; +import jalview.jbgui.GAlignmentPanel; +import jalview.schemes.ResidueProperties; import jalview.structure.StructureSelectionManager; +import jalview.util.MessageManager; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.awt.print.PrinterException; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.FileWriter; +import java.io.PrintWriter; + +import javax.swing.SwingUtilities; /** * DOCUMENT ME! @@ -173,15 +192,31 @@ public class AlignmentPanel extends GAlignmentPanel implements */ public Dimension calculateIdWidth() { + // calculate sensible default width when no preference is available + + int afwidth = (alignFrame != null ? alignFrame.getWidth() : 300); + int maxwidth = Math.max(20, + Math.min(afwidth - 200, 2 * afwidth / 3)); + return calculateIdWidth(maxwidth); + } + + /** + * Calculate the width of the alignment labels based on the displayed names + * and any bounds on label width set in preferences. + * + * @param maxwidth + * -1 or maximum width allowed for IdWidth + * @return Dimension giving the maximum width of the alignment label panel + * that should be used. + */ + public Dimension calculateIdWidth(int maxwidth) + { Container c = new Container(); FontMetrics fm = c.getFontMetrics(new Font(av.font.getName(), Font.ITALIC, av.font.getSize())); AlignmentI al = av.getAlignment(); - int afwidth = (alignFrame != null ? alignFrame.getWidth() : 300); - int maxwidth = Math.max(20, - Math.min(afwidth - 200, (int) 2 * afwidth / 3)); int i = 0; int idWidth = 0; String id; @@ -220,7 +255,8 @@ public class AlignmentPanel extends GAlignmentPanel implements } } - return new Dimension(Math.min(maxwidth, idWidth), 12); + return new Dimension(maxwidth < 0 ? idWidth : Math.min(maxwidth, + idWidth), 12); } /** @@ -270,8 +306,8 @@ public class AlignmentPanel extends GAlignmentPanel implements return false; } SequenceI seq = av.getAlignment().getSequenceAt(seqIndex); - - int[] r=results.getResults(seq, 0, av.getAlignment().getWidth()); + + int[] r = results.getResults(seq, 0, av.getAlignment().getWidth()); if (r == null) { return false; @@ -292,7 +328,7 @@ public class AlignmentPanel extends GAlignmentPanel implements { start = av.getColumnSelection().findColumnPosition(start); end = av.getColumnSelection().findColumnPosition(end); - if (start==end) + if (start == end) { if (!av.getColumnSelection().isVisible(r[0])) { @@ -368,8 +404,9 @@ public class AlignmentPanel extends GAlignmentPanel implements /** * - * @param b Hide or show annotation panel - * + * @param b + * Hide or show annotation panel + * */ public void setAnnotationVisible(boolean b) { @@ -382,8 +419,8 @@ public class AlignmentPanel extends GAlignmentPanel implements } /** - * automatically adjust annotation panel height for new annotation - * whilst ensuring the alignment is still visible. + * automatically adjust annotation panel height for new annotation whilst + * ensuring the alignment is still visible. */ public void adjustAnnotationHeight() { @@ -397,28 +434,48 @@ public class AlignmentPanel extends GAlignmentPanel implements addNotify(); paintAlignment(true); } + /** * calculate the annotation dimensions and refresh slider values accordingly. - * need to do repaints/notifys afterwards. + * need to do repaints/notifys afterwards. */ - protected void validateAnnotationDimensions(boolean adjustPanelHeight) { + protected void validateAnnotationDimensions(boolean adjustPanelHeight) + { int height = annotationPanel.adjustPanelHeight(); - - if (hscroll.isVisible()) - { - height += hscroll.getPreferredSize().height; - } - if (height > alignFrame.getHeight() / 2) - { - height = alignFrame.getHeight() / 2; + + int theight = av.getCharHeight() + * (av.getAlignment().getHeight() + (!av.hasHiddenRows() ? 0 + : av.getAlignment().getHiddenSequences().getSize())); + float sscaling = (float) (theight / (1.0 * theight + height)); + float ascaling = (float) (height * 1.0 / alignFrame.getHeight()); + int rheight = alignFrame.getHeight() - height - av.getCharHeight(); + if (adjustPanelHeight) + { + // NOTE: this logic is different in the applet. Need a better algorithm to + // define behaviour + // try and set height according to alignment + if (ascaling > 0 && sscaling < 0.5) + { + // if the alignment is too big then + // default is 0.5 split + height = alignFrame.getHeight() / 2; + } + else + { + // if space for more than one sequence row left when annotation is fully + // displayed then set height to annotation height + // otherwise, leave at least two lines of sequence shown. + height = (rheight > av.getCharHeight()) ? height + : (-av.getCharHeight() * 3 + (int) (alignFrame.getHeight() * (1 - sscaling))); + } } - if (!adjustPanelHeight) + else { // maintain same window layout whilst updating sliders - height=annotationScroller.getSize().height; + height = annotationScroller.getSize().height; } hscroll.addNotify(); - + annotationScroller.setPreferredSize(new Dimension(annotationScroller .getWidth(), height)); @@ -525,10 +582,11 @@ public class AlignmentPanel extends GAlignmentPanel implements /** * Adjust row/column scrollers to show a visible position in the alignment. * - * @param x visible column to scroll to - * DOCUMENT ME! - * @param y visible row to scroll to - * + * @param x + * visible column to scroll to DOCUMENT ME! + * @param y + * visible row to scroll to + * */ public void setScrollValues(int x, int y) { @@ -669,7 +727,7 @@ public class AlignmentPanel extends GAlignmentPanel implements seqPanel.seqCanvas.fastPaint(scrollX, scrollY); scalePanel.repaint(); - if (av.getShowAnnotation()) + if (av.getShowAnnotation() && scrollX != 0) { annotationPanel.fastPaint(scrollX); } @@ -677,8 +735,17 @@ public class AlignmentPanel extends GAlignmentPanel implements } } + /** + * Repaint the alignment including the annotations and overview panels (if + * shown). + */ public void paintAlignment(boolean updateOverview) { + final AnnotationSorter sorter = new AnnotationSorter(getAlignment(), + av.isShowAutocalculatedAbove()); + sorter.sort(getAlignment() + .getAlignmentAnnotation(), + av.getSortAnnotationsBy()); repaint(); if (updateOverview) @@ -788,7 +855,7 @@ public class AlignmentPanel extends GAlignmentPanel implements public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException { - int idWidth = getVisibleIdWidth(); + int idWidth = getVisibleIdWidth(false); FontMetrics fm = getFontMetrics(av.getFont()); int scaleHeight = av.charHeight + fm.getDescent(); @@ -800,7 +867,7 @@ public class AlignmentPanel extends GAlignmentPanel implements // / How many sequences and residues can we fit on a printable page? int totalRes = (pwidth - idWidth) / av.getCharWidth(); - int totalSeq = (int) ((pheight - scaleHeight) / av.getCharHeight()) - 1; + int totalSeq = (pheight - scaleHeight) / av.getCharHeight() - 1; int pagesWide = (av.getAlignment().getWidth() / totalRes) + 1; @@ -835,7 +902,8 @@ public class AlignmentPanel extends GAlignmentPanel implements endSeq = av.getAlignment().getHeight(); } - int pagesHigh = ((av.getAlignment().getHeight() / totalSeq) + 1) * pheight; + int pagesHigh = ((av.getAlignment().getHeight() / totalSeq) + 1) + * pheight; if (av.showAnnotation) { @@ -908,10 +976,15 @@ public class AlignmentPanel extends GAlignmentPanel implements if (av.showAnnotation && (endSeq == av.getAlignment().getHeight())) { + // draw annotation - need to offset for current scroll position + int offset = -alabels.scrollOffset; + pg.translate(0, offset); pg.translate(-idWidth - 3, (endSeq - startSeq) * av.charHeight + 3); - alabels.drawComponent((Graphics2D) pg, idWidth); + alabels.drawComponent(pg, idWidth); pg.translate(idWidth + 3, 0); - annotationPanel.renderer.drawComponent(annotationPanel, av, (Graphics2D) pg, -1, startRes, endRes + 1); + annotationPanel.renderer.drawComponent(annotationPanel, av, + pg, -1, startRes, endRes + 1); + pg.translate(0, -offset); } return Printable.PAGE_EXISTS; @@ -955,7 +1028,7 @@ public class AlignmentPanel extends GAlignmentPanel implements int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap + annotationHeight; - int idWidth = getVisibleIdWidth(); + int idWidth = getVisibleIdWidth(false); int maxwidth = av.getAlignment().getWidth(); if (av.hasHiddenColumns()) @@ -1029,89 +1102,148 @@ public class AlignmentPanel extends GAlignmentPanel implements } } + /** + * get current sequence ID panel width, or nominal value if panel were to be + * displayed using default settings + * + * @return + */ int getVisibleIdWidth() { - return idPanel.getWidth() > 0 ? idPanel.getWidth() - : calculateIdWidth().width + 4; + return getVisibleIdWidth(true); } - void makeAlignmentImage(int type, File file) + /** + * get current sequence ID panel width, or nominal value if panel were to be + * displayed using default settings + * + * @param onscreen + * indicate if the Id width for onscreen or offscreen display should + * be returned + * @return + */ + int getVisibleIdWidth(boolean onscreen) { - int maxwidth = av.getAlignment().getWidth(); - if (av.hasHiddenColumns()) + // see if rendering offscreen - check preferences and calc width accordingly + if (!onscreen && Cache.getDefault("FIGURE_AUTOIDWIDTH", false)) { - maxwidth = av.getColumnSelection().findColumnPosition(maxwidth); + return calculateIdWidth(-1).width + 4; } - - int height = ((av.getAlignment().getHeight() + 1) * av.charHeight) - + scalePanel.getHeight(); - int width = getVisibleIdWidth() + (maxwidth * av.charWidth); - - if (av.getWrapAlignment()) + Integer idwidth = null; + if (onscreen + || (idwidth = Cache.getIntegerProperty("FIGURE_FIXEDIDWIDTH")) == null) { - height = getWrappedHeight(); - if (System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true")) - { - // TODO: JAL-244 - width = alignFrame.getWidth() - vscroll.getPreferredSize().width - - alignFrame.getInsets().left - - alignFrame.getInsets().right; - } - else - { - width = seqPanel.getWidth() + getVisibleIdWidth(); - } - - } - else if (av.getShowAnnotation()) - { - height += annotationPanel.adjustPanelHeight() + 3; + return (idPanel.getWidth() > 0 ? idPanel.getWidth() + : calculateIdWidth().width + 4); } + return idwidth.intValue() + 4; + } + void makeAlignmentImage(jalview.util.ImageMaker.TYPE type, File file) + { + long progress = System.currentTimeMillis(); + boolean headless = (System.getProperty("java.awt.headless") != null && System + .getProperty("java.awt.headless").equals("true")); + if (alignFrame != null && !headless) + { + alignFrame.setProgressBar(MessageManager.formatMessage( + "status.saving_file", + new String[] + { type.getLabel() }), progress); + } try { - - jalview.util.ImageMaker im; - if (type == jalview.util.ImageMaker.PNG) - { - im = new jalview.util.ImageMaker(this, jalview.util.ImageMaker.PNG, - "Create PNG image from alignment", width, height, file, - null); - } - else + int maxwidth = av.getAlignment().getWidth(); + if (av.hasHiddenColumns()) { - im = new jalview.util.ImageMaker(this, jalview.util.ImageMaker.EPS, - "Create EPS file from alignment", width, height, file, - alignFrame.getTitle()); + maxwidth = av.getColumnSelection().findColumnPosition(maxwidth); } + int height = ((av.getAlignment().getHeight() + 1) * av.charHeight) + + scalePanel.getHeight(); + int width = getVisibleIdWidth(false) + (maxwidth * av.charWidth); + if (av.getWrapAlignment()) { - if (im.getGraphics() != null) + height = getWrappedHeight(); + if (headless) + { + // need to obtain default alignment width and then add in any + // additional allowance for id margin + // this duplicates the calculation in getWrappedHeight but adjusts for + // offscreen idWith + width = alignFrame.getWidth() - vscroll.getPreferredSize().width + - alignFrame.getInsets().left + - alignFrame.getInsets().right - getVisibleIdWidth() + + getVisibleIdWidth(false); + } + else { - printWrappedAlignment(im.getGraphics(), width, height, 0); - im.writeImage(); + width = seqPanel.getWidth() + getVisibleIdWidth(false); } + } - else + else if (av.getShowAnnotation()) { - if (im.getGraphics() != null) + height += annotationPanel.adjustPanelHeight() + 3; + } + + try + { + + jalview.util.ImageMaker im; + final String imageAction, imageTitle; + if (type == jalview.util.ImageMaker.TYPE.PNG) + { + imageAction = "Create PNG image from alignment"; + imageTitle = null; + } + else if (type == jalview.util.ImageMaker.TYPE.EPS) { - printUnwrapped(im.getGraphics(), width, height, 0); - im.writeImage(); + imageAction = "Create EPS file from alignment"; + imageTitle = alignFrame.getTitle(); } + else + { + imageAction = "Create SVG file from alignment"; + imageTitle = alignFrame.getTitle(); + } + + im = new jalview.util.ImageMaker(this, type, imageAction, width, + height, file, imageTitle); + if (av.getWrapAlignment()) + { + if (im.getGraphics() != null) + { + printWrappedAlignment(im.getGraphics(), width, height, 0); + im.writeImage(); + } + } + else + { + if (im.getGraphics() != null) + { + printUnwrapped(im.getGraphics(), width, height, 0); + im.writeImage(); + } + } + } catch (OutOfMemoryError err) + { + // Be noisy here. + System.out.println("########################\n" + "OUT OF MEMORY " + + file + "\n" + "########################"); + new OOMWarning("Creating Image for " + file, err); + // System.out.println("Create IMAGE: " + err); + } catch (Exception ex) + { + ex.printStackTrace(); } - } catch (OutOfMemoryError err) - { - // Be noisy here. - System.out.println("########################\n" + "OUT OF MEMORY " - + file + "\n" + "########################"); - new OOMWarning("Creating Image for " + file, err); - // System.out.println("Create IMAGE: " + err); - } catch (Exception ex) + } finally { - ex.printStackTrace(); + if (alignFrame != null && !headless) + { + alignFrame.setProgressBar(MessageManager.getString("status.export_complete"), progress); + } } } @@ -1120,7 +1252,7 @@ public class AlignmentPanel extends GAlignmentPanel implements */ public void makeEPS(File epsFile) { - makeAlignmentImage(jalview.util.ImageMaker.EPS, epsFile); + makeAlignmentImage(jalview.util.ImageMaker.TYPE.EPS, epsFile); } /** @@ -1128,14 +1260,18 @@ public class AlignmentPanel extends GAlignmentPanel implements */ public void makePNG(File pngFile) { - makeAlignmentImage(jalview.util.ImageMaker.PNG, pngFile); + makeAlignmentImage(jalview.util.ImageMaker.TYPE.PNG, pngFile); } + public void makeSVG(File svgFile) + { + makeAlignmentImage(jalview.util.ImageMaker.TYPE.SVG, svgFile); + } public void makePNGImageMap(File imgMapFile, String imageName) { // /////ONLY WORKS WITH NONE WRAPPED ALIGNMENTS // //////////////////////////////////////////// - int idWidth = getVisibleIdWidth(); + int idWidth = getVisibleIdWidth(false); FontMetrics fm = getFontMetrics(av.getFont()); int scaleHeight = av.charHeight + fm.getDescent(); @@ -1145,8 +1281,8 @@ public class AlignmentPanel extends GAlignmentPanel implements { try { - int s, sSize = av.getAlignment().getHeight(), res, alwidth = av.getAlignment() - .getWidth(), g, gSize, f, fSize, sy; + int s, sSize = av.getAlignment().getHeight(), res, alwidth = av + .getAlignment().getWidth(), g, gSize, f, fSize, sy; StringBuffer text = new StringBuffer(); PrintWriter out = new PrintWriter(new FileWriter(imgMapFile)); out.println(jalview.io.HTMLOutput.getImageMapHTML()); @@ -1324,7 +1460,8 @@ public class AlignmentPanel extends GAlignmentPanel implements PaintRefresher.RemoveComponent(this); if (av != null) { - jalview.structure.StructureSelectionManager ssm = av.getStructureSelectionManager(); + jalview.structure.StructureSelectionManager ssm = av + .getStructureSelectionManager(); ssm.removeStructureViewerListener(seqPanel, null); ssm.removeSelectionListener(seqPanel); av.setAlignment(null); @@ -1344,74 +1481,19 @@ public class AlignmentPanel extends GAlignmentPanel implements */ public void updateAnnotation() { - updateAnnotation(false); + updateAnnotation(false, false); } public void updateAnnotation(boolean applyGlobalSettings) { - // TODO: this should be merged with other annotation update stuff - that - // sits on AlignViewport - boolean updateCalcs = false; - boolean conv = av.isShowGroupConservation(); - boolean cons = av.isShowGroupConsensus(); - boolean showprf = av.isShowSequenceLogo(); - boolean showConsHist = av.isShowConsensusHistogram(); - boolean normLogo = av.isNormaliseSequenceLogo(); - - boolean sortg = true; - - // remove old automatic annotation - // add any new annotation - - Vector gr = av.getAlignment().getGroups(); // OrderedBy(av.getAlignment().getSequencesArray()); - // intersect alignment annotation with alignment groups - - AlignmentAnnotation[] aan = av.getAlignment().getAlignmentAnnotation(); - Hashtable oldrfs = new Hashtable(); - if (aan != null) - { - for (int an = 0; an < aan.length; an++) - { - if (aan[an].autoCalculated && aan[an].groupRef != null) - { - oldrfs.put(aan[an].groupRef, aan[an].groupRef); - av.getAlignment().deleteAnnotation(aan[an]); - aan[an] = null; - } - } - } - SequenceGroup sg; - if (gr != null) - { - for (int g = 0; g < gr.size(); g++) - { - updateCalcs = false; - sg = (SequenceGroup) gr.elementAt(g); - if (applyGlobalSettings || !oldrfs.containsKey(sg)) - { - // set defaults for this group's conservation/consensus - sg.setshowSequenceLogo(showprf); - sg.setShowConsensusHistogram(showConsHist); - sg.setNormaliseSequenceLogo(normLogo); - } - if (conv) - { - updateCalcs = true; - av.getAlignment().addAnnotation(sg.getConservationRow(), 0); - } - if (cons) - { - updateCalcs = true; - av.getAlignment().addAnnotation(sg.getConsensus(), 0); - } - // refresh the annotation rows - if (updateCalcs) - { - sg.recalcConservation(); - } - } - } - oldrfs.clear(); + updateAnnotation(applyGlobalSettings, false); + } + + public void updateAnnotation(boolean applyGlobalSettings, + boolean preserveNewGroupSettings) + { + av.updateGroupAnnotationSettings(applyGlobalSettings, + preserveNewGroupSettings); adjustAnnotationHeight(); } @@ -1421,10 +1503,8 @@ public class AlignmentPanel extends GAlignmentPanel implements return av.getAlignment(); } - /** - * get the name for this view - * @return - */ + + @Override public String getViewName() { return av.viewName; @@ -1432,18 +1512,23 @@ public class AlignmentPanel extends GAlignmentPanel implements /** * Make/Unmake this alignment panel the current input focus + * * @param b */ public void setSelected(boolean b) { - try { + try + { alignFrame.setSelected(b); - } catch (Exception ex) {}; - + } catch (Exception ex) + { + } + ; + if (b) { alignFrame.setDisplayedView(this); - } + } } @Override @@ -1455,6 +1540,25 @@ public class AlignmentPanel extends GAlignmentPanel implements @Override public void raiseOOMWarning(String string, OutOfMemoryError error) { - new OOMWarning(string, error, this); + new OOMWarning(string, error, this); + } + + public FeatureRenderer cloneFeatureRenderer() + { + + return new FeatureRenderer(this); + } + + public void updateFeatureRenderer(FeatureRenderer fr) + { + fr.transferSettings(seqPanel.seqCanvas.getFeatureRenderer()); + } + + public void updateFeatureRendererFrom(FeatureRenderer fr) + { + if (seqPanel.seqCanvas.getFeatureRenderer() != null) + { + seqPanel.seqCanvas.getFeatureRenderer().transferSettings(fr); + } } }