/*
- * 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.6)
+ * Copyright (C) 2010 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;
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
}
/**
- * 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)
}
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));
}
{
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.isShowConsensusProfile();
+ boolean showprf = av.isShowSequenceLogo();
boolean showConsHist = av.isShowConsensusHistogram();
-
+
boolean sortg = true;
// remove old automatic annotation
AlignmentAnnotation[] aan = av.alignment.getAlignmentAnnotation();
Hashtable oldrfs = new Hashtable();
- for (int an = 0; an < aan.length; an++)
+ if (aan != null)
{
- if (aan[an].autoCalculated && aan[an].groupRef != null)
+ for (int an = 0; an < aan.length; an++)
{
- oldrfs.put(aan[an].groupRef, aan[an].groupRef);
- 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 (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)
+ for (int g = 0; g < gr.size(); g++)
{
- 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();