/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
- res = av.getColumnSelection().adjustForHiddenColumns(x);
+ x = av.getColumnSelection().adjustForHiddenColumns(x);
+ }
+
+ if (x >= av.getAlignment().getWidth())
+ {
+ res = av.getAlignment().getWidth() - 1;
}
else
{
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() == av.alignment
+ && av.getSelectionGroup().getSize() == av.getAlignment()
.getHeight())
{
av.setSelectionGroup(null);
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
// try to be as quick as possible
- SequenceI[] iVec = av.alignment.getSequencesArray();
+ SequenceI[] iVec = av.getAlignment().getSequencesArray();
for (int i = 0; i < iVec.length; i++)
{
sg.addSequence(iVec[i], false);
iVec = null;
sg.setStartRes(res);
sg.setEndRes(res);
- av.setSelectionGroup(sg);
if (evt.isShiftDown())
{
sg.setStartRes(min);
sg.setEndRes(max);
}
-
+ av.setSelectionGroup(sg);
}
ap.paintAlignment(false);
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- if (res > av.alignment.getWidth())
+ if (av.hasHiddenColumns())
{
- res = av.alignment.getWidth() - 1;
+ res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (av.hasHiddenColumns)
+ if (res >= av.getAlignment().getWidth())
{
- res = av.getColumnSelection().adjustForHiddenColumns(res);
+ res = av.getAlignment().getWidth() - 1;
}
if (!stretchingGroup)
res = 0;
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (res > av.alignment.getWidth())
+ if (res >= av.getAlignment().getWidth())
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
if (res < min)
int col;
for (int i = min; i <= max; i++)
{
- col = av.getColumnSelection().adjustForHiddenColumns(i);
+ col = i; // av.getColumnSelection().adjustForHiddenColumns(i);
if ((col < sg.getStartRes()) || (col > sg.getEndRes()))
{
public void mouseMoved(MouseEvent evt)
{
- if (!av.hasHiddenColumns)
+ if (!av.hasHiddenColumns())
{
return;
}
{
reveal = region;
ToolTipManager.sharedInstance().registerComponent(this);
- this
- .setToolTipText("Reveal Hidden Columns with Right Mouse Button");
+ this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
break;
}
else
// Fill the selected columns
ColumnSelection cs = av.getColumnSelection();
+ int s;
if (cs != null)
{
gg.setColor(new Color(220, 0, 0));
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
- sel = cs.findColumnPosition(sel);
+ if (cs.isVisible(sel))
+ {
+ sel = cs.findColumnPosition(sel);
+ }
+ else
+ {
+ continue;
+ }
}
if ((sel >= startx) && (sel <= endx))
maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
}
- gg
- .drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + 2,
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + (fm.getDescent() * 2));
+ gg.drawLine(
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ y + 2,
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ y + (fm.getDescent() * 2));
}
else
{
- gg
- .drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + fm.getDescent(),
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
- y + (fm.getDescent() * 2));
+ gg.drawLine(
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ y + fm.getDescent(),
+ (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ y + (fm.getDescent() * 2));
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
gg.setColor(Color.blue);
int res;