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
Removed to reduce jar size
[jalview.git]
/
src
/
jalview
/
gui
/
RotatableCanvas.java
diff --git
a/src/jalview/gui/RotatableCanvas.java
b/src/jalview/gui/RotatableCanvas.java
index
3fcfd3d
..
632b284
100755
(executable)
--- a/
src/jalview/gui/RotatableCanvas.java
+++ b/
src/jalview/gui/RotatableCanvas.java
@@
-74,6
+74,8
@@
public class RotatableCanvas extends JPanel implements MouseListener,
int recty2;
\r
float scalefactor = 1;
\r
AlignViewport av;
\r
int recty2;
\r
float scalefactor = 1;
\r
AlignViewport av;
\r
+ boolean showLabels = false;
\r
+ Color bgColour = Color.black;
\r
\r
// Controller controller;
\r
public RotatableCanvas(AlignViewport av)
\r
\r
// Controller controller;
\r
public RotatableCanvas(AlignViewport av)
\r
@@
-81,6
+83,12
@@
public class RotatableCanvas extends JPanel implements MouseListener,
this.av = av;
\r
}
\r
\r
this.av = av;
\r
}
\r
\r
+ public void showLabels(boolean b)
\r
+ {
\r
+ showLabels = b;
\r
+ repaint();
\r
+ }
\r
+
\r
public void setPoints(Vector points, int npoint)
\r
{
\r
this.points = points;
\r
public void setPoints(Vector points, int npoint)
\r
{
\r
this.points = points;
\r
@@
-295,8
+303,13
@@
public class RotatableCanvas extends JPanel implements MouseListener,
*
\r
* @param g DOCUMENT ME!
\r
*/
\r
*
\r
* @param g DOCUMENT ME!
\r
*/
\r
- public void paintComponent(Graphics g)
\r
+ public void paintComponent(Graphics g1)
\r
{
\r
{
\r
+
\r
+ Graphics2D g = (Graphics2D) g1;
\r
+
\r
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
\r
+ RenderingHints.VALUE_ANTIALIAS_ON);
\r
if(points==null)
\r
{
\r
g.setFont(new Font("Verdana", Font.PLAIN, 18));
\r
if(points==null)
\r
{
\r
g.setFont(new Font("Verdana", Font.PLAIN, 18));
\r
@@
-318,7
+331,8
@@
public class RotatableCanvas extends JPanel implements MouseListener,
ig = img.getGraphics();
\r
}
\r
\r
ig = img.getGraphics();
\r
}
\r
\r
- drawBackground(ig, Color.black);
\r
+
\r
+ drawBackground(ig, bgColour);
\r
drawScene(ig);
\r
\r
if (drawAxes == true)
\r
drawScene(ig);
\r
\r
if (drawAxes == true)
\r
@@
-337,6
+351,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
*/
\r
public void drawAxes(Graphics g)
\r
{
\r
*/
\r
public void drawAxes(Graphics g)
\r
{
\r
+
\r
g.setColor(Color.yellow);
\r
\r
for (int i = 0; i < 3; i++)
\r
g.setColor(Color.yellow);
\r
\r
for (int i = 0; i < 3; i++)
\r
@@
-364,9
+379,14
@@
public class RotatableCanvas extends JPanel implements MouseListener,
*
\r
* @param g DOCUMENT ME!
\r
*/
\r
*
\r
* @param g DOCUMENT ME!
\r
*/
\r
- public void drawScene(Graphics g)
\r
+ public void drawScene(Graphics g1)
\r
{
\r
{
\r
- boolean darker = false;
\r
+
\r
+ Graphics2D g = (Graphics2D) g1;
\r
+
\r
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
\r
+ RenderingHints.VALUE_ANTIALIAS_ON);
\r
+
\r
\r
int halfwidth = getWidth() / 2;
\r
int halfheight = getHeight() / 2;
\r
\r
int halfwidth = getWidth() / 2;
\r
int halfheight = getHeight() / 2;
\r
@@
-404,7
+424,13
@@
public class RotatableCanvas extends JPanel implements MouseListener,
}
\r
\r
g.fillRect(x - 3, y - 3, 6, 6);
\r
}
\r
\r
g.fillRect(x - 3, y - 3, 6, 6);
\r
- g.setColor(Color.red);
\r
+ if(showLabels)
\r
+ {
\r
+ g.setColor(Color.red);
\r
+ g.drawString( ( (SequencePoint) points.elementAt(i)).sequence.
\r
+ getName(),
\r
+ x - 3, y - 4);
\r
+ }
\r
}
\r
\r
// //Now the rectangle
\r
}
\r
\r
// //Now the rectangle
\r