X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=c1de259629971a2732213e1fe32035acb77b71e8;hb=cd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0;hp=66bb7a5da4623c670eac5b1a73845a5ed93c3d22;hpb=2a71f039ec3e1fdf9d9b13e4cef388b9c090c29c;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 66bb7a5..c1de259 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -52,8 +52,6 @@ public class AlignViewport extends AlignmentViewport public jalview.bin.JalviewLite applet; - boolean MAC = false; - private AnnotationColumnChooser annotationColumnSelectionState; public AlignViewport(AlignmentI al, JalviewLite applet) @@ -79,14 +77,14 @@ public class AlignViewport extends AlignmentViewport } if (widthScale <= 1.0) { - System.err.println( + jalview.bin.Console.errPrintln( "Invalid alignment character width scaling factor (" + widthScale + "). Ignoring."); widthScale = 1; } if (JalviewLite.debug) { - System.err.println( + jalview.bin.Console.errPrintln( "Alignment character width scaling factor is now " + widthScale); } @@ -102,14 +100,14 @@ public class AlignViewport extends AlignmentViewport } if (heightScale <= 1.0) { - System.err.println( + jalview.bin.Console.errPrintln( "Invalid alignment character height scaling factor (" + heightScale + "). Ignoring."); heightScale = 1; } if (JalviewLite.debug) { - System.err.println( + jalview.bin.Console.errPrintln( "Alignment character height scaling factor is now " + heightScale); } @@ -117,8 +115,6 @@ public class AlignViewport extends AlignmentViewport } setFont(font, true); - MAC = new jalview.util.Platform().isAMac(); - if (applet != null) { setShowJVSuffix( @@ -196,9 +192,8 @@ public class AlignViewport extends AlignmentViewport if (colour != null) { - residueShading = new ResidueShader( - ColourSchemeProperty.getColourScheme(this, alignment, - colour)); + residueShading = new ResidueShader(ColourSchemeProperty + .getColourScheme(this, alignment, colour)); if (residueShading != null) { residueShading.setConsensus(hconsensus); @@ -257,7 +252,7 @@ public class AlignViewport extends AlignmentViewport public void resetSeqLimits(int height) { - ranges.setEndSeq(height / getCharHeight()); + ranges.setEndSeq(height / getCharHeight() - 1); // BH 2019.04.18 } boolean centreColumnLabels; @@ -396,10 +391,10 @@ public class AlignViewport extends AlignmentViewport } /** - * Applies the supplied feature settings descriptor to currently known features. - * This supports an 'initial configuration' of feature colouring based on a - * preset or user favourite. This may then be modified in the usual way using - * the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET + * Applies the supplied feature settings descriptor to currently known + * features. This supports an 'initial configuration' of feature colouring + * based on a preset or user favourite. This may then be modified in the usual + * way using the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET * * @param featureSettings */ @@ -410,10 +405,10 @@ public class AlignViewport extends AlignmentViewport } /** - * Merges the supplied feature settings descriptor with existing feature styles. - * This supports an 'initial configuration' of feature colouring based on a - * preset or user favourite. This may then be modified in the usual way using - * the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET + * Merges the supplied feature settings descriptor with existing feature + * styles. This supports an 'initial configuration' of feature colouring based + * on a preset or user favourite. This may then be modified in the usual way + * using the Feature Settings dialogue. NOT IMPLEMENTED FOR APPLET * * @param featureSettings */