git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e1435f3
)
JAL-4045 - don't apply distribution dependent scale factor to the axis lines!
author
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 20 Jul 2022 14:44:03 +0000
(15:44 +0100)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 20 Jul 2022 14:44:03 +0000
(15:44 +0100)
src/jalview/gui/RotatableCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/RotatableCanvas.java
b/src/jalview/gui/RotatableCanvas.java
index
d695ebb
..
ef0b2aa
100755
(executable)
--- a/
src/jalview/gui/RotatableCanvas.java
+++ b/
src/jalview/gui/RotatableCanvas.java
@@
-20,17
+20,6
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.api.RotatableCanvasI;
-import jalview.datamodel.Point;
-import jalview.datamodel.SequenceGroup;
-import jalview.datamodel.SequenceI;
-import jalview.datamodel.SequencePoint;
-import jalview.math.RotatableMatrix;
-import jalview.math.RotatableMatrix.Axis;
-import jalview.util.ColorUtils;
-import jalview.util.MessageManager;
-import jalview.viewmodel.AlignmentViewport;
-
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
@@
-53,6
+42,17
@@
import java.util.List;
import javax.swing.JPanel;
import javax.swing.ToolTipManager;
import javax.swing.JPanel;
import javax.swing.ToolTipManager;
+import jalview.api.RotatableCanvasI;
+import jalview.datamodel.Point;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.datamodel.SequencePoint;
+import jalview.math.RotatableMatrix;
+import jalview.math.RotatableMatrix.Axis;
+import jalview.util.ColorUtils;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+
/**
* Models a Panel on which a set of points, and optionally x/y/z axes, can be
* drawn, and rotated or zoomed with the mouse
/**
* Models a Panel on which a set of points, and optionally x/y/z axes, can be
* drawn, and rotated or zoomed with the mouse
@@
-322,16
+322,16
@@
public class RotatableCanvas extends JPanel
int midX = getWidth() / 2;
int midY = getHeight() / 2;
int midX = getWidth() / 2;
int midY = getHeight() / 2;
- float maxWidth = Math.max(Math.abs(seqMax[0] - seqMin[0]),
- Math.abs(seqMax[1] - seqMin[1]));
+ // float maxWidth = Math.max(Math.abs(seqMax[0] - seqMin[0]),
+ // Math.abs(seqMax[1] - seqMin[1]));
int pix = Math.min(getWidth(), getHeight());
int pix = Math.min(getWidth(), getHeight());
- float scaleBy = pix * getScaleFactor() / (2f * maxWidth);
+ float scaleBy = pix * getScaleFactor() / (2f);
for (int i = 0; i < DIMS; i++)
{
g.drawLine(midX, midY,
for (int i = 0; i < DIMS; i++)
{
g.drawLine(midX, midY,
- midX + (int) (getAxisEndPoints()[i].x * scaleBy * seqMax[0]),
- midY + (int) (getAxisEndPoints()[i].y * scaleBy * seqMax[1]));
+ midX + (int) (getAxisEndPoints()[i].x * scaleBy * 0.25),
+ midY + (int) (getAxisEndPoints()[i].y * scaleBy * 0.25));
}
}
}
}