/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, 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
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * 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 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.
*
- * 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
+ * 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 <http://www.gnu.org/licenses/>.
*/
package jalview.gui;
import java.beans.*;
import java.io.*;
+import java.util.Hashtable;
import java.util.Vector;
import java.awt.*;
import java.awt.print.*;
import javax.swing.*;
+import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.jbgui.*;
import jalview.schemes.*;
import jalview.structure.SelectionSource;
+import jalview.structure.StructureSelectionManager;
/**
* DOCUMENT ME!
*
* @author $author$
- * @version $Revision$
+ * @version $Revision: 1.161 $
*/
public class AlignmentPanel extends GAlignmentPanel implements
- AdjustmentListener, Printable
+ AdjustmentListener, Printable, AlignmentViewPanel
{
public AlignViewport av;
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 maxwidth = Math.max(20,
+ Math.min(afwidth - 200, (int) 2 * afwidth / 3));
int i = 0;
int idWidth = 0;
String id;
}
/**
- * DOCUMENT ME!
+ * Highlight the given results on the alignment.
*
- * @param results
- * DOCUMENT ME!
*/
public void highlightSearchResults(SearchResults results)
{
return false;
}
SequenceI seq = av.alignment.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.alignment.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;
{
return false;
}
+ if (av.hasHiddenColumns)
+ {
+ start = av.getColumnSelection().findColumnPosition(start);
+ end = av.getColumnSelection().findColumnPosition(end);
+ if (start==end)
+ {
+ if (!av.colSel.isVisible(r[0]))
+ {
+ // don't scroll - position isn't visible
+ return false;
+ }
+ }
+ }
if (!av.wrapAlignment)
{
if ((startv = av.getStartRes()) >= start)
scrollToWrappedVisible(start);
}
}
- if (!redrawOverview && overviewPanel != null)
+ if (redrawOverview && overviewPanel != null)
{
overviewPanel.setBoxPosition();
}
- paintAlignment(!redrawOverview);
+ paintAlignment(redrawOverview);
return true;
}
}
/**
- * DOCUMENT ME!
*
- * @param b
- * DOCUMENT ME!
+ * @param b Hide or show annotation panel
+ *
*/
public void setAnnotationVisible(boolean b)
{
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
{
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())
{
height += hscroll.getPreferredSize().height;
{
height = alignFrame.getHeight() / 2;
}
-
+ if (!adjustPanelHeight)
+ {
+ // maintain same window layout whilst updating sliders
+ height=annotationScroller.getSize().height;
+ }
hscroll.addNotify();
-
+
annotationScroller.setPreferredSize(new Dimension(annotationScroller
.getWidth(), height));
annotationSpaceFillerHolder.setPreferredSize(new Dimension(
annotationSpaceFillerHolder.getWidth(), height));
annotationScroller.validate();// repaint();
- addNotify();
- repaint();
+ annotationScroller.addNotify();
}
/**
}
/**
- * DOCUMENT ME!
+ * Adjust row/column scrollers to show a visible position in the alignment.
*
- * @param x
- * DOCUMENT ME!
- * @param y
+ * @param x visible column to scroll to
* DOCUMENT ME!
+ * @param y visible row to scroll to
+ *
*/
public void setScrollValues(int x, int y)
{
{
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)
if (updateOverview)
{
- jalview.structure.StructureSelectionManager
- .getStructureSelectionManager().sequenceColoursChanged(this);
+ av.getStructureSelectionManager().sequenceColoursChanged(this);
if (overviewPanel != null)
{
}
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);
- 4;
}
- pg.drawString(seq.getDisplayId(av.getShowJVSuffix()), xPos,
+ pg.drawString(
+ seq.getDisplayId(av.getShowJVSuffix()),
+ xPos,
(((i - startSeq) * av.charHeight) + av.getCharHeight())
- (av.getCharHeight() / 5));
}
if (System.getProperty("java.awt.headless") != null
&& System.getProperty("java.awt.headless").equals("true"))
{
+ // TODO: JAL-244
width = alignFrame.getWidth() - vscroll.getPreferredSize().width
- alignFrame.getInsets().left
- alignFrame.getInsets().right;
*/
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)
{
+ jalview.structure.StructureSelectionManager ssm = av.getStructureSelectionManager();
+ ssm.removeStructureViewerListener(seqPanel, null);
+ ssm.removeSelectionListener(seqPanel);
av.alignment = null;
av = null;
}
*/
public void updateAnnotation()
{
+ updateAnnotation(false);
+ }
+
+ public void updateAnnotation(boolean applyGlobalSettings)
+ {
+ // TODO: this should be merged with other annotation update stuff - that
+ // sits on AlignViewport
boolean updateCalcs = false;
boolean conv = av.isShowGroupConservation();
boolean cons = av.isShowGroupConsensus();
+ boolean showprf = av.isShowSequenceLogo();
+ boolean showConsHist = av.isShowConsensusHistogram();
+
boolean sortg = true;
// remove old automatic annotation
// intersect alignment annotation with alignment groups
AlignmentAnnotation[] aan = av.alignment.getAlignmentAnnotation();
- for (int an = 0; an < aan.length; an++)
+ Hashtable oldrfs = new Hashtable();
+ if (aan != null)
{
- if (aan[an].autoCalculated && aan[an].groupRef != null)
+ for (int an = 0; an < aan.length; an++)
{
- av.alignment.deleteAnnotation(aan[an]);
- aan[an] = null;
+ if (aan[an].autoCalculated && aan[an].groupRef != null)
+ {
+ oldrfs.put(aan[an].groupRef, aan[an].groupRef);
+ av.alignment.deleteAnnotation(aan[an]);
+ aan[an] = null;
+ }
}
}
SequenceGroup sg;
- for (int g = 0; g < gr.size(); g++)
+ if (gr != null)
{
- updateCalcs = false;
- sg = (SequenceGroup) gr.elementAt(g);
-
- if (conv)
+ for (int g = 0; g < gr.size(); g++)
{
- 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();
+ updateCalcs = false;
+ sg = (SequenceGroup) gr.elementAt(g);
+ if (applyGlobalSettings || !oldrfs.containsKey(sg))
+ {
+ // set defaults for this group's conservation/consensus
+ sg.setshowSequenceLogo(showprf);
+ sg.setShowConsensusHistogram(showConsHist);
+ }
+ 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();
+ }
}
}
+ oldrfs.clear();
adjustAnnotationHeight();
}
+
+ @Override
+ public AlignmentI getAlignment()
+ {
+ return av.alignment;
+ }
+
+ /**
+ * get the name for this view
+ * @return
+ */
+ public String getViewName()
+ {
+ return av.viewName;
+ }
+
+ /**
+ * Make/Unmake this alignment panel the current input focus
+ * @param b
+ */
+ public void setSelected(boolean b)
+ {
+ try {
+ alignFrame.setSelected(b);
+ } catch (Exception ex) {};
+
+ if (b)
+ {
+ alignFrame.setDisplayedView(this);
+ }
+ }
+
+ @Override
+ public StructureSelectionManager getStructureSelectionManager()
+ {
+ return av.getStructureSelectionManager();
+ }
}
git://source.jalview.org / jalview.git / blobdiff