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
JAL-4090 JAL-1551 spotlessApply
[jalview.git]
/
src
/
jalview
/
gui
/
IdCanvas.java
diff --git
a/src/jalview/gui/IdCanvas.java
b/src/jalview/gui/IdCanvas.java
index
dbffc72
..
3ee3316
100755
(executable)
--- a/
src/jalview/gui/IdCanvas.java
+++ b/
src/jalview/gui/IdCanvas.java
@@
-256,7
+256,7
@@
public class IdCanvas extends JPanel implements ViewportListenerI
gg.fillRect(0, 0, getWidth(), imgHeight);
drawIds(gg, av, av.getRanges().getStartSeq(),
gg.fillRect(0, 0, getWidth(), imgHeight);
drawIds(gg, av, av.getRanges().getStartSeq(),
- av.getRanges().getEndSeq(), searchResults,true, getWidth());
+ av.getRanges().getEndSeq(), searchResults, true, getWidth());
gg.dispose();
gg.dispose();
@@
-274,12
+274,16
@@
public class IdCanvas extends JPanel implements ViewportListenerI
* @param startSeq
* @param endSeq
* @param selection
* @param startSeq
* @param endSeq
* @param selection
- * @param forGUI when false rendering for print
- * @param panelWidth width used to calculate righthand margin - usually idCanvas.getWidth()
+ * @param forGUI
+ * when false rendering for print
+ * @param panelWidth
+ * width used to calculate righthand margin - usually
+ * idCanvas.getWidth()
*
*/
void drawIds(Graphics2D g, AlignViewport alignViewport,
*
*/
void drawIds(Graphics2D g, AlignViewport alignViewport,
- final int startSeq, final int endSeq, List<SequenceI> selection, boolean forGUI, int panelWidth)
+ final int startSeq, final int endSeq, List<SequenceI> selection,
+ boolean forGUI, int panelWidth)
{
Font font = alignViewport.getFont();
if (alignViewport.isSeqNameItalics())
{
Font font = alignViewport.getFont();
if (alignViewport.isSeqNameItalics())
@@
-307,7
+311,8
@@
public class IdCanvas extends JPanel implements ViewportListenerI
if (alignViewport.getWrapAlignment())
{
if (alignViewport.getWrapAlignment())
{
- drawIdsWrapped(g, alignViewport, startSeq, getHeight(), manuallyAdjusted ? panelWidth : -1,forGUI);
+ drawIdsWrapped(g, alignViewport, startSeq, getHeight(),
+ manuallyAdjusted ? panelWidth : -1, forGUI);
return;
}
return;
}
@@
-390,6
+395,7
@@
public class IdCanvas extends JPanel implements ViewportListenerI
/**
* render sequence IDs and annotation labels when wrapped - without GUI junk
/**
* render sequence IDs and annotation labels when wrapped - without GUI junk
+ *
* @param g
* @param av2
* @param i
* @param g
* @param av2
* @param i
@@
-398,7
+404,7
@@
public class IdCanvas extends JPanel implements ViewportListenerI
public void drawIdsWrappedNoGUI(Graphics2D g, AlignViewport av2, int i,
int totalHeight)
{
public void drawIdsWrappedNoGUI(Graphics2D g, AlignViewport av2, int i,
int totalHeight)
{
- drawIdsWrapped(g, av2, totalHeight, totalHeight, i,false);
+ drawIdsWrapped(g, av2, totalHeight, totalHeight, i, false);
}
public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
}
public void drawIdsWrapped(Graphics2D g, AlignViewport alignViewport,
@@
-419,7
+425,8
@@
public class IdCanvas extends JPanel implements ViewportListenerI
if (alignViewport.isShowAnnotation())
{
// in wrapped mode, no alignPanel reference is available
if (alignViewport.isShowAnnotation())
{
// in wrapped mode, no alignPanel reference is available
- // FIXME: make the renderer not create a new object in wrapped mode everytime!
+ // FIXME: make the renderer not create a new object in wrapped mode
+ // everytime!
labels = new AnnotationLabels(alignViewport);
}
labels = new AnnotationLabels(alignViewport);
}
@@
-457,8
+464,8
@@
public class IdCanvas extends JPanel implements ViewportListenerI
g.translate(0, ypos + (alheight * charHeight));
if (!isManuallyAdjusted())
{
g.translate(0, ypos + (alheight * charHeight));
if (!isManuallyAdjusted())
{
- int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,forGUI,
- null, false);
+ int getAnnotationsIdWidth = labels.drawLabels(g, false, -1, false,
+ forGUI, null, false);
thisIdWidth = idWidth < 0 ? getAnnotationsIdWidth : idWidth;
if (thisIdWidth > getWidth)
{
thisIdWidth = idWidth < 0 ? getAnnotationsIdWidth : idWidth;
if (thisIdWidth > getWidth)
{