From: James Procter Date: Wed, 6 Dec 2023 13:48:54 +0000 (+0000) Subject: Merge branch 'bug/JAL-2934proportionalScrolling' into develop X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2f09be746416f434aeccbb2d0233df7931afa582 Merge branch 'bug/JAL-2934proportionalScrolling' into develop --- 2f09be746416f434aeccbb2d0233df7931afa582 diff --cc src/jalview/gui/AlignmentPanel.java index d3f80ce,77a76fd..8e7c745 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@@ -42,35 -62,9 +42,36 @@@ import java.io.FileWriter import java.io.PrintWriter; import java.util.List; + import javax.swing.BoundedRangeModel; import javax.swing.SwingUtilities; +import jalview.analysis.AnnotationSorter; +import jalview.api.AlignViewportI; +import jalview.api.AlignmentViewPanel; +import jalview.bin.Cache; +import jalview.bin.Console; +import jalview.bin.Jalview; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.SearchResultsI; +import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; +import jalview.gui.ImageExporter.ImageWriterI; +import jalview.io.HTMLOutput; +import jalview.io.exceptions.ImageOutputException; +import jalview.jbgui.GAlignmentPanel; +import jalview.math.AlignmentDimension; +import jalview.schemes.ResidueProperties; +import jalview.structure.StructureSelectionManager; +import jalview.util.Comparison; +import jalview.util.ImageMaker; +import jalview.util.MessageManager; +import jalview.util.imagemaker.BitmapImageSizing; +import jalview.viewmodel.ViewportListenerI; +import jalview.viewmodel.ViewportRanges; + /** * DOCUMENT ME! *