git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b02e2d7
3f03cc8
)
Merge branch 'feature/JAL-2664' into feature/JAL-2527
author
kiramt
<k.mourao@dundee.ac.uk>
Wed, 30 Aug 2017 07:11:40 +0000
(08:11 +0100)
committer
kiramt
<k.mourao@dundee.ac.uk>
Wed, 30 Aug 2017 07:11:40 +0000
(08:11 +0100)
1
2
src/jalview/api/AlignmentColsCollectionI.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/api/AlignmentRowsCollectionI.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/datamodel/AllColsCollection.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/datamodel/AllRowsCollection.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/datamodel/VisibleColsCollection.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/datamodel/VisibleRowsCollection.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/renderer/OverviewRenderer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/jalview/api/AlignmentColsCollectionI.java
Simple merge
diff --cc
src/jalview/api/AlignmentRowsCollectionI.java
Simple merge
diff --cc
src/jalview/datamodel/AllColsCollection.java
Simple merge
diff --cc
src/jalview/datamodel/AllRowsCollection.java
index
9a33094
,
c52cebf
..
10c47f0
---
1
/
src/jalview/datamodel/AllRowsCollection.java
---
2
/
src/jalview/datamodel/AllRowsCollection.java
+++ b/
src/jalview/datamodel/AllRowsCollection.java
@@@
-59,4
-59,11
+59,10
@@@
public class AllRowsCollection implemen
{
return alignment.getSequenceAtAbsoluteIndex(seq);
}
+
+ @Override
+ public boolean hasHidden()
+ {
+ return (hidden.getSize() > 0);
+ }
}
-
diff --cc
src/jalview/datamodel/VisibleColsCollection.java
Simple merge
diff --cc
src/jalview/datamodel/VisibleRowsCollection.java
index
ee0557f
,
3119017
..
fd7cf47
---
1
/
src/jalview/datamodel/VisibleRowsCollection.java
---
2
/
src/jalview/datamodel/VisibleRowsCollection.java
+++ b/
src/jalview/datamodel/VisibleRowsCollection.java
@@@
-56,4
-56,11
+56,10
@@@
public class VisibleRowsCollection impl
{
return alignment.getSequenceAtAbsoluteIndex(seq);
}
+
+ @Override
+ public boolean hasHidden()
+ {
+ return false;
+ }
}
-
diff --cc
src/jalview/renderer/OverviewRenderer.java
index
0f8cda6
,
1fb2d89
..
2f8f5fe
---
1
/
src/jalview/renderer/OverviewRenderer.java
---
2
/
src/jalview/renderer/OverviewRenderer.java
+++ b/
src/jalview/renderer/OverviewRenderer.java
@@@
-102,11
-106,12
+106,11
@@@
public class OverviewRendere
{
break;
}
-
+
// calculate where this column extends to in pixels
- int endCol = Math.min(
- Math.round((colIndex + 1) * pixelsPerCol) - 1,
+ int endCol = Math.min(Math.round((colIndex + 1) * pixelsPerCol) - 1,
miniMe.getWidth() - 1);
-
+
// don't do expensive colour determination if we're not going to use it
// NB this is important to avoid performance issues in the overview
// panel