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
Merge branch 'JAL-1422_srs' into JAL-1422_srs_r281
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
b4647ae
..
4a679b6
100644
(file)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-485,7
+485,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
return false;
}
return false;
}
- //fastPaint = false;
+ fastPaint = false;
vscroll.setValue(vscroll.getValue() - 1);
}
else
vscroll.setValue(vscroll.getValue() - 1);
}
else
@@
-495,11
+495,11
@@
public class AlignmentPanel extends GAlignmentPanel implements
return false;
}
return false;
}
- //fastPaint = false;
+ fastPaint = false;
vscroll.setValue(vscroll.getValue() + 1);
}
vscroll.setValue(vscroll.getValue() + 1);
}
- //fastPaint = true;
+ fastPaint = true;
return true;
}
return true;
}
@@
-521,7
+521,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
return false;
}
return false;
}
- //fastPaint = false;
+ fastPaint = false;
hscroll.setValue(hscroll.getValue() - 1);
}
else
hscroll.setValue(hscroll.getValue() - 1);
}
else
@@
-531,11
+531,11
@@
public class AlignmentPanel extends GAlignmentPanel implements
return false;
}
return false;
}
- //fastPaint = false;
+ fastPaint = false;
hscroll.setValue(hscroll.getValue() + 1);
}
hscroll.setValue(hscroll.getValue() + 1);
}
- //fastPaint = true;
+ fastPaint = true;
return true;
}
return true;
}
@@
-688,7
+688,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
scalePanel.repaint();
- if (av.getShowAnnotation())
+ if (av.getShowAnnotation() && scrollX!=0)
{
annotationPanel.fastPaint(scrollX);
}
{
annotationPanel.fastPaint(scrollX);
}
@@
-1094,7
+1094,9
@@
public class AlignmentPanel extends GAlignmentPanel implements
void makeAlignmentImage(int type, File file)
{
long progress = System.currentTimeMillis();
void makeAlignmentImage(int type, File file)
{
long progress = System.currentTimeMillis();
- if (alignFrame != null)
+ boolean headless = (System.getProperty("java.awt.headless") != null
+ && System.getProperty("java.awt.headless").equals("true"));
+ if (alignFrame != null && !headless)
{
alignFrame.setProgressBar("Saving "
+ (type == jalview.util.ImageMaker.PNG ? "PNG image"
{
alignFrame.setProgressBar("Saving "
+ (type == jalview.util.ImageMaker.PNG ? "PNG image"
@@
-1115,8
+1117,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (av.getWrapAlignment())
{
height = getWrappedHeight();
if (av.getWrapAlignment())
{
height = getWrappedHeight();
- if (System.getProperty("java.awt.headless") != null
- && System.getProperty("java.awt.headless").equals("true"))
+ if (headless)
{
// need to obtain default alignment width and then add in any
// additional allowance for id margin
{
// need to obtain default alignment width and then add in any
// additional allowance for id margin
@@
-1184,7
+1185,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
}
} finally
{
}
} finally
{
- if (alignFrame != null)
+ if (alignFrame != null && !headless)
{
alignFrame.setProgressBar("Export complete.", progress);
}
{
alignFrame.setProgressBar("Export complete.", progress);
}