git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7dfc6ae
)
JAL-2388 Make sure resizing still works
author
kiramt
<k.mourao@dundee.ac.uk>
Fri, 21 Apr 2017 09:42:24 +0000
(10:42 +0100)
committer
kiramt
<k.mourao@dundee.ac.uk>
Fri, 21 Apr 2017 09:42:24 +0000
(10:42 +0100)
src/jalview/viewmodel/OverviewDimensions.java
patch
|
blob
|
history
src/jalview/viewmodel/OverviewDimensionsAllVisible.java
patch
|
blob
|
history
src/jalview/viewmodel/OverviewDimensionsWithHidden.java
patch
|
blob
|
history
diff --git
a/src/jalview/viewmodel/OverviewDimensions.java
b/src/jalview/viewmodel/OverviewDimensions.java
index
59ee5c7
..
7c4ba9e
100644
(file)
--- a/
src/jalview/viewmodel/OverviewDimensions.java
+++ b/
src/jalview/viewmodel/OverviewDimensions.java
@@
-26,6
+26,10
@@
public abstract class OverviewDimensions
protected int scrollCol = -1;
protected int scrollRow = -1;
protected int scrollCol = -1;
protected int scrollRow = -1;
+ protected int alwidth;
+
+ protected int alheight;
+
public OverviewDimensions(ViewportRanges ranges,
boolean showAnnotationPanel)
{
public OverviewDimensions(ViewportRanges ranges,
boolean showAnnotationPanel)
{
@@
-104,16
+108,6
@@
public abstract class OverviewDimensions
return boxHeight;
}
return boxHeight;
}
- public void setWidth(int w)
- {
- width = w;
- }
-
- public void setHeight(int h)
- {
- sequencesHeight = h - graphHeight;
- }
-
public int getWidth()
{
return width;
public int getWidth()
{
return width;
@@
-134,6
+128,26
@@
public abstract class OverviewDimensions
return graphHeight;
}
return graphHeight;
}
+ public float getPixelsPerCol()
+ {
+ return (float) width / alwidth;
+ }
+
+ public float getPixelsPerSeq()
+ {
+ return (float) sequencesHeight / alheight;
+ }
+
+ public void setWidth(int w)
+ {
+ width = w;
+ }
+
+ public void setHeight(int h)
+ {
+ sequencesHeight = h - graphHeight;
+ }
+
public abstract void updateViewportFromMouse(int mousex, int mousey,
HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
ViewportRanges ranges);
public abstract void updateViewportFromMouse(int mousex, int mousey,
HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
ViewportRanges ranges);
@@
-146,8
+160,4
@@
public abstract class OverviewDimensions
public abstract AlignmentRowsCollectionI getRows(
ViewportRanges ranges, AlignmentI al);
public abstract AlignmentRowsCollectionI getRows(
ViewportRanges ranges, AlignmentI al);
-
- public abstract float getPixelsPerCol();
-
- public abstract float getPixelsPerSeq();
}
\ No newline at end of file
}
\ No newline at end of file
diff --git
a/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
b/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
index
02f3e17
..
7e5c412
100644
(file)
--- a/
src/jalview/viewmodel/OverviewDimensionsAllVisible.java
+++ b/
src/jalview/viewmodel/OverviewDimensionsAllVisible.java
@@
-10,20
+10,13
@@
import jalview.datamodel.HiddenSequences;
public class OverviewDimensionsAllVisible extends OverviewDimensions
{
public class OverviewDimensionsAllVisible extends OverviewDimensions
{
- private float pixelsPerCol;
-
- private float pixelsPerSeq;
-
public OverviewDimensionsAllVisible(ViewportRanges ranges,
boolean showAnnotationPanel)
{
super(ranges, showAnnotationPanel);
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
}
@Override
@@
-34,8
+27,8
@@
public class OverviewDimensionsAllVisible extends OverviewDimensions
int x = mousex;
int y = mousey;
int x = mousex;
int y = mousey;
- int alwidth = ranges.getVisibleAlignmentWidth();
- int alheight = ranges.getVisibleAlignmentHeight();
+ alwidth = ranges.getVisibleAlignmentWidth();
+ alheight = ranges.getVisibleAlignmentHeight();
if (x < 0)
{
if (x < 0)
{
@@
-111,8
+104,8
@@
public class OverviewDimensionsAllVisible extends OverviewDimensions
public void setBoxPosition(HiddenSequences hiddenSeqs,
ColumnSelection hiddenCols, ViewportRanges ranges)
{
public void setBoxPosition(HiddenSequences hiddenSeqs,
ColumnSelection 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();
// work with visible values of startRes and endRes
int startRes = ranges.getStartRes();
@@
-152,16
+145,4
@@
public class OverviewDimensionsAllVisible extends OverviewDimensions
return new AllRowsCollection(0,
ranges.getVisibleAlignmentHeight() - 1, al);
}
return new AllRowsCollection(0,
ranges.getVisibleAlignmentHeight() - 1, al);
}
-
- @Override
- public float getPixelsPerCol()
- {
- return pixelsPerCol;
- }
-
- @Override
- public float getPixelsPerSeq()
- {
- return pixelsPerSeq;
- }
}
}
diff --git
a/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
b/src/jalview/viewmodel/OverviewDimensionsWithHidden.java
index
63172bf
..
eff27dd
100644
(file)
--- a/
src/jalview/viewmodel/OverviewDimensionsWithHidden.java
+++ b/
src/jalview/viewmodel/OverviewDimensionsWithHidden.java
@@
-30,10
+30,6
@@
import jalview.datamodel.HiddenSequences;
public class OverviewDimensionsWithHidden extends OverviewDimensions
{
public class OverviewDimensionsWithHidden extends OverviewDimensions
{
- private float pixelsPerCol;
-
- private float pixelsPerSeq;
-
/**
* Create an OverviewDimensions object
*
/**
* Create an OverviewDimensions object
*
@@
-47,11
+43,8
@@
public class OverviewDimensionsWithHidden extends OverviewDimensions
{
super(ranges, showAnnotationPanel);
{
super(ranges, showAnnotationPanel);
- int alwidth = ranges.getAbsoluteAlignmentWidth();
- int alheight = ranges.getAbsoluteAlignmentHeight();
-
- pixelsPerCol = (float) width / alwidth;
- pixelsPerSeq = (float) sequencesHeight / alheight;
+ alwidth = ranges.getAbsoluteAlignmentWidth();
+ alheight = ranges.getAbsoluteAlignmentHeight();
}
/**
}
/**
@@
-76,8
+69,8
@@
public class OverviewDimensionsWithHidden extends OverviewDimensions
int x = mousex;
int y = mousey;
int x = mousex;
int y = mousey;
- int alwidth = ranges.getAbsoluteAlignmentWidth();
- int alheight = ranges.getAbsoluteAlignmentHeight();
+ alwidth = ranges.getAbsoluteAlignmentWidth();
+ alheight = ranges.getAbsoluteAlignmentHeight();
if (x < 0)
{
if (x < 0)
{
@@
-183,8
+176,8
@@
public class OverviewDimensionsWithHidden extends OverviewDimensions
public void setBoxPosition(HiddenSequences hiddenSeqs,
ColumnSelection hiddenCols, ViewportRanges ranges)
{
public void setBoxPosition(HiddenSequences hiddenSeqs,
ColumnSelection hiddenCols, ViewportRanges ranges)
{
- int alwidth = ranges.getAbsoluteAlignmentWidth();
- int alheight = ranges.getAbsoluteAlignmentHeight();
+ alwidth = ranges.getAbsoluteAlignmentWidth();
+ alheight = ranges.getAbsoluteAlignmentHeight();
// work with absolute values of startRes and endRes
int startRes = hiddenCols.adjustForHiddenColumns(ranges.getStartRes());
// work with absolute values of startRes and endRes
int startRes = hiddenCols.adjustForHiddenColumns(ranges.getStartRes());
@@
-226,16
+219,4
@@
public class OverviewDimensionsWithHidden extends OverviewDimensions
ranges.getAbsoluteAlignmentHeight() - 1,
al);
}
ranges.getAbsoluteAlignmentHeight() - 1,
al);
}
-
- @Override
- public float getPixelsPerCol()
- {
- return pixelsPerCol;
- }
-
- @Override
- public float getPixelsPerSeq()
- {
- return pixelsPerSeq;
- }
}
}