X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=9fa7491cfa4e9daf6314bbbca93bd4425e7a20b2;hb=8c2ee75d86492f03e4c01404855f9ad2dd305719;hp=25754cd939ecffb9ff89b95f078b4aefd0a854b0;hpb=74e53831a61cb5c3d342fa302cd2cd8d16eacf7b;p=jalview.git diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java index 25754cd..9fa7491 100755 --- a/src/jalview/appletgui/RotatableCanvas.java +++ b/src/jalview/appletgui/RotatableCanvas.java @@ -32,8 +32,6 @@ public class RotatableCanvas extends Panel implements MouseListener, MouseMotionListener, KeyListener -//RubberbandListener, -//SequenceSelectionListener { RotatableMatrix idmat = new RotatableMatrix(3, 3); RotatableMatrix objmat = new RotatableMatrix(3, 3); @@ -82,17 +80,19 @@ public class RotatableCanvas float scalefactor = 1; AlignViewport av; -// Controller controller; + public RotatableCanvas(AlignViewport av) + { + this.av = av; + } - public RotatableCanvas(AlignViewport av, - Vector points, int npoint) + public void setPoints(Vector points, int npoint) { this.points = points; this.npoint = npoint; this.av = av; PaintRefresher.Register(this, av.alignment); -// + prefsize = getPreferredSize(); orig = new float[npoint][3]; @@ -287,29 +287,38 @@ public class RotatableCanvas public void paint(Graphics g) { - //Only create the image at the beginning - - if ( (img == null) || (prefsize.width != getSize().width) || - (prefsize.height != getSize().height)) + if (points == null) + { + g.setFont(new Font("Verdana", Font.PLAIN, 18)); + g.drawString("Calculating PCA....", 20, getSize().height / 2); + } + else { - prefsize.width = getSize().width; - prefsize.height = getSize().height; - scale = findScale(); + //Only create the image at the beginning - + if ( (img == null) || (prefsize.width != getSize().width) || + (prefsize.height != getSize().height)) + { + prefsize.width = getSize().width; + prefsize.height = getSize().height; - // System.out.println("New scale = " + scale); - img = createImage(getSize().width, getSize().height); - ig = img.getGraphics(); + scale = findScale(); - } + // System.out.println("New scale = " + scale); + img = createImage(getSize().width, getSize().height); + ig = img.getGraphics(); - drawBackground(ig, Color.black); - drawScene(ig); - if (drawAxes == true) - { - drawAxes(ig); - } + } - g.drawImage(img, 0, 0, this); + drawBackground(ig, Color.black); + drawScene(ig); + if (drawAxes == true) + { + drawAxes(ig); + } + + g.drawImage(img, 0, 0, this); + } } public void drawAxes(Graphics g)