import jalview.api.AlignmentColsCollectionI;
import jalview.api.AlignmentRowsCollectionI;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.AllColsCollection;
-import jalview.datamodel.AllRowsCollection;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.HiddenSequences;
+import jalview.datamodel.VisibleColsCollection;
+import jalview.datamodel.VisibleRowsCollection;
public class OverviewDimensionsAllVisible extends OverviewDimensions
{
- private float pixelsPerCol;
-
- private float pixelsPerSeq;
-
public OverviewDimensionsAllVisible(ViewportRanges ranges,
boolean showAnnotationPanel)
{
super(ranges, showAnnotationPanel);
- int alwidth = ranges.getVisibleAlignmentWidth();
- int alheight = ranges.getVisibleAlignmentHeight();
-
- pixelsPerCol = (float) width / alwidth;
- pixelsPerSeq = (float) sequencesHeight / alheight;
+ alwidth = ranges.getVisibleAlignmentWidth();
+ alheight = ranges.getVisibleAlignmentHeight();
}
@Override
public void updateViewportFromMouse(int mousex, int mousey,
- HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
+ HiddenSequences hiddenSeqs, HiddenColumns hiddenCols,
ViewportRanges ranges)
{
int x = mousex;
int y = mousey;
- int alwidth = ranges.getVisibleAlignmentWidth();
- int alheight = ranges.getVisibleAlignmentHeight();
+ alwidth = ranges.getVisibleAlignmentWidth();
+ alheight = ranges.getVisibleAlignmentHeight();
if (x < 0)
{
@Override
public void setBoxPosition(HiddenSequences hiddenSeqs,
- ColumnSelection hiddenCols, ViewportRanges ranges)
+ HiddenColumns hiddenCols, ViewportRanges ranges)
{
- int alwidth = ranges.getVisibleAlignmentWidth();
- int alheight = ranges.getVisibleAlignmentHeight();
+ alwidth = ranges.getVisibleAlignmentWidth();
+ alheight = ranges.getVisibleAlignmentHeight();
// work with visible values of startRes and endRes
int startRes = ranges.getStartRes();
@Override
public AlignmentColsCollectionI getColumns(ViewportRanges ranges,
- ColumnSelection hiddenCols)
+ HiddenColumns hiddenCols)
{
- return new AllColsCollection(0,
+ return new VisibleColsCollection(0,
ranges.getVisibleAlignmentWidth() - 1, hiddenCols);
}
public AlignmentRowsCollectionI getRows(ViewportRanges ranges,
AlignmentI al)
{
- return new AllRowsCollection(0,
+ return new VisibleRowsCollection(0,
ranges.getVisibleAlignmentHeight() - 1, al);
}
-
- @Override
- public float getPixelsPerCol()
- {
- return pixelsPerCol;
- }
-
- @Override
- public float getPixelsPerSeq()
- {
- return pixelsPerSeq;
- }
}