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-1517 source formatting
[jalview.git]
/
src
/
jalview
/
appletgui
/
AlignmentPanel.java
diff --git
a/src/jalview/appletgui/AlignmentPanel.java
b/src/jalview/appletgui/AlignmentPanel.java
index
fd03e30
..
a677eff
100644
(file)
--- a/
src/jalview/appletgui/AlignmentPanel.java
+++ b/
src/jalview/appletgui/AlignmentPanel.java
@@
-435,7
+435,9
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
- } else {
+ }
+ else
+ {
annotationSpaceFillerHolder.setVisible(false);
annotationPanelHolder.setVisible(false);
}
annotationSpaceFillerHolder.setVisible(false);
annotationPanelHolder.setVisible(false);
}
@@
-486,10
+488,12
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
if (adjustPanelHeight)
{
if (adjustPanelHeight)
{
- // NOTE: this logic is different in the application. Need a better algorithm to define behaviour
+ // NOTE: this logic is different in the application. Need a better
+ // algorithm to define behaviour
// sets initial preferred height
// try and set height according to alignment
// sets initial preferred height
// try and set height according to alignment
- float sscaling = (float) ((av.getCharHeight() * av.getAlignment().getHeight())/(1.0*mheight));
+ float sscaling = (float) ((av.getCharHeight() * av.getAlignment()
+ .getHeight()) / (1.0 * mheight));
if (sscaling > 0.5)
{
// if the alignment is too big then
if (sscaling > 0.5)
{
// if the alignment is too big then
@@
-498,7
+502,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
}
else
{
}
else
{
- // otherwise just set the panel so that one row of sequence is visible
+ // otherwise just set the panel so that one row of sequence is visible
height = -av.getCharHeight() * 1
+ (int) (seqandannot * (1 - sscaling));
}
height = -av.getCharHeight() * 1
+ (int) (seqandannot * (1 - sscaling));
}
@@
-549,7
+553,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
}
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
}
-
+
idSpaceFillerPanel1.setVisible(!wrap);
fontChanged(); // This is so that the scalePanel is resized correctly
idSpaceFillerPanel1.setVisible(!wrap);
fontChanged(); // This is so that the scalePanel is resized correctly
@@
-825,7
+829,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
seqPanel.seqCanvas.repaint();
idPanel.idCanvas.repaint();
seqPanel.seqCanvas.repaint();
idPanel.idCanvas.repaint();
- if (!av.wrapAlignment)
+ if (!av.wrapAlignment)
{
if (av.showAnnotation)
{
{
if (av.showAnnotation)
{
@@
-834,7
+838,7
@@
public class AlignmentPanel extends Panel implements AdjustmentListener,
}
scalePanel.repaint();
}
}
scalePanel.repaint();
}
-
+
}
protected Panel sequenceHolderPanel = new Panel();
}
protected Panel sequenceHolderPanel = new Panel();