X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=e4a4c906af87e827554036a375df8868630d117f;hb=cca50cb3aee94f3ed1a5e504d45b8d8b665f8c5b;hp=95b4220fa53ee60410c2b3d23f2a80f20ac046dd;hpb=8dd1cd955b1c6f1a89afc2068ab1cdfca3824934;p=jalview.git
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
old mode 100755
new mode 100644
index 95b4220..e4a4c90
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1,88 +1,124 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
- *
- * This program 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.
- *
+ *
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * 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.awt.*;
-import java.awt.event.*;
-import java.awt.print.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
+import jalview.analysis.AnnotationSorter;
+import jalview.api.AlignmentViewPanel;
+import jalview.bin.Cache;
+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.math.AlignmentDimension;
+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
+public class AlignmentPanel extends GAlignmentPanel implements
+ AdjustmentListener, Printable, AlignmentViewPanel
{
public AlignViewport av;
+
OverviewPanel overviewPanel;
- SeqPanel seqPanel;
- IdPanel idPanel;
+
+ private SeqPanel seqPanel;
+
+ private IdPanel idPanel;
+
+ private boolean headless;
IdwidthAdjuster idwidthAdjuster;
/** DOCUMENT ME!! */
public AlignFrame alignFrame;
- ScalePanel scalePanel;
- AnnotationPanel annotationPanel;
- AnnotationLabels alabels;
+
+ private ScalePanel scalePanel;
+
+ private AnnotationPanel annotationPanel;
+
+ private AnnotationLabels alabels;
// this value is set false when selection area being dragged
boolean fastPaint = true;
+
int hextent = 0;
+
int vextent = 0;
/**
* Creates a new AlignmentPanel object.
- *
- * @param af DOCUMENT ME!
- * @param av DOCUMENT ME!
+ *
+ * @param af
+ * DOCUMENT ME!
+ * @param av
+ * DOCUMENT ME!
*/
public AlignmentPanel(AlignFrame af, final AlignViewport av)
{
alignFrame = af;
this.av = av;
- seqPanel = new SeqPanel(av, this);
- idPanel = new IdPanel(av, this);
+ setSeqPanel(new SeqPanel(av, this));
+ setIdPanel(new IdPanel(av, this));
- scalePanel = new ScalePanel(av, this);
+ setScalePanel(new ScalePanel(av, this));
- idPanelHolder.add(idPanel, BorderLayout.CENTER);
+ idPanelHolder.add(getIdPanel(), BorderLayout.CENTER);
idwidthAdjuster = new IdwidthAdjuster(this);
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
- annotationPanel = new AnnotationPanel(this);
- alabels = new AnnotationLabels(this);
+ setAnnotationPanel(new AnnotationPanel(this));
+ setAlabels(new AnnotationLabels(this));
- annotationScroller.setViewportView(annotationPanel);
- annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);
+ annotationScroller.setViewportView(getAnnotationPanel());
+ annotationSpaceFillerHolder.add(getAlabels(), BorderLayout.CENTER);
- scalePanelHolder.add(scalePanel, BorderLayout.CENTER);
- seqPanelHolder.add(seqPanel, BorderLayout.CENTER);
+ scalePanelHolder.add(getScalePanel(), BorderLayout.CENTER);
+ seqPanelHolder.add(getSeqPanel(), BorderLayout.CENTER);
setScrollValues(0, 0);
@@ -98,15 +134,11 @@ public class AlignmentPanel
{
if (evt.getPropertyName().equals("alignment"))
{
- PaintRefresher.Refresh(ap,
- av.getSequenceSetId(),
- true,
- true);
+ PaintRefresher.Refresh(ap, av.getSequenceSetId(), true, true);
alignmentChanged();
}
}
});
-
fontChanged();
adjustAnnotationHeight();
@@ -131,18 +163,18 @@ public class AlignmentPanel
// to prevent drawing old image
FontMetrics fm = getFontMetrics(av.getFont());
- scalePanelHolder.setPreferredSize(new Dimension(10,
- av.charHeight + fm.getDescent()));
- idSpaceFillerPanel1.setPreferredSize(new Dimension(10,
- av.charHeight + fm.getDescent()));
+ scalePanelHolder.setPreferredSize(new Dimension(10, av.charHeight
+ + fm.getDescent()));
+ idSpaceFillerPanel1.setPreferredSize(new Dimension(10, av.charHeight
+ + fm.getDescent()));
- idPanel.idCanvas.gg = null;
- seqPanel.seqCanvas.img = null;
- annotationPanel.adjustPanelHeight();
+ getIdPanel().getIdCanvas().gg = null;
+ getSeqPanel().seqCanvas.img = null;
+ getAnnotationPanel().adjustPanelHeight();
Dimension d = calculateIdWidth();
d.setSize(d.width + 4, d.height);
- idPanel.idCanvas.setPreferredSize(d);
+ getIdPanel().getIdCanvas().setPreferredSize(d);
hscrollFillerPanel.setPreferredSize(d);
if (overviewPanel != null)
@@ -154,25 +186,44 @@ public class AlignmentPanel
}
/**
- * Calculate the width of the alignment labels based on the displayed names and any bounds on label width set in preferences.
- *
- * @return Dimension giving the maximum width of the alignment label panel that should be used.
+ * Calculate the width of the alignment labels based on the displayed names
+ * and any bounds on label width set in preferences.
+ *
+ * @return Dimension giving the maximum width of the alignment label panel
+ * that should be used.
*/
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()));
+ 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;
- while ( (i < al.getHeight()) && (al.getSequenceAt(i) != null))
+ while ((i < al.getHeight()) && (al.getSequenceAt(i) != null))
{
SequenceI s = al.getSequenceAt(i);
@@ -191,7 +242,7 @@ public class AlignmentPanel
if (al.getAlignmentAnnotation() != null)
{
- fm = c.getFontMetrics(alabels.getFont());
+ fm = c.getFontMetrics(getAlabels().getFont());
while (i < al.getAlignmentAnnotation().length)
{
@@ -206,32 +257,105 @@ public class AlignmentPanel
}
}
- return new Dimension(Math.min(maxwidth, idWidth), 12);
+ return new Dimension(maxwidth < 0 ? idWidth : Math.min(maxwidth,
+ idWidth), 12);
}
/**
- * DOCUMENT ME!
- *
- * @param results DOCUMENT ME!
+ * Highlight the given results on the alignment.
+ *
*/
public void highlightSearchResults(SearchResults results)
{
- seqPanel.seqCanvas.highlightSearchResults(results);
+ scrollToPosition(results);
+ getSeqPanel().seqCanvas.highlightSearchResults(results);
+ }
+ /**
+ * scroll the view to show the position of the highlighted region in results
+ * (if any) and redraw the overview
+ *
+ * @param results
+ */
+ public boolean scrollToPosition(SearchResults results)
+ {
+ return scrollToPosition(results, true);
+ }
+
+ /**
+ * scroll the view to show the position of the highlighted region in results
+ * (if any)
+ *
+ * @param results
+ * @param redrawOverview
+ * - when set, the overview will be recalculated (takes longer)
+ * @return false if results were not found
+ */
+ public boolean scrollToPosition(SearchResults results,
+ boolean redrawOverview)
+ {
+ int startv, endv, starts, ends, width;
+ // TODO: properly locate search results in view when large numbers of hidden
+ // columns exist before highlighted region
// do we need to scroll the panel?
- if (results != null)
+ // TODO: tons of nullpointereexceptions raised here.
+ if (results != null && results.getSize() > 0 && av != null
+ && av.getAlignment() != null)
{
- 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;
+ int seqIndex = av.getAlignment().findIndex(results);
+ if (seqIndex == -1)
+ {
+ return false;
+ }
+ SequenceI seq = av.getAlignment().getSequenceAt(seqIndex);
+ 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
+ if (start < 0)
+ {
+ return false;
+ }
+ if (end == seq.getEnd())
+ {
+ 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 ( (av.getStartRes() > end) || (av.getEndRes() < start) ||
- ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+ if ((startv = av.getStartRes()) >= start)
{
- setScrollValues(start, seqIndex);
+ setScrollValues(start - 1, seqIndex);
+ }
+ else if ((endv = av.getEndRes()) <= end)
+ {
+ setScrollValues(startv + 1 + end - endv, seqIndex);
+ }
+ else if ((starts = av.getStartSeq()) > seqIndex)
+ {
+ setScrollValues(av.getStartRes(), seqIndex);
+ }
+ else if ((ends = av.getEndSeq()) <= seqIndex)
+ {
+ setScrollValues(av.getStartRes(), starts + seqIndex - ends + 1);
}
}
else
@@ -239,24 +363,29 @@ public class AlignmentPanel
scrollToWrappedVisible(start);
}
}
-
- paintAlignment(true);
+ if (redrawOverview && overviewPanel != null)
+ {
+ overviewPanel.setBoxPosition();
+ }
+ paintAlignment(redrawOverview);
+ return true;
}
void scrollToWrappedVisible(int res)
{
- int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.
- getWidth());
- if (res <= av.getStartRes() || res >= (av.getStartRes() + cwidth))
+ int cwidth = getSeqPanel().seqCanvas
+ .getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
+ if (res < av.getStartRes() || res >= (av.getStartRes() + cwidth))
{
- vscroll.setValue(res / cwidth);
+ vscroll.setValue((res / cwidth));
av.startRes = vscroll.getValue() * cwidth;
}
+
}
/**
* DOCUMENT ME!
- *
+ *
* @return DOCUMENT ME!
*/
public OverviewPanel getOverviewPanel()
@@ -266,8 +395,9 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param op DOCUMENT ME!
+ *
+ * @param op
+ * DOCUMENT ME!
*/
public void setOverviewPanel(OverviewPanel op)
{
@@ -275,9 +405,10 @@ public class AlignmentPanel
}
/**
- * DOCUMENT ME!
- *
- * @param b DOCUMENT ME!
+ *
+ * @param b
+ * Hide or show annotation panel
+ *
*/
public void setAnnotationVisible(boolean b)
{
@@ -289,43 +420,78 @@ public class AlignmentPanel
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
+ // TODO: display vertical annotation scrollbar if necessary
// this is called after loading new annotation onto alignment
if (alignFrame.getHeight() == 0)
{
System.out.println("NEEDS FIXING");
}
+ validateAnnotationDimensions(true);
+ addNotify();
+ paintAlignment(true);
+ }
- int height = annotationPanel.adjustPanelHeight();
-
- if (hscroll.isVisible())
+ /**
+ * calculate the annotation dimensions and refresh slider values accordingly.
+ * need to do repaints/notifys afterwards.
+ */
+ protected void validateAnnotationDimensions(boolean adjustPanelHeight)
+ {
+ int height = getAnnotationPanel().adjustPanelHeight();
+
+ 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.getWidth(), height));
-
+ annotationScroller.setPreferredSize(new Dimension(annotationScroller
+ .getWidth(), height));
annotationSpaceFillerHolder.setPreferredSize(new Dimension(
- annotationSpaceFillerHolder.getWidth(),
- height));
+ annotationSpaceFillerHolder.getWidth(), height));
annotationScroller.validate();// repaint();
- repaint();
+ annotationScroller.addNotify();
}
/**
* DOCUMENT ME!
- *
- * @param wrap DOCUMENT ME!
+ *
+ * @param wrap
+ * DOCUMENT ME!
*/
public void setWrapAlignment(boolean wrap)
{
@@ -339,7 +505,7 @@ public class AlignmentPanel
annotationScroller.setVisible(false);
annotationSpaceFillerHolder.setVisible(false);
}
- else if (av.showAnnotation)
+ else if (av.isShowAnnotation())
{
annotationScroller.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
@@ -365,7 +531,7 @@ public class AlignmentPanel
}
else
{
- if ( (vextent + vscroll.getValue()) >= av.getAlignment().getHeight())
+ if ((vextent + vscroll.getValue()) >= av.getAlignment().getHeight())
{
return false;
}
@@ -381,9 +547,10 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param right DOCUMENT ME!
- *
+ *
+ * @param right
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
*/
public boolean scrollRight(boolean right)
@@ -400,7 +567,7 @@ public class AlignmentPanel
}
else
{
- if ( (hextent + hscroll.getValue()) >= av.getAlignment().getWidth())
+ if ((hextent + hscroll.getValue()) >= av.getAlignment().getWidth())
{
return false;
}
@@ -415,26 +582,33 @@ public class AlignmentPanel
}
/**
- * DOCUMENT ME!
- *
- * @param x DOCUMENT ME!
- * @param y DOCUMENT ME!
+ * 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
+ *
*/
public void setScrollValues(int x, int y)
{
+ // System.err.println("Scroll to "+x+","+y);
+ if (av == null || av.getAlignment() == null)
+ {
+ return;
+ }
+ int width = av.getAlignment().getWidth();
+ int height = av.getAlignment().getHeight();
- int width = av.alignment.getWidth();
- int height = av.alignment.getHeight();
-
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
width = av.getColumnSelection().findColumnPosition(width);
}
- av.setEndRes( (x + (seqPanel.seqCanvas.getWidth() / av.charWidth)) - 1);
+ av.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av.charWidth)) - 1);
- hextent = seqPanel.seqCanvas.getWidth() / av.charWidth;
- vextent = seqPanel.seqCanvas.getHeight() / av.charHeight;
+ hextent = getSeqPanel().seqCanvas.getWidth() / av.charWidth;
+ vextent = getSeqPanel().seqCanvas.getHeight() / av.charHeight;
if (hextent > width)
{
@@ -446,12 +620,12 @@ public class AlignmentPanel
vextent = height;
}
- if ( (hextent + x) > width)
+ if ((hextent + x) > width)
{
x = width - hextent;
}
- if ( (vextent + y) > height)
+ if ((vextent + y) > height)
{
y = height - vextent;
}
@@ -472,8 +646,9 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param evt DOCUMENT ME!
+ *
+ * @param evt
+ * DOCUMENT ME!
*/
public void adjustmentValueChanged(AdjustmentEvent evt)
{
@@ -485,8 +660,7 @@ public class AlignmentPanel
{
int x = hscroll.getValue();
av.setStartRes(x);
- av.setEndRes( (x +
- (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - 1);
+ av.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av.getCharWidth())) - 1);
}
if (evt.getSource() == vscroll)
@@ -497,16 +671,16 @@ public class AlignmentPanel
{
if (offy > -1)
{
- int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
- seqCanvas.getWidth());
+ int rowSize = getSeqPanel().seqCanvas
+ .getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
av.setStartRes(offy * rowSize);
- av.setEndRes( (offy + 1) * rowSize);
+ av.setEndRes((offy + 1) * rowSize);
}
else
{
- //This is only called if file loaded is a jar file that
- //was wrapped when saved and user has wrap alignment true
- //as preference setting
+ // This is only called if file loaded is a jar file that
+ // was wrapped when saved and user has wrap alignment true
+ // as preference setting
SwingUtilities.invokeLater(new Runnable()
{
public void run()
@@ -519,8 +693,8 @@ public class AlignmentPanel
else
{
av.setStartSeq(offy);
- av.setEndSeq(offy +
- (seqPanel.seqCanvas.getHeight() / av.getCharHeight()));
+ av.setEndSeq(offy
+ + (getSeqPanel().seqCanvas.getHeight() / av.getCharHeight()));
}
}
@@ -551,27 +725,34 @@ public class AlignmentPanel
if (scrollX != 0 || scrollY != 0)
{
- idPanel.idCanvas.fastPaint(scrollY);
- seqPanel.seqCanvas.fastPaint(scrollX,
- scrollY);
- scalePanel.repaint();
+ getIdPanel().getIdCanvas().fastPaint(scrollY);
+ getSeqPanel().seqCanvas.fastPaint(scrollX, scrollY);
+ getScalePanel().repaint();
- if (av.getShowAnnotation())
+ if (av.getShowAnnotation() && scrollX != 0)
{
- annotationPanel.fastPaint(scrollX);
+ getAnnotationPanel().fastPaint(scrollX);
}
}
}
}
+ /**
+ * 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)
+ if (updateOverview)
{
- jalview.structure.StructureSelectionManager.getStructureSelectionManager()
- .sequenceColoursChanged(this);
+ av.getStructureSelectionManager().sequenceColoursChanged(this);
if (overviewPanel != null)
{
@@ -582,35 +763,36 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param g DOCUMENT ME!
+ *
+ * @param g
+ * DOCUMENT ME!
*/
public void paintComponent(Graphics g)
{
invalidate();
- Dimension d = idPanel.idCanvas.getPreferredSize();
+ Dimension d = getIdPanel().getIdCanvas().getPreferredSize();
idPanelHolder.setPreferredSize(d);
hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));
validate();
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;
}
- int canvasWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
- seqCanvas.getWidth());
+ int canvasWidth = getSeqPanel().seqCanvas
+ .getWrappedCanvasWidth(getSeqPanel().seqCanvas.getWidth());
if (canvasWidth > 0)
{
- int max = maxwidth /
- seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.
- getWidth()) +
- 1;
+ int max = maxwidth
+ / getSeqPanel().seqCanvas
+ .getWrappedCanvasWidth(getSeqPanel().seqCanvas
+ .getWidth()) + 1;
vscroll.setMaximum(max);
vscroll.setUnitIncrement(1);
vscroll.setVisibleAmount(1);
@@ -624,19 +806,23 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param pg DOCUMENT ME!
- * @param pf DOCUMENT ME!
- * @param pi DOCUMENT ME!
- *
+ *
+ * @param pg
+ * DOCUMENT ME!
+ * @param pf
+ * DOCUMENT ME!
+ * @param pi
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
- *
- * @throws PrinterException DOCUMENT ME!
+ *
+ * @throws PrinterException
+ * DOCUMENT ME!
*/
public int print(Graphics pg, PageFormat pf, int pi)
- throws PrinterException
+ throws PrinterException
{
- pg.translate( (int) pf.getImageableX(), (int) pf.getImageableY());
+ pg.translate((int) pf.getImageableX(), (int) pf.getImageableY());
int pwidth = (int) pf.getImageableWidth();
int pheight = (int) pf.getImageableHeight();
@@ -653,20 +839,25 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param pg DOCUMENT ME!
- * @param pwidth DOCUMENT ME!
- * @param pheight DOCUMENT ME!
- * @param pi DOCUMENT ME!
- *
+ *
+ * @param pg
+ * DOCUMENT ME!
+ * @param pwidth
+ * DOCUMENT ME!
+ * @param pheight
+ * DOCUMENT ME!
+ * @param pi
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
- *
- * @throws PrinterException DOCUMENT ME!
+ *
+ * @throws PrinterException
+ * DOCUMENT ME!
*/
public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi)
- throws PrinterException
+ throws PrinterException
{
- int idWidth = getVisibleIdWidth();
+ int idWidth = getVisibleIdWidth(false);
FontMetrics fm = getFontMetrics(av.getFont());
int scaleHeight = av.charHeight + fm.getDescent();
@@ -674,29 +865,28 @@ public class AlignmentPanel
pg.fillRect(0, 0, pwidth, pheight);
pg.setFont(av.getFont());
- ////////////////////////////////////
- /// How many sequences and residues can we fit on a printable page?
+ // //////////////////////////////////
+ // / 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;
- /////////////////////////////
- /// Only print these sequences and residues on this page
+ // ///////////////////////////
+ // / Only print these sequences and residues on this page
int startRes;
- /////////////////////////////
- /// Only print these sequences and residues on this page
+ // ///////////////////////////
+ // / Only print these sequences and residues on this page
int endRes;
- /////////////////////////////
- /// Only print these sequences and residues on this page
+ // ///////////////////////////
+ // / Only print these sequences and residues on this page
int startSeq;
- /////////////////////////////
- /// Only print these sequences and residues on this page
+ // ///////////////////////////
+ // / Only print these sequences and residues on this page
int endSeq;
startRes = (pi % pagesWide) * totalRes;
endRes = (startRes + totalRes) - 1;
@@ -714,11 +904,12 @@ public class AlignmentPanel
endSeq = av.getAlignment().getHeight();
}
- int pagesHigh = ( (av.alignment.getHeight() / totalSeq) + 1) * pheight;
+ int pagesHigh = ((av.getAlignment().getHeight() / totalSeq) + 1)
+ * pheight;
- if (av.showAnnotation)
+ if (av.isShowAnnotation())
{
- pagesHigh += annotationPanel.adjustPanelHeight() + 3;
+ pagesHigh += getAnnotationPanel().adjustPanelHeight() + 3;
}
pagesHigh /= pheight;
@@ -728,24 +919,25 @@ public class AlignmentPanel
return Printable.NO_SUCH_PAGE;
}
- //draw Scale
+ // draw Scale
pg.translate(idWidth, 0);
- scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);
- pg.translate( -idWidth, scaleHeight);
+ getScalePanel().drawScale(pg, startRes, endRes, pwidth - idWidth,
+ scaleHeight);
+ pg.translate(-idWidth, scaleHeight);
- ////////////////
+ // //////////////
// Draw the ids
Color currentColor = null;
Color currentTextColor = null;
- pg.setFont(idPanel.idCanvas.idfont);
+ pg.setFont(getIdPanel().getIdCanvas().getIdfont());
SequenceI seq;
for (int i = startSeq; i < endSeq; i++)
{
seq = av.getAlignment().getSequenceAt(i);
- if ( (av.getSelectionGroup() != null) &&
- av.getSelectionGroup().getSequences(null).contains(seq))
+ if ((av.getSelectionGroup() != null)
+ && av.getSelectionGroup().getSequences(null).contains(seq))
{
currentColor = Color.gray;
currentTextColor = Color.black;
@@ -758,38 +950,43 @@ public class AlignmentPanel
pg.setColor(currentColor);
pg.fillRect(0, (i - startSeq) * av.charHeight, idWidth,
- av.getCharHeight());
+ av.getCharHeight());
pg.setColor(currentTextColor);
int xPos = 0;
- if (av.rightAlignIds)
+ if (av.isRightAlignIds())
{
fm = pg.getFontMetrics();
- xPos = idWidth - fm.stringWidth(
- seq.getDisplayId(av.getShowJVSuffix())
- ) - 4;
+ xPos = idWidth
+ - fm.stringWidth(seq.getDisplayId(av.getShowJVSuffix()))
+ - 4;
}
- pg.drawString(seq.getDisplayId(av.getShowJVSuffix()),
- xPos,
- ( ( (i - startSeq) * av.charHeight) + av.getCharHeight()) -
- (av.getCharHeight() / 5));
+ pg.drawString(
+ seq.getDisplayId(av.getShowJVSuffix()),
+ xPos,
+ (((i - startSeq) * av.charHeight) + av.getCharHeight())
+ - (av.getCharHeight() / 5));
}
pg.setFont(av.getFont());
// draw main sequence panel
pg.translate(idWidth, 0);
- seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq, 0);
+ getSeqPanel().seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq, 0);
- if (av.showAnnotation && (endSeq == av.alignment.getHeight()))
+ if (av.isShowAnnotation() && (endSeq == av.getAlignment().getHeight()))
{
- pg.translate( -idWidth - 3, (endSeq - startSeq) * av.charHeight + 3);
- alabels.drawComponent( (Graphics2D) pg, idWidth);
+ // draw annotation - need to offset for current scroll position
+ int offset = -getAlabels().getScrollOffset();
+ pg.translate(0, offset);
+ pg.translate(-idWidth - 3, (endSeq - startSeq) * av.charHeight + 3);
+ getAlabels().drawComponent(pg, idWidth);
pg.translate(idWidth + 3, 0);
- annotationPanel.drawComponent( (Graphics2D) pg, startRes, endRes +
- 1);
+ getAnnotationPanel().renderer.drawComponent(getAnnotationPanel(), av,
+ pg, -1, startRes, endRes + 1);
+ pg.translate(0, -offset);
}
return Printable.PAGE_EXISTS;
@@ -797,26 +994,30 @@ public class AlignmentPanel
/**
* DOCUMENT ME!
- *
- * @param pg DOCUMENT ME!
- * @param pwidth DOCUMENT ME!
- * @param pheight DOCUMENT ME!
- * @param pi DOCUMENT ME!
- *
+ *
+ * @param pg
+ * DOCUMENT ME!
+ * @param pwidth
+ * DOCUMENT ME!
+ * @param pheight
+ * DOCUMENT ME!
+ * @param pi
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
- *
- * @throws PrinterException DOCUMENT ME!
+ *
+ * @throws PrinterException
+ * DOCUMENT ME!
*/
public int printWrappedAlignment(Graphics pg, int pwidth, int pheight,
- int pi)
- throws PrinterException
+ int pi) throws PrinterException
{
int annotationHeight = 0;
AnnotationLabels labels = null;
- if (av.showAnnotation)
+ if (av.isShowAnnotation())
{
- annotationHeight = annotationPanel.adjustPanelHeight();
+ annotationHeight = getAnnotationPanel().adjustPanelHeight();
labels = new AnnotationLabels(av);
}
@@ -826,20 +1027,19 @@ public class AlignmentPanel
hgap += av.charHeight;
}
- int cHeight = av.getAlignment().getHeight() * av.charHeight
- + hgap
- + annotationHeight;
+ 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;
}
- int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth -
- idWidth);
+ int resWidth = getSeqPanel().seqCanvas.getWrappedCanvasWidth(pwidth
+ - idWidth);
int totalHeight = cHeight * (maxwidth / resWidth + 1);
@@ -847,7 +1047,7 @@ public class AlignmentPanel
pg.fillRect(0, 0, pwidth, pheight);
pg.setFont(av.getFont());
- ////////////////
+ // //////////////
// Draw the ids
pg.setColor(Color.black);
@@ -859,43 +1059,41 @@ public class AlignmentPanel
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);
+ pg.setFont(getIdPanel().getIdCanvas().getIdfont());
+ SequenceI s = av.getAlignment().getSequenceAt(i);
String string = s.getDisplayId(av.getShowJVSuffix());
int xPos = 0;
- if (av.rightAlignIds)
+ if (av.isRightAlignIds())
{
FontMetrics fm = pg.getFontMetrics();
xPos = idWidth - fm.stringWidth(string) - 4;
}
pg.drawString(string, xPos,
- ( (i * av.charHeight) + ypos + av.charHeight) -
- (av.charHeight / 5));
+ ((i * av.charHeight) + ypos + av.charHeight)
+ - (av.charHeight / 5));
}
if (labels != null)
{
- pg.translate( -3,
- ypos +
- (av.getAlignment().getHeight() * av.charHeight));
+ pg.translate(-3, ypos
+ + (av.getAlignment().getHeight() * av.charHeight));
pg.setFont(av.getFont());
labels.drawComponent(pg, idWidth);
- pg.translate( +3,
- -ypos -
- (av.getAlignment().getHeight() * av.charHeight));
+ pg.translate(+3, -ypos
+ - (av.getAlignment().getHeight() * av.charHeight));
}
ypos += cHeight;
- }
- while (ypos < totalHeight);
+ } while (ypos < totalHeight);
pg.translate(idWidth, 0);
- seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);
+ getSeqPanel().seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight,
+ 0);
- if ( (pi * pheight) < totalHeight)
+ if ((pi * pheight) < totalHeight)
{
return Printable.PAGE_EXISTS;
@@ -906,104 +1104,157 @@ public class AlignmentPanel
}
}
- int getVisibleIdWidth()
+ /**
+ * get current sequence ID panel width, or nominal value if panel were to be
+ * displayed using default settings
+ *
+ * @return
+ */
+ public 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
+ */
+ public 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 (getIdPanel().getWidth() > 0 ? getIdPanel().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();
+ 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
{
+ AlignmentDimension aDimension = getAlignmentDimension();
+ 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)
+ {
+ imageAction = "Create EPS file from alignment";
+ imageTitle = alignFrame.getTitle();
+ }
+ else
+ {
+ imageAction = "Create SVG file from alignment";
+ imageTitle = alignFrame.getTitle();
+ }
- jalview.util.ImageMaker im;
- if (type == jalview.util.ImageMaker.PNG)
+ im = new jalview.util.ImageMaker(this, type, imageAction,
+ aDimension.getWidth(), aDimension.getHeight(), file,
+ imageTitle);
+ if (av.getWrapAlignment())
+ {
+ if (im.getGraphics() != null)
+ {
+ printWrappedAlignment(im.getGraphics(), aDimension.getWidth(),
+ aDimension.getHeight(), 0);
+ im.writeImage();
+ }
+ }
+ else
+ {
+ if (im.getGraphics() != null)
+ {
+ printUnwrapped(im.getGraphics(), aDimension.getWidth(),
+ aDimension.getHeight(), 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)
{
- im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.PNG,
- "Create PNG image from alignment",
- width, height, file, null);
+ ex.printStackTrace();
}
- else
+ } finally
+ {
+ if (alignFrame != null && !headless)
{
- im = new jalview.util.ImageMaker(this,
- jalview.util.ImageMaker.EPS,
- "Create EPS file from alignment",
- width, height, file,
- alignFrame.getTitle());
+ alignFrame.setProgressBar(MessageManager.getString("status.export_complete"), progress);
}
+ }
+ }
- if (av.getWrapAlignment())
+ public AlignmentDimension getAlignmentDimension()
+ {
+ int maxwidth = av.getAlignment().getWidth();
+ if (av.hasHiddenColumns())
+ {
+ maxwidth = av.getColumnSelection().findColumnPosition(maxwidth);
+ }
+
+ int height = ((av.getAlignment().getHeight() + 1) * av.charHeight)
+ + getScalePanel().getHeight();
+ int width = getVisibleIdWidth(false) + (maxwidth * av.charWidth);
+
+ if (av.getWrapAlignment())
+ {
+ height = getWrappedHeight();
+ if (headless)
{
- if (im.getGraphics() != null)
- {
- 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
{
- if (im.getGraphics() != null)
- {
- printUnwrapped(im.getGraphics(), width, height, 0);
- im.writeImage();
- }
+ width = getSeqPanel().getWidth() + getVisibleIdWidth(false);
}
- }
- catch (OutOfMemoryError err)
- {
- System.out.println("########################\n"
- + "OUT OF MEMORY " + file + "\n"
- + "########################");
-
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "Out of Memory Creating Image!!"
- +
- "\nSee help files for increasing Java Virtual Machine memory."
- , "Out of memory",
- JOptionPane.WARNING_MESSAGE);
- System.out.println("Create IMAGE: " + err);
- System.gc();
}
- catch (Exception ex)
+ else if (av.getShowAnnotation())
{
- ex.printStackTrace();
+ height += getAnnotationPanel().adjustPanelHeight() + 3;
}
+ return new AlignmentDimension(width, height);
+
}
/**
@@ -1011,7 +1262,7 @@ public class AlignmentPanel
*/
public void makeEPS(File epsFile)
{
- makeAlignmentImage(jalview.util.ImageMaker.EPS, epsFile);
+ makeAlignmentImage(jalview.util.ImageMaker.TYPE.EPS, epsFile);
}
/**
@@ -1019,53 +1270,57 @@ public class AlignmentPanel
*/
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();
+ // /////ONLY WORKS WITH NONE WRAPPED ALIGNMENTS
+ // ////////////////////////////////////////////
+ int idWidth = getVisibleIdWidth(false);
FontMetrics fm = getFontMetrics(av.getFont());
int scaleHeight = av.charHeight + fm.getDescent();
// Gen image map
- //////////////////////////////////
+ // ////////////////////////////////
if (imgMapFile != null)
{
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());
- out.println(""
- + "