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-3239 draw EPS or SVG one character at a time (even monospaced)
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
11ee700
..
1176df5
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-255,11
+255,6
@@
public class SeqPanel extends JPanel
int wrappedBlock = -1;
int wrappedBlock = -1;
- MousePos findMousePosition(MouseEvent evt)
- {
- return findMousePosition(evt, null);
- }
-
/**
* Computes the column and sequence row (and possibly annotation row when in
* wrapped mode) for the given mouse position
/**
* Computes the column and sequence row (and possibly annotation row when in
* wrapped mode) for the given mouse position
@@
-267,22
+262,15
@@
public class SeqPanel extends JPanel
* @param evt
* @return
*/
* @param evt
* @return
*/
- MousePos findMousePosition(MouseEvent evt, String debug)
+ MousePos findMousePosition(MouseEvent evt)
{
{
- int col = findColumn(evt, debug);
+ int col = findColumn(evt);
int seqIndex = -1;
int annIndex = -1;
int y = evt.getY();
int charHeight = av.getCharHeight();
int alignmentHeight = av.getAlignment().getHeight();
int seqIndex = -1;
int annIndex = -1;
int y = evt.getY();
int charHeight = av.getCharHeight();
int alignmentHeight = av.getAlignment().getHeight();
- if (debug != null)
- {
- System.out.println(String.format(
- "%s: charHeight %d alHeight %d canvasWidth %d canvasHeight %d",
- debug, charHeight, alignmentHeight, seqCanvas.getWidth(),
- seqCanvas.getHeight()));
- }
if (av.getWrapAlignment())
{
seqCanvas.calculateWrappedGeometry(seqCanvas.getWidth(),
if (av.getWrapAlignment())
{
seqCanvas.calculateWrappedGeometry(seqCanvas.getWidth(),
@@
-343,11
+331,6
@@
public class SeqPanel extends JPanel
*/
int findColumn(MouseEvent evt)
{
*/
int findColumn(MouseEvent evt)
{
- return findColumn(evt, null);
- }
-
- int findColumn(MouseEvent evt, String debug)
- {
int res = 0;
int x = evt.getX();
int res = 0;
int x = evt.getX();
@@
-368,12
+351,6
@@
public class SeqPanel extends JPanel
int y = evt.getY();
y = Math.max(0, y - hgap);
x -= seqCanvas.getLabelWidthWest();
int y = evt.getY();
y = Math.max(0, y - hgap);
x -= seqCanvas.getLabelWidthWest();
- if (debug != null)
- {
- System.out.println(
- String.format("%s: x %d labelWest %d charWidth %d ", debug,
- x, seqCanvas.getLabelWidthWest(), charWidth));
- }
if (x < 0)
{
// mouse is over left scale
if (x < 0)
{
// mouse is over left scale
@@
-387,10
+364,6
@@
public class SeqPanel extends JPanel
}
if (x >= cwidth * charWidth)
{
}
if (x >= cwidth * charWidth)
{
- if (debug != null)
- {
- System.out.println(debug + ": cwidth = " + cwidth);
- }
// mouse is over right scale
return -1;
}
// mouse is over right scale
return -1;
}