/**
* update alignment layout for viewport settings
- *
- * @param wrap
- * DOCUMENT ME!
*/
public void updateLayout()
{
idSpaceFillerPanel1.setVisible(!wrap);
+ AlignViewportI complement = av.getCodingComplement();
+ if (complement != null)
+ {
+ SplitFrame splitFrame = (SplitFrame) alignFrame
+ .getSplitViewContainer();
+ splitFrame.adjustLayout();
+ }
repaint();
}
if (av.isShowAnnotation())
{
- pagesHigh += getAnnotationPanel().adjustPanelHeight() + 3;
+ pagesHigh += getAnnotationPanel().adjustPanelHeight()
+ + SeqCanvas.SEQS_ANNOTATION_GAP;
}
pagesHigh /= pageHeight;
{
return Printable.NO_SUCH_PAGE;
}
- final int alignmentDrawnHeight = (endSeq - startSeq) * charHeight + 3;
+ final int alignmentDrawnHeight = (endSeq - startSeq + 1) * charHeight;
/*
* draw the Scale at horizontal offset, then reset to top left (0, 0)
* then reset to (0, scale height)
*/
int offset = getAlabels().getScrollOffset();
+ int yShift = alignmentDrawnHeight + SeqCanvas.SEQS_ANNOTATION_GAP;
idGraphics.translate(0, -offset);
- idGraphics.translate(0, alignmentDrawnHeight);
+ idGraphics.translate(0, yShift);
getAlabels().drawComponent(idGraphics, idWidth);
- idGraphics.translate(0, -alignmentDrawnHeight);
+ idGraphics.translate(0, -yShift);
/*
* draw the annotations starting at
* (idOffset, alignmentHeight) from (0, scaleHeight)
*/
alignmentGraphics.translate(alignmentGraphicsOffset,
- alignmentDrawnHeight);
+ yShift);
getAnnotationPanel().renderer.drawComponent(getAnnotationPanel(), av,
alignmentGraphics, -1, startRes, endRes + 1);
/*
- * reset to left margin
+ * reset to left margin below annotation
+ */
+ int justDrawn = getAnnotationPanel().renderer.getLastDrawnHeight();
+ alignmentGraphics.translate(-alignmentGraphicsOffset, justDrawn);
+ }
+ else
+ {
+ /*
+ * shift graphics to position after drawn sequences
*/
- alignmentGraphics.translate(-alignmentGraphicsOffset, 0);
+ alignmentGraphics.translate(0, alignmentDrawnHeight);
}
return Printable.PAGE_EXISTS;
public int printWrappedAlignment(int pageWidth, int pageHeight, int pageNumber,
Graphics g, boolean clipToPage)
{
+ getSeqPanel().seqCanvas.calculateWrappedGeometry(getWidth(),
+ getHeight());
int annotationHeight = 0;
if (av.isShowAnnotation())
{
int resWidth = getSeqPanel().seqCanvas
.getWrappedCanvasWidth(pageWidth - idWidth);
+ av.getRanges().setViewportStartAndWidth(0, resWidth);
int totalHeight = cHeight * (maxwidth / resWidth + 1);
/*
* method: print the whole wrapped alignment, but with a clip region that
* is restricted to the requested page; this supports selective print of
- * single pages or ranges, (at the cost of some repeated processing in
- * the 'normal' case, when all pages are printed)
+ * single pages or ranges, (at the cost of repeated processing in the
+ * 'normal' case, when all pages are printed)
*/
g.translate(0, -pageNumber * pageHeight);
{ type.getLabel() }), pSessionId);
}
}
+
+ /*
+ * cache preferences in case we need to fudge them for export of
+ * split frame with 'protein scaled to codons' and 'auto id width'
+ */
+
+ final String autoIdWidth = Cache.getProperty("FIGURE_AUTOIDWIDTH");
+ final Integer fixedIdWidth = Cache
+ .getIntegerProperty("FIGURE_FIXEDIDWIDTH");
+
try
{
/*
* if exporting a split frame image, the graphics object has
* width: maximum of the top and bottom image widths
* height: sum of the top and bottom image heights
+ * if 'protein scaled to codons' and 'auto id width', fudge
+ * to a fixed width (and restore preferences afterwards)
*/
- AlignmentPanel comp = null;
+ AlignmentPanel complement = null;
AlignmentDimension dim1 = getAlignmentDimension();
AlignmentDimension dim2 = new AlignmentDimension(0, 0);
+
if (forSplitFrame)
{
- comp = ((AlignViewport) av.getCodingComplement())
+ complement = ((AlignViewport) av.getCodingComplement())
.getAlignPanel();
- dim2 = comp.getAlignmentDimension();
+ dim2 = complement.getAlignmentDimension();
+ if (Boolean.valueOf(autoIdWidth) && av.isScaleProteinAsCdna())
+ {
+ int w1 = this.getVisibleIdWidth(false);
+ int w2 = complement.getVisibleIdWidth(false);
+ Cache.setProperty("FIGURE_AUTOIDWIDTH", Boolean.FALSE.toString());
+ Cache.setProperty("FIGURE_FIXEDIDWIDTH",
+ String.valueOf(Math.max(w1, w2)));
+ }
}
final int graphicsHeight = dim1.height + dim2.height
+ borderBottomOffset;
/*
* append coding complement image
*/
- boolean test = true;
- if (test)
- {
- /*
- * debug location of next write to Graphics
- */
- graphics.setColor(Color.red);
- graphics.drawString("Hello world", 0, 0);
- graphics.setColor(Color.black);
- }
+ // to debug location of next write to Graphics:
+ // graphics.drawString("Hello world", 0, 0);
if (av.getCodingComplement().getWrapAlignment())
{
- comp.printWrappedAlignment(dim2.width,
+ complement.printWrappedAlignment(dim2.width,
dim2.height + borderBottomOffset, 0, graphics, false);
}
else
{
- comp.printUnwrapped(dim2.width, dim2.height, 0, graphics,
+ complement.printUnwrapped(dim2.width, dim2.height, 0, graphics,
graphics);
}
}
} catch (Exception ex)
{
ex.printStackTrace();
+ } finally
+ {
+ /*
+ * restore preference settings in case they were fudged
+ */
+ if (autoIdWidth == null)
+ {
+ Cache.removeProperty("FIGURE_AUTOIDWIDTH");
+ }
+ else
+ {
+ Cache.setProperty("FIGURE_AUTOIDWIDTH", autoIdWidth);
+ }
+ if (fixedIdWidth == null)
+ {
+ Cache.removeProperty("FIGURE_FIXEDIDWIDTH");
+ }
+ else
+ {
+ Cache.setProperty("FIGURE_FIXEDIDWIDTH",
+ String.valueOf(fixedIdWidth));
+ }
}
}
* <ul>
* <li>sequence ids</li>
* <li>scale above, left or right if shown</li>
- * <li>sequences</li>
+ * <li>sequence rows, plus one spacer line</li>
* <li>annotations, if shown</li>
* </ul>
* The alignment may be in wrapped or unwrapped mode.
}
+ /**
+ * Answers the height of the entire alignment in pixels, assuming it is in
+ * wrapped mode
+ *
+ * @return
+ */
int getWrappedHeight()
{
int seqPanelWidth = getSeqPanel().seqCanvas.getWidth();
int annotationHeight = 0;
if (av.isShowAnnotation())
{
+ hgap += SeqCanvas.SEQS_ANNOTATION_GAP;
annotationHeight = getAnnotationPanel().adjustPanelHeight();
}
git://source.jalview.org / jalview.git / blobdiff