X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=34e0cc02517a897b9cb890e2b93e27a7ab2ac3e5;hb=053c5f25f135f0eeeb60acad625b246dc66e75fc;hp=b34a5bbb561339759be9c01fa9db71f037eea5a9;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index b34a5bb..34e0cc0 100644
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -1,30 +1,48 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.appletgui;
-import java.awt.*;
-import java.awt.event.*;
-
+import jalview.analysis.AnnotationSorter;
+import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
-import jalview.datamodel.*;
+import jalview.bin.JalviewLite;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.SequenceI;
import jalview.structure.StructureSelectionManager;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Panel;
+import java.awt.Scrollbar;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.util.List;
+
public class AlignmentPanel extends Panel implements AdjustmentListener,
AlignmentViewPanel
{
@@ -84,10 +102,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
annotationPanelHolder.add(annotationPanel, BorderLayout.CENTER);
sequenceHolderPanel.add(annotationPanelHolder, BorderLayout.SOUTH);
-
alabels = new AnnotationLabels(this);
- setAnnotationVisible(av.showAnnotation);
+ setAnnotationVisible(av.isShowAnnotation());
idPanelHolder.add(idPanel, BorderLayout.CENTER);
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
@@ -138,7 +155,12 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
}
});
+ }
+ @Override
+ public AlignViewportI getAlignViewport()
+ {
+ return av;
}
public SequenceRenderer getSequenceRenderer()
@@ -146,11 +168,20 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
return seqPanel.seqCanvas.sr;
}
- public FeatureRenderer getFeatureRenderer()
+ @Override
+ public jalview.api.FeatureRenderer getFeatureRenderer()
{
return seqPanel.seqCanvas.fr;
}
+ @Override
+ public jalview.api.FeatureRenderer cloneFeatureRenderer()
+ {
+ FeatureRenderer nfr = new FeatureRenderer(av);
+ nfr.transferSettings(seqPanel.seqCanvas.fr);
+ return nfr;
+ }
+
public void alignmentChanged()
{
av.alignmentChanged(this);
@@ -172,8 +203,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
idPanel.idCanvas.image = null;
FontMetrics fm = getFontMetrics(av.getFont());
- scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent()));
- idwidthAdjuster.setSize(new Dimension(10, av.charHeight
+ scalePanel.setSize(new Dimension(10, av.getCharHeight()
+ + fm.getDescent()));
+ idwidthAdjuster.setSize(new Dimension(10, av.getCharHeight()
+ fm.getDescent()));
av.updateSequenceIdColours();
annotationPanel.image = null;
@@ -287,7 +319,21 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
public boolean scrollToPosition(SearchResults results,
boolean redrawOverview)
{
+ return scrollToPosition(results, redrawOverview, false);
+ }
+ /**
+ * 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, boolean centre)
+ {
// do we need to scroll the panel?
if (results != null && results.getSize() > 0)
{
@@ -301,7 +347,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
int[] r = results.getResults(seq, 0, alignment.getWidth());
if (r == null)
{
- if (av.applet.debug)
+ if (JalviewLite.debug)
{// DEBUG
System.out
.println("DEBUG: scroll didn't happen - results not within alignment : "
@@ -309,7 +355,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
return false;
}
- if (av.applet.debug)
+ if (JalviewLite.debug)
{
// DEBUG
/*
@@ -321,6 +367,18 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
int start = r[0];
int end = r[1];
+
+ /*
+ * To centre results, scroll to positions half the visible width
+ * left/right of the start/end positions
+ */
+ if (centre)
+ {
+ int offset = (av.getEndRes() - av.getStartRes() + 1) / 2 - 1;
+ start = Math.max(start - offset, 0);
+ end = Math.min(end + offset, seq.getEnd() - 1);
+ }
+
if (start < 0)
{
return false;
@@ -357,7 +415,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
{
start = ostart;
}
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
/*
* int spos=av.getStartRes(),sqpos=av.getStartSeq(); if ((startv =
@@ -368,33 +426,64 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
* av.getStartSeq()) > seqIndex) { setScrollValues(av.getStartRes(),
* seqIndex); } else if ((ends = av.getEndSeq()) <= seqIndex) {
* setScrollValues(av.getStartRes(), starts + seqIndex - ends + 1); }
- *
- * /*
*/
- if ((av.getStartRes() > end)
- || (av.getEndRes() < start)
- || ((av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
- {
- if (start > av.getAlignment().getWidth() - hextent)
- {
- start = av.getAlignment().getWidth() - hextent;
- if (start < 0)
- {
- start = 0;
- }
- }
- if (seqIndex > av.getAlignment().getHeight() - vextent)
- {
- seqIndex = av.getAlignment().getHeight() - vextent;
- if (seqIndex < 0)
- {
- seqIndex = 0;
- }
- }
- // System.out.println("trying to scroll to: "+start+" "+seqIndex);
- setScrollValues(start, seqIndex);
- }/**/
+ // below is scrolling logic up to Jalview 2.8.2
+ // if ((av.getStartRes() > end)
+ // || (av.getEndRes() < start)
+ // || ((av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+ // {
+ // if (start > av.getAlignment().getWidth() - hextent)
+ // {
+ // start = av.getAlignment().getWidth() - hextent;
+ // if (start < 0)
+ // {
+ // start = 0;
+ // }
+ //
+ // }
+ // if (seqIndex > av.getAlignment().getHeight() - vextent)
+ // {
+ // seqIndex = av.getAlignment().getHeight() - vextent;
+ // if (seqIndex < 0)
+ // {
+ // seqIndex = 0;
+ // }
+ // }
+ // setScrollValues(start, seqIndex);
+ // }
+ // logic copied from jalview.gui.AlignmentPanel:
+ if ((startv = av.getStartRes()) >= start)
+ {
+ /*
+ * Scroll left to make start of search results visible
+ */
+ setScrollValues(start - 1, seqIndex);
+ }
+ else if ((endv = av.getEndRes()) <= end)
+ {
+ /*
+ * Scroll right to make end of search results visible
+ */
+ setScrollValues(startv + 1 + end - endv, seqIndex);
+ }
+ else if ((starts = av.getStartSeq()) > seqIndex)
+ {
+ /*
+ * Scroll up to make start of search results visible
+ */
+ setScrollValues(av.getStartRes(), seqIndex);
+ }
+ else if ((ends = av.getEndSeq()) <= seqIndex)
+ {
+ /*
+ * Scroll down to make end of search results visible
+ */
+ setScrollValues(av.getStartRes(), starts + seqIndex - ends + 1);
+ }
+ /*
+ * Else results are already visible - no need to scroll
+ */
}
else
{
@@ -431,11 +520,16 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
public void setAnnotationVisible(boolean b)
{
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
}
+ else
+ {
+ annotationSpaceFillerHolder.setVisible(false);
+ annotationPanelHolder.setVisible(false);
+ }
validate();
repaint();
}
@@ -450,7 +544,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
// this is called after loading new annotation onto alignment
if (alignFrame.getSize().height == 0)
{
- System.out.println("NEEDS FIXING");
+ System.out
+ .println("adjustAnnotationHeight frame size zero NEEDS FIXING");
}
fontChanged();
validateAnnotationDimensions(true);
@@ -461,55 +556,62 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
/**
- * calculate the annotation dimensions and refresh slider values accordingly.
- * need to do repaints/notifys afterwards.
+ * Calculate the annotation dimensions and refresh slider values accordingly.
+ * Need to do repaints/notifys afterwards.
*/
protected void validateAnnotationDimensions(boolean adjustPanelHeight)
{
- boolean modified = false;
- int height = av.calcPanelHeight();
- int minsize = 0;
- if (hscroll.isVisible())
- {
- height += (minsize = hscroll.getPreferredSize().height);
- }
- if (apvscroll.isVisible())
- {
- minsize += apvscroll.getPreferredSize().height;
- }
- int mheight = height;
- Dimension d = sequenceHolderPanel.getSize(), e = idPanel.getSize();
- int seqandannot = d.height - scalePanelHolder.getSize().height;
- // sets initial preferred height
- if ((height + 40) > seqandannot / 2)
+ int rowHeight = av.getCharHeight();
+ int alignmentHeight = rowHeight * av.getAlignment().getHeight();
+ int annotationHeight = av.calcPanelHeight();
+
+ int mheight = annotationHeight;
+ Dimension d = sequenceHolderPanel.getSize();
+
+ int availableHeight = d.height - scalePanelHolder.getHeight();
+
+ if (adjustPanelHeight)
{
- height = seqandannot / 2;
+ /*
+ * If not enough vertical space, maximize annotation height while keeping
+ * at least two rows of alignment visible
+ */
+ if (annotationHeight + alignmentHeight > availableHeight)
+ {
+ annotationHeight = Math.min(annotationHeight, availableHeight - 2
+ * rowHeight);
+ }
}
- if (!adjustPanelHeight)
+ else
{
// maintain same window layout whilst updating sliders
- height = annotationPanelHolder.getSize().height;
+ annotationHeight = annotationPanelHolder.getSize().height;
}
- if (seqandannot - height < 5)
+ if (availableHeight - annotationHeight < 5)
{
- height = seqandannot;
+ annotationHeight = availableHeight;
}
- annotationPanel.setSize(new Dimension(d.width, height));
- alabels.setSize(new Dimension(e.width, height));
- annotationSpaceFillerHolder.setSize(new Dimension(e.width, height));
- annotationPanelHolder.setSize(new Dimension(d.width, height));
- seqPanelHolder.setSize(d.width, seqandannot - height);
+
+ annotationPanel.setSize(new Dimension(d.width, annotationHeight));
+ annotationPanelHolder.setSize(new Dimension(d.width, annotationHeight));
+ // seqPanelHolder.setSize(d.width, seqandannot - height);
seqPanel.seqCanvas
.setSize(d.width, seqPanel.seqCanvas.getSize().height);
+
+ Dimension e = idPanel.getSize();
+ alabels.setSize(new Dimension(e.width, annotationHeight));
+ annotationSpaceFillerHolder.setSize(new Dimension(e.width,
+ annotationHeight));
+
int s = apvscroll.getValue();
- if (s > mheight - height)
+ if (s > mheight - annotationHeight)
{
s = 0;
}
- apvscroll.setValues(s, height, 0, mheight);
- annotationPanel.setScrollOffset(apvscroll.getValue());
- alabels.setScrollOffset(apvscroll.getValue());
+ apvscroll.setValues(s, annotationHeight, 0, mheight);
+ annotationPanel.setScrollOffset(apvscroll.getValue(), false);
+ alabels.setScrollOffset(apvscroll.getValue(), false);
}
public void setWrapAlignment(boolean wrap)
@@ -526,7 +628,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
annotationPanelHolder.setVisible(false);
annotationSpaceFillerHolder.setVisible(false);
}
- else if (av.showAnnotation)
+ else if (av.isShowAnnotation())
{
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
@@ -537,6 +639,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
fontChanged(); // This is so that the scalePanel is resized correctly
validate();
+ sequenceHolderPanel.validate();
repaint();
}
@@ -607,8 +710,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
;
- hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;
- vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;
+ hextent = seqPanel.seqCanvas.getSize().width / av.getCharWidth();
+ vextent = seqPanel.seqCanvas.getSize().height / av.getCharHeight();
if (hextent > width)
{
@@ -653,7 +756,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
av.setEndSeq(endSeq);
av.setStartRes(x);
- av.setEndRes((x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) - 1);
+ av.setEndRes((x + (seqPanel.seqCanvas.getSize().width / av
+ .getCharWidth())) - 1);
hscroll.setValues(x, hextent, 0, width);
vscroll.setValues(y, vextent, 0, height);
@@ -673,8 +777,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
if (evt == null || evt.getSource() == apvscroll)
{
- annotationPanel.setScrollOffset(apvscroll.getValue());
- alabels.setScrollOffset(apvscroll.getValue());
+ annotationPanel.setScrollOffset(apvscroll.getValue(), false);
+ alabels.setScrollOffset(apvscroll.getValue(), false);
// annotationPanel.image=null;
// alabels.image=null;
// alabels.repaint();
@@ -735,13 +839,102 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
- if (av.getShowAnnotation())
+ if (av.isShowAnnotation())
{
annotationPanel.fastPaint(av.getStartRes() - oldX);
}
}
sendViewPosition();
+ /*
+ * If there is one, scroll the (Protein/cDNA) complementary alignment to
+ * match, unless we are ourselves doing that.
+ */
+ if (isFollowingComplementScroll())
+ {
+ setFollowingComplementScroll(false);
+ }
+ else
+ {
+ AlignmentPanel ap = getComplementPanel();
+ av.scrollComplementaryAlignment(ap);
+ }
+
+ }
+
+ /**
+ * A helper method to return the AlignmentPanel in the other (complementary)
+ * half of a SplitFrame view. Returns null if not in a SplitFrame.
+ *
+ * @return
+ */
+ private AlignmentPanel getComplementPanel()
+ {
+ AlignmentPanel ap = null;
+ if (alignFrame != null)
+ {
+ SplitFrame sf = alignFrame.getSplitFrame();
+ if (sf != null)
+ {
+ AlignFrame other = sf.getComplement(alignFrame);
+ if (other != null)
+ {
+ ap = other.alignPanel;
+ }
+ }
+ }
+ return ap;
+ }
+
+ /**
+ * Follow a scrolling change in the (cDNA/Protein) complementary alignment.
+ * The aim is to keep the two alignments 'lined up' on their centre columns.
+ *
+ * @param sr
+ * holds mapped region(s) of this alignment that we are scrolling
+ * 'to'; may be modified for sequence offset by this method
+ * @param seqOffset
+ * the number of visible sequences to show above the mapped region
+ */
+ protected void scrollToCentre(SearchResults sr, int seqOffset)
+ {
+ /*
+ * To avoid jumpy vertical scrolling (if some sequences are gapped or not
+ * mapped), we can make the scroll-to location a sequence above the one
+ * actually mapped.
+ */
+ SequenceI mappedTo = sr.getResultSequence(0);
+ List seqs = av.getAlignment().getSequences();
+
+ /*
+ * This is like AlignmentI.findIndex(seq) but here we are matching the
+ * dataset sequence not the aligned sequence
+ */
+ int sequenceIndex = 0;
+ boolean matched = false;
+ for (SequenceI seq : seqs)
+ {
+ if (mappedTo == seq.getDatasetSequence())
+ {
+ matched = true;
+ break;
+ }
+ sequenceIndex++;
+ }
+ if (!matched)
+ {
+ return; // failsafe, shouldn't happen
+ }
+ sequenceIndex = Math.max(0, sequenceIndex - seqOffset);
+ sr.getResults().get(0)
+ .setSequence(av.getAlignment().getSequenceAt(sequenceIndex));
+
+ /*
+ * Scroll to position but centring the target residue. Also set a state flag
+ * to prevent adjustmentValueChanged performing this recursively.
+ */
+ setFollowingComplementScroll(true);
+ scrollToPosition(sr, true, true);
}
private void sendViewPosition()
@@ -751,12 +944,20 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
av.endSeq);
}
+ /**
+ * Repaint the alignment and annotations, and, optionally, any overview window
+ */
public void paintAlignment(boolean updateOverview)
{
+ final AnnotationSorter sorter = new AnnotationSorter(getAlignment(),
+ av.isShowAutocalculatedAbove());
+ sorter.sort(getAlignment().getAlignmentAnnotation(),
+ av.getSortAnnotationsBy());
repaint();
if (updateOverview)
{
+ // TODO: determine if this paintAlignment changed structure colours
jalview.structure.StructureSelectionManager
.getStructureSelectionManager(av.applet)
.sequenceColoursChanged(this);
@@ -777,7 +978,11 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
{
invalidate();
Dimension d = idPanel.idCanvas.getSize();
- idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);
+ final int canvasHeight = seqPanel.seqCanvas.getSize().height;
+ if (canvasHeight != d.height)
+ {
+ idPanel.idCanvas.setSize(d.width, canvasHeight);
+ }
if (av.getWrapAlignment())
{
@@ -804,12 +1009,18 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
setScrollValues(av.getStartRes(), av.getStartSeq());
}
- alabels.repaint();
-
seqPanel.seqCanvas.repaint();
- scalePanel.repaint();
- annotationPanel.repaint();
idPanel.idCanvas.repaint();
+ if (!av.getWrapAlignment())
+ {
+ if (av.isShowAnnotation())
+ {
+ alabels.repaint();
+ annotationPanel.repaint();
+ }
+ scalePanel.repaint();
+ }
+
}
protected Panel sequenceHolderPanel = new Panel();
@@ -820,72 +1031,58 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
protected Panel seqPanelHolder = new Panel();
- BorderLayout borderLayout1 = new BorderLayout();
-
- BorderLayout borderLayout3 = new BorderLayout();
-
protected Panel scalePanelHolder = new Panel();
protected Panel idPanelHolder = new Panel();
- BorderLayout borderLayout5 = new BorderLayout();
-
protected Panel idSpaceFillerPanel1 = new Panel();
public Panel annotationSpaceFillerHolder = new Panel();
- BorderLayout borderLayout6 = new BorderLayout();
-
- BorderLayout borderLayout7 = new BorderLayout();
-
- Panel hscrollHolder = new Panel();
-
- BorderLayout borderLayout10 = new BorderLayout();
-
protected Panel hscrollFillerPanel = new Panel();
- BorderLayout borderLayout11 = new BorderLayout();
-
- BorderLayout borderLayout4 = new BorderLayout();
-
- BorderLayout borderLayout2 = new BorderLayout();
-
Panel annotationPanelHolder = new Panel();
protected Scrollbar apvscroll = new Scrollbar();
- BorderLayout borderLayout12 = new BorderLayout();
+ /*
+ * Flag set while scrolling to follow complementary cDNA/protein scroll. When
+ * true, suppresses invoking the same method recursively.
+ */
+ private boolean followingComplementScroll;
private void jbInit() throws Exception
{
// idPanelHolder.setPreferredSize(new Dimension(70, 10));
- this.setLayout(borderLayout7);
+ this.setLayout(new BorderLayout());
// sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));
- sequenceHolderPanel.setLayout(borderLayout3);
- seqPanelHolder.setLayout(borderLayout1);
+ sequenceHolderPanel.setLayout(new BorderLayout());
+ seqPanelHolder.setLayout(new BorderLayout());
scalePanelHolder.setBackground(Color.white);
// scalePanelHolder.setPreferredSize(new Dimension(10, 30));
- scalePanelHolder.setLayout(borderLayout6);
- idPanelHolder.setLayout(borderLayout5);
+ scalePanelHolder.setLayout(new BorderLayout());
+ idPanelHolder.setLayout(new BorderLayout());
idSpaceFillerPanel1.setBackground(Color.white);
// idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30));
- idSpaceFillerPanel1.setLayout(borderLayout11);
+ idSpaceFillerPanel1.setLayout(new BorderLayout());
annotationSpaceFillerHolder.setBackground(Color.white);
// annotationSpaceFillerHolder.setPreferredSize(new Dimension(10, 80));
- annotationSpaceFillerHolder.setLayout(borderLayout4);
+ annotationSpaceFillerHolder.setLayout(new BorderLayout());
hscroll.setOrientation(Scrollbar.HORIZONTAL);
- hscrollHolder.setLayout(borderLayout10);
+
+ Panel hscrollHolder = new Panel();
+ hscrollHolder.setLayout(new BorderLayout());
hscrollFillerPanel.setBackground(Color.white);
apvscroll.setOrientation(Scrollbar.VERTICAL);
apvscroll.setVisible(true);
apvscroll.addAdjustmentListener(this);
annotationPanelHolder.setBackground(Color.white);
- annotationPanelHolder.setLayout(borderLayout12);
+ annotationPanelHolder.setLayout(new BorderLayout());
annotationPanelHolder.add(apvscroll, BorderLayout.EAST);
// hscrollFillerPanel.setPreferredSize(new Dimension(70, 10));
hscrollHolder.setBackground(Color.white);
@@ -936,6 +1133,12 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
@Override
+ public String getViewName()
+ {
+ return getName();
+ }
+
+ @Override
public StructureSelectionManager getStructureSelectionManager()
{
return StructureSelectionManager
@@ -950,4 +1153,19 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
error.printStackTrace();
}
+ /**
+ * Set a flag to say we are scrolling to follow a (cDNA/protein) complement.
+ *
+ * @param b
+ */
+ protected void setFollowingComplementScroll(boolean b)
+ {
+ this.followingComplementScroll = b;
+ }
+
+ protected boolean isFollowingComplementScroll()
+ {
+ return this.followingComplementScroll;
+ }
+
}