X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=e1b5abb3c2e6571347faec893b4acb813d0d058f;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=59d7b97b137954cc055126aace22ac9f9f447169;hpb=8fc51088adad6a0d5a66acf1747d0257380429c3;p=jalview.git
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
old mode 100755
new mode 100644
index 59d7b97..e1b5abb
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1,46 +1,66 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, 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.structure.SelectionSource;
+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!
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.161 $
*/
public class AlignmentPanel extends GAlignmentPanel implements
- AdjustmentListener, Printable
+ AdjustmentListener, Printable, AlignmentViewPanel
{
public AlignViewport av;
@@ -172,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;
@@ -219,14 +255,13 @@ 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);
}
/**
- * DOCUMENT ME!
+ * Highlight the given results on the alignment.
*
- * @param results
- * DOCUMENT ME!
*/
public void highlightSearchResults(SearchResults results)
{
@@ -263,27 +298,24 @@ public class AlignmentPanel extends GAlignmentPanel implements
// do we need to scroll the panel?
// TODO: tons of nullpointereexceptions raised here.
if (results != null && results.getSize() > 0 && av != null
- && av.alignment != null)
+ && av.getAlignment() != null)
{
- int seqIndex = av.alignment.findIndex(results);
+ int seqIndex = av.getAlignment().findIndex(results);
if (seqIndex == -1)
{
return false;
}
- SequenceI seq = av.alignment.getSequenceAt(seqIndex);
+ SequenceI seq = av.getAlignment().getSequenceAt(seqIndex);
- int[] r = results.getResults(seq, 0, av.alignment.getWidth()); // results.getResults(seq,
- // seq.getStart(),
- // seq.getEnd());
- // TODO: VAMSAS: fix hidden column issue where scroll to left from C
- // terminus is not visible
+ int[] r = results.getResults(seq, 0, av.getAlignment().getWidth());
if (r == null)
{
return false;
}
int start = r[0];
int end = r[1];
- // System.err.println("Seq : "+seqIndex+" Scroll to "+start+","+end); // DEBUG
+ // System.err.println("Seq : "+seqIndex+" Scroll to "+start+","+end); //
+ // DEBUG
if (start < 0)
{
return false;
@@ -292,6 +324,19 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
return false;
}
+ if (av.hasHiddenColumns())
+ {
+ start = av.getColumnSelection().findColumnPosition(start);
+ end = av.getColumnSelection().findColumnPosition(end);
+ if (start == end)
+ {
+ if (!av.getColumnSelection().isVisible(r[0]))
+ {
+ // don't scroll - position isn't visible
+ return false;
+ }
+ }
+ }
if (!av.wrapAlignment)
{
if ((startv = av.getStartRes()) >= start)
@@ -316,11 +361,11 @@ public class AlignmentPanel extends GAlignmentPanel implements
scrollToWrappedVisible(start);
}
}
- if (!redrawOverview && overviewPanel != null)
+ if (redrawOverview && overviewPanel != null)
{
overviewPanel.setBoxPosition();
}
- paintAlignment(!redrawOverview);
+ paintAlignment(redrawOverview);
return true;
}
@@ -358,10 +403,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
}
/**
- * DOCUMENT ME!
*
* @param b
- * DOCUMENT ME!
+ * Hide or show annotation panel
+ *
*/
public void setAnnotationVisible(boolean b)
{
@@ -373,6 +418,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
repaint();
}
+ /**
+ * automatically adjust annotation panel height for new annotation whilst
+ * ensuring the alignment is still visible.
+ */
public void adjustAnnotationHeight()
{
// TODO: display vertical annotation scrollbar if necessary
@@ -381,18 +430,50 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
System.out.println("NEEDS FIXING");
}
+ validateAnnotationDimensions(true);
+ addNotify();
+ paintAlignment(true);
+ }
+ /**
+ * calculate the annotation dimensions and refresh slider values accordingly.
+ * need to do repaints/notifys afterwards.
+ */
+ protected void validateAnnotationDimensions(boolean adjustPanelHeight)
+ {
int height = annotationPanel.adjustPanelHeight();
- if (hscroll.isVisible())
+ 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)
{
- height += hscroll.getPreferredSize().height;
+ // 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 (height > alignFrame.getHeight() / 2)
+ else
{
- height = alignFrame.getHeight() / 2;
+ // maintain same window layout whilst updating sliders
+ height = annotationScroller.getSize().height;
}
-
hscroll.addNotify();
annotationScroller.setPreferredSize(new Dimension(annotationScroller
@@ -401,8 +482,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
annotationSpaceFillerHolder.setPreferredSize(new Dimension(
annotationSpaceFillerHolder.getWidth(), height));
annotationScroller.validate();// repaint();
- addNotify();
- repaint();
+ annotationScroller.addNotify();
}
/**
@@ -500,24 +580,25 @@ public class AlignmentPanel extends GAlignmentPanel implements
}
/**
- * DOCUMENT ME!
+ * Adjust row/column scrollers to show a visible position in the alignment.
*
* @param x
- * DOCUMENT ME!
+ * visible column to scroll to DOCUMENT ME!
* @param y
- * DOCUMENT ME!
+ * visible row to scroll to
+ *
*/
public void setScrollValues(int x, int y)
{
// System.err.println("Scroll to "+x+","+y);
- if (av == null || av.alignment == null)
+ if (av == null || av.getAlignment() == null)
{
return;
}
- int width = av.alignment.getWidth();
- int height = av.alignment.getHeight();
+ int width = av.getAlignment().getWidth();
+ int height = av.getAlignment().getHeight();
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
width = av.getColumnSelection().findColumnPosition(width);
}
@@ -577,9 +658,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
int x = hscroll.getValue();
av.setStartRes(x);
- av
- .setEndRes((x + (seqPanel.seqCanvas.getWidth() / av
- .getCharWidth())) - 1);
+ av.setEndRes((x + (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - 1);
}
if (evt.getSource() == vscroll)
@@ -648,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);
}
@@ -656,14 +735,22 @@ 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)
{
- jalview.structure.StructureSelectionManager
- .getStructureSelectionManager().sequenceColoursChanged(this);
+ av.getStructureSelectionManager().sequenceColoursChanged(this);
if (overviewPanel != null)
{
@@ -689,9 +776,9 @@ public class AlignmentPanel extends GAlignmentPanel implements
if (av.getWrapAlignment())
{
- int maxwidth = av.alignment.getWidth();
+ int maxwidth = av.getAlignment().getWidth();
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
}
@@ -768,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();
@@ -780,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;
@@ -815,7 +902,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
endSeq = av.getAlignment().getHeight();
}
- int pagesHigh = ((av.alignment.getHeight() / totalSeq) + 1) * pheight;
+ int pagesHigh = ((av.getAlignment().getHeight() / totalSeq) + 1)
+ * pheight;
if (av.showAnnotation)
{
@@ -859,8 +947,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
}
pg.setColor(currentColor);
- pg.fillRect(0, (i - startSeq) * av.charHeight, idWidth, av
- .getCharHeight());
+ pg.fillRect(0, (i - startSeq) * av.charHeight, idWidth,
+ av.getCharHeight());
pg.setColor(currentTextColor);
@@ -873,7 +961,9 @@ public class AlignmentPanel extends GAlignmentPanel implements
- 4;
}
- pg.drawString(seq.getDisplayId(av.getShowJVSuffix()), xPos,
+ pg.drawString(
+ seq.getDisplayId(av.getShowJVSuffix()),
+ xPos,
(((i - startSeq) * av.charHeight) + av.getCharHeight())
- (av.getCharHeight() / 5));
}
@@ -884,12 +974,17 @@ public class AlignmentPanel extends GAlignmentPanel implements
pg.translate(idWidth, 0);
seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq, 0);
- if (av.showAnnotation && (endSeq == av.alignment.getHeight()))
+ 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.drawComponent((Graphics2D) pg, startRes, endRes + 1);
+ annotationPanel.renderer.drawComponent(annotationPanel, av,
+ pg, -1, startRes, endRes + 1);
+ pg.translate(0, -offset);
}
return Printable.PAGE_EXISTS;
@@ -933,10 +1028,10 @@ 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.alignment.getWidth();
- if (av.hasHiddenColumns)
+ int maxwidth = av.getAlignment().getWidth();
+ if (av.hasHiddenColumns())
{
maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
}
@@ -962,10 +1057,10 @@ public class AlignmentPanel extends GAlignmentPanel implements
do
{
- for (int i = 0; i < av.alignment.getHeight(); i++)
+ for (int i = 0; i < av.getAlignment().getHeight(); i++)
{
pg.setFont(idPanel.idCanvas.idfont);
- SequenceI s = av.alignment.getSequenceAt(i);
+ SequenceI s = av.getAlignment().getSequenceAt(i);
String string = s.getDisplayId(av.getShowJVSuffix());
int xPos = 0;
if (av.rightAlignIds)
@@ -1007,88 +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.alignment.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.alignment.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"))
- {
- width = alignFrame.getWidth() - vscroll.getPreferredSize().width
- - alignFrame.getInsets().left
- - alignFrame.getInsets().right;
- }
- else
- {
- width = seqPanel.getWidth() + getVisibleIdWidth();
- }
-
+ return (idPanel.getWidth() > 0 ? idPanel.getWidth()
+ : calculateIdWidth().width + 4);
}
- else if (av.getShowAnnotation())
+ 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)
{
- height += annotationPanel.adjustPanelHeight() + 3;
+ alignFrame.setProgressBar(MessageManager.formatMessage(
+ "status.saving_file",
+ new String[]
+ { type.getLabel() }), progress);
}
-
try
{
-
- jalview.util.ImageMaker im;
- if (type == jalview.util.ImageMaker.PNG)
+ int maxwidth = av.getAlignment().getWidth();
+ if (av.hasHiddenColumns())
{
- im = new jalview.util.ImageMaker(this, jalview.util.ImageMaker.PNG,
- "Create PNG image from alignment", width, height, file,
- null);
- }
- else
- {
- 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)
{
- printWrappedAlignment(im.getGraphics(), width, height, 0);
- im.writeImage();
+ // 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
+ {
+ width = seqPanel.getWidth() + getVisibleIdWidth(false);
+ }
+
}
- else
+ else if (av.getShowAnnotation())
+ {
+ height += annotationPanel.adjustPanelHeight() + 3;
+ }
+
+ try
{
- if (im.getGraphics() != null)
+
+ 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)
+ {
+ imageAction = "Create EPS file from alignment";
+ imageTitle = alignFrame.getTitle();
+ }
+ else
{
- printUnwrapped(im.getGraphics(), width, height, 0);
- im.writeImage();
+ 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)
+ } finally
{
- // 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();
+ if (alignFrame != null && !headless)
+ {
+ alignFrame.setProgressBar(MessageManager.getString("status.export_complete"), progress);
+ }
}
}
@@ -1097,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);
}
/**
@@ -1105,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();
@@ -1122,8 +1281,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
try
{
- int s, sSize = av.alignment.getHeight(), res, alwidth = av.alignment
- .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());
@@ -1135,15 +1294,15 @@ public class AlignmentPanel extends GAlignmentPanel implements
{
sy = s * av.charHeight + scaleHeight;
- SequenceI seq = av.alignment.getSequenceAt(s);
+ SequenceI seq = av.getAlignment().getSequenceAt(s);
SequenceFeature[] features = seq.getDatasetSequence()
.getSequenceFeatures();
- SequenceGroup[] groups = av.alignment.findAllGroups(seq);
+ SequenceGroup[] groups = av.getAlignment().findAllGroups(seq);
for (res = 0; res < alwidth; res++)
{
text = new StringBuffer();
Object obj = null;
- if (av.alignment.isNucleotide())
+ if (av.getAlignment().isNucleotide())
{
obj = ResidueProperties.nucleotideName.get(seq.getCharAt(res)
+ "");
@@ -1279,8 +1438,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
int cHeight = av.getAlignment().getHeight() * av.charHeight + hgap
+ annotationHeight;
- int maxwidth = av.alignment.getWidth();
- if (av.hasHiddenColumns)
+ int maxwidth = av.getAlignment().getWidth();
+ if (av.hasHiddenColumns())
{
maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
}
@@ -1296,16 +1455,16 @@ public class AlignmentPanel extends GAlignmentPanel implements
*/
public void closePanel()
{
- jalview.structure.StructureSelectionManager ssm = jalview.structure.StructureSelectionManager
- .getStructureSelectionManager();
- ssm.removeStructureViewerListener(seqPanel, null);
- ssm.removeSelectionListener(seqPanel);
PaintRefresher.RemoveComponent(seqPanel.seqCanvas);
PaintRefresher.RemoveComponent(idPanel.idCanvas);
PaintRefresher.RemoveComponent(this);
if (av != null)
{
- av.alignment = null;
+ jalview.structure.StructureSelectionManager ssm = av
+ .getStructureSelectionManager();
+ ssm.removeStructureViewerListener(seqPanel, null);
+ ssm.removeSelectionListener(seqPanel);
+ av.setAlignment(null);
av = null;
}
else
@@ -1322,64 +1481,84 @@ public class AlignmentPanel extends GAlignmentPanel implements
*/
public void updateAnnotation()
{
- updateAnnotation(false);
+ updateAnnotation(false, false);
}
public void updateAnnotation(boolean applyGlobalSettings)
{
- boolean updateCalcs = false;
- boolean conv = av.isShowGroupConservation();
- boolean cons = av.isShowGroupConsensus();
- boolean showprf = av.isShowSequenceLogo();
- boolean showConsHist = av.isShowConsensusHistogram();
+ updateAnnotation(applyGlobalSettings, false);
+ }
+
+ public void updateAnnotation(boolean applyGlobalSettings,
+ boolean preserveNewGroupSettings)
+ {
+ av.updateGroupAnnotationSettings(applyGlobalSettings,
+ preserveNewGroupSettings);
+ adjustAnnotationHeight();
+ }
+
+ @Override
+ public AlignmentI getAlignment()
+ {
+ return av.getAlignment();
+ }
- boolean sortg = true;
- // remove old automatic annotation
- // add any new annotation
+ @Override
+ public String getViewName()
+ {
+ return av.viewName;
+ }
- Vector gr = av.alignment.getGroups(); // OrderedBy(av.alignment.getSequencesArray());
- // intersect alignment annotation with alignment groups
+ /**
+ * Make/Unmake this alignment panel the current input focus
+ *
+ * @param b
+ */
+ public void setSelected(boolean b)
+ {
+ try
+ {
+ alignFrame.setSelected(b);
+ } catch (Exception ex)
+ {
+ }
+ ;
- AlignmentAnnotation[] aan = av.alignment.getAlignmentAnnotation();
- Hashtable oldrfs = new Hashtable();
- for (int an = 0; an < aan.length; an++)
+ if (b)
{
- if (aan[an].autoCalculated && aan[an].groupRef != null)
- {
- oldrfs.put(aan[an].groupRef, aan[an].groupRef);
- av.alignment.deleteAnnotation(aan[an]);
- aan[an] = null;
- }
+ alignFrame.setDisplayedView(this);
}
- SequenceGroup sg;
- for (int g = 0; g < gr.size(); g++)
+ }
+
+ @Override
+ public StructureSelectionManager getStructureSelectionManager()
+ {
+ return av.getStructureSelectionManager();
+ }
+
+ @Override
+ public void raiseOOMWarning(String string, OutOfMemoryError error)
+ {
+ 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)
{
- updateCalcs = false;
- sg = (SequenceGroup) gr.elementAt(g);
- if (applyGlobalSettings || !oldrfs.containsKey(sg))
- {
- // set defaults for this group's conservation/consensus
- sg.setIncludeAllConsSymbols(showprf);
- sg.setShowConsensusHistogram(showConsHist);
- }
- if (conv)
- {
- updateCalcs = true;
- av.alignment.addAnnotation(sg.getConservationRow(), 0);
- }
- if (cons)
- {
- updateCalcs = true;
- av.alignment.addAnnotation(sg.getConsensus(), 0);
- }
- // refresh the annotation rows
- if (updateCalcs)
- {
- sg.recalcConservation();
- }
+ seqPanel.seqCanvas.getFeatureRenderer().transferSettings(fr);
}
- oldrfs.clear();
- adjustAnnotationHeight();
}
}