git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update HtmlSvgOutput to ignore browser invocation when running in headless mode
[jalview.git]
/
src
/
jalview
/
gui
/
SeqCanvas.java
diff --git
a/src/jalview/gui/SeqCanvas.java
b/src/jalview/gui/SeqCanvas.java
index
8b7f93a
..
54abcc2
100755
(executable)
--- a/
src/jalview/gui/SeqCanvas.java
+++ b/
src/jalview/gui/SeqCanvas.java
@@
-258,16
+258,11
@@
public class SeqCanvas extends JComponent
*/
public void fastPaint(int horizontal, int vertical)
{
*/
public void fastPaint(int horizontal, int vertical)
{
- if (fastpainting)
+ if (fastpainting || gg == null)
{
return;
}
fastpainting = true;
{
return;
}
fastpainting = true;
- if (gg == null)
- {
- return;
- }
-
fastPaint = true;
gg.copyArea(horizontal * av.charWidth, vertical * av.charHeight,
fastPaint = true;
gg.copyArea(horizontal * av.charWidth, vertical * av.charHeight,
@@
-578,7
+573,7
@@
public class SeqCanvas extends JComponent
drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);
drawPanel(g, startRes, endx, 0, al.getHeight(), ypos);
- if (av.showAnnotation)
+ if (av.isShowAnnotation())
{
g.translate(0, cHeight + ypos + 3);
if (annotations == null)
{
g.translate(0, cHeight + ypos + 3);
if (annotations == null)
@@
-603,7
+598,7
@@
public class SeqCanvas extends JComponent
int getAnnotationHeight()
{
int getAnnotationHeight()
{
- if (!av.showAnnotation)
+ if (!av.isShowAnnotation())
{
return 0;
}
{
return 0;
}
@@
-632,7
+627,8
@@
public class SeqCanvas extends JComponent
* @param offset
* DOCUMENT ME!
*/
* @param offset
* DOCUMENT ME!
*/
- void drawPanel(Graphics g1, int startRes, int endRes, int startSeq,
+ public void drawPanel(Graphics g1, int startRes, int endRes,
+ int startSeq,
int endSeq, int offset)
{
if (!av.hasHiddenColumns())
int endSeq, int offset)
{
if (!av.hasHiddenColumns())