X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=600683fc841a36f8e3329ffc3da6a43fec9bce90;hb=ac07859006686a2c62bcf57b24742eb610bc46f0;hp=9435716e3cf9c63f75416d81cb5c5ece259a8dfe;hpb=ee2fab02e829035b825cea4046266a6994978b96;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index 9435716..600683f 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -27,7 +27,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print int offx = 20; int offy = 20; - int threshold; + float threshold; String longestName; int labelLength=-1; @@ -342,8 +342,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print if (threshold != 0) { + if(av.getCurrentTree() == tree) g.setColor(Color.red); - g.drawLine(threshold,0,threshold,getHeight()); + else + g.setColor(Color.gray); + + int x = (int)( threshold * (float)(getWidth()-labelLength - 2*offx) +offx ) ; + + g.drawLine(x,0,x,getHeight()); } scrollPane.revalidate(); @@ -381,6 +387,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print } public void mousePressed(MouseEvent e) { + + av.setCurrentTree(tree); + int x = e.getX(); int y = e.getY(); @@ -401,10 +410,10 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print // Find threshold if (tree.getMaxHeight() != 0) { - float fthreshold = (float)(x - offx)/(float)(getWidth()-labelLength - 2*offx); - this.threshold = x; + threshold = (float)(x - offx)/(float)(getWidth()-labelLength - 2*offx); + tree.getGroups().removeAllElements(); - tree.groupNodes(tree.getTopNode(),fthreshold); + tree.groupNodes(tree.getTopNode(),threshold); setColor(tree.getTopNode(),Color.black); av.setSelectionGroup(null); @@ -438,7 +447,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print sg.getEndRes()); c.calculate(); - c.verdict(false, 100); + c.verdict(false, av.ConsPercGaps); ccs = new ConservationColourScheme(c, ccs.cs); sg.cs = ccs;