Font font;\r
int fontSize = 12;\r
\r
+ boolean fitToWindow = true;\r
boolean showDistances = false;\r
boolean showBootstrap = false;\r
\r
int offx = 20;\r
int offy = 20;\r
\r
- int threshold;\r
+ float threshold;\r
\r
String longestName;\r
int labelLength=-1;\r
\r
//RubberbandRectangle rubberband;\r
\r
- Selection selected;\r
Vector listeners;\r
\r
Hashtable nameHash = new Hashtable();\r
{\r
this.av = av;\r
this.tree = tree;\r
- selected = av.getSelection();\r
scrollPane = scroller;\r
addMouseListener(this);\r
tree.findHeight(tree.getTopNode());\r
}\r
public void TreeSelectionChanged(Sequence sequence)\r
{\r
- selected = av.getSelection();\r
+ SequenceGroup selected = av.getSelectionGroup();\r
+ if(selected == null)\r
+ {\r
+ selected = new SequenceGroup();\r
+ av.setSelectionGroup(selected);\r
+ }\r
+\r
+ selected.setEndRes(av.alignment.getWidth());\r
+ selected.addOrRemove(sequence);\r
\r
- if (selected.contains(sequence))\r
- selected.removeElement(sequence);\r
- else\r
- selected.addElement(sequence);\r
\r
- setSelected(selected);\r
PaintRefresher.Refresh(this);\r
repaint();\r
}\r
\r
\r
- public void setSelected(Selection selected)\r
- {\r
- this.selected = selected;\r
- }\r
\r
public void setTree(NJTree tree) {\r
this.tree = tree;\r
\r
nameHash.put((SequenceI)node.element(),rect);\r
\r
- if (selected.contains((SequenceI)node.element())) {\r
+ SequenceGroup selected = av.getSelectionGroup();\r
+ if (selected!=null && selected.sequences.contains((SequenceI)node.element())) {\r
g.setColor(Color.gray);\r
\r
g.fillRect(xend + 10, ypos - charHeight + 3,charWidth,charHeight);\r
\r
}\r
\r
- public void pickNodes(Rectangle pickBox, Selection sel) {\r
+ public void pickNodes(Rectangle pickBox) {\r
int width = getWidth();\r
int height = getHeight();\r
\r
}\r
float chunk = (float)(height-offy*2)/top.count;\r
\r
- pickNode(pickBox,sel,top,chunk,wscale,width,offx,offy);\r
+ pickNode(pickBox,top,chunk,wscale,width,offx,offy);\r
}\r
\r
- public void pickNode(Rectangle pickBox, Selection sel, SequenceNode node, float chunk, float scale, int width,int offx, int offy) {\r
+ public void pickNode(Rectangle pickBox, SequenceNode node, float chunk, float scale, int width,int offx, int offy) {\r
if (node == null) {\r
return;\r
}\r
if (pickBox.contains(new Point(xend,ypos))) {\r
if (node.element() instanceof SequenceI) {\r
SequenceI seq = (SequenceI)node.element();\r
- if (sel.contains(seq)) {\r
- sel.removeElement(seq);\r
- } else {\r
- sel.addElement(seq);\r
- }\r
+ SequenceGroup sg = av.getSelectionGroup();\r
+ if(sg!=null)\r
+ sg.addOrRemove(seq);\r
}\r
}\r
} else {\r
- pickNode(pickBox,sel,(SequenceNode)node.left(), chunk,scale,width,offx,offy);\r
- pickNode(pickBox,sel,(SequenceNode)node.right(),chunk,scale,width,offx,offy);\r
+ pickNode(pickBox,(SequenceNode)node.left(), chunk,scale,width,offx,offy);\r
+ pickNode(pickBox,(SequenceNode)node.right(),chunk,scale,width,offx,offy);\r
}\r
}\r
\r
\r
public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException\r
{\r
- font = new Font("Verdana",Font.PLAIN,fontSize);\r
pg.setFont(font);\r
FontMetrics fm = pg.getFontMetrics(font);\r
\r
\r
public void paintComponent(Graphics g)\r
{\r
+\r
font = new Font("Verdana",Font.PLAIN,fontSize);\r
g.setFont(font);\r
\r
repaint();\r
\r
\r
- if( scrollPane.getHeight() > fm.getHeight() * nameHash.size()+offy)\r
+ if( fitToWindow || (!fitToWindow && scrollPane.getHeight() > fm.getHeight() * nameHash.size()+offy ) )\r
{\r
draw(g,scrollPane.getWidth(),scrollPane.getHeight());\r
- setPreferredSize(new Dimension(scrollPane.getWidth(), scrollPane.getHeight()));\r
+ setPreferredSize(null);\r
}\r
else\r
{\r
- setPreferredSize(new Dimension(getWidth(), fm.getHeight() * nameHash.size()));\r
- draw( g,getWidth(), fm.getHeight() * nameHash.size());\r
+ setPreferredSize(new Dimension(scrollPane.getWidth(), fm.getHeight() * nameHash.size()));\r
+ draw( g,scrollPane.getWidth(), fm.getHeight() * nameHash.size());\r
}\r
\r
\r
if (threshold != 0)\r
{\r
+ if(av.getCurrentTree() == tree)\r
g.setColor(Color.red);\r
- g.drawLine(threshold,0,threshold,getHeight());\r
+ else\r
+ g.setColor(Color.gray);\r
+\r
+ int x = (int)( threshold * (float)(getWidth()-labelLength - 2*offx) +offx ) ;\r
+\r
+ g.drawLine(x,0,x,getHeight());\r
}\r
\r
scrollPane.revalidate();\r
}\r
\r
public void mousePressed(MouseEvent e) {\r
+\r
+ av.setCurrentTree(tree);\r
+\r
int x = e.getX();\r
int y = e.getY();\r
\r
// Find threshold\r
\r
if (tree.getMaxHeight() != 0) {\r
- float fthreshold = (float)(x - offx)/(float)(getWidth()-labelLength - 2*offx);\r
- this.threshold = x;\r
+ threshold = (float)(x - offx)/(float)(getWidth()-labelLength - 2*offx);\r
+\r
tree.getGroups().removeAllElements();\r
- tree.groupNodes(tree.getTopNode(),fthreshold);\r
+ tree.groupNodes(tree.getTopNode(),threshold);\r
setColor(tree.getTopNode(),Color.black);\r
\r
- av.sel.clear();\r
+ av.setSelectionGroup(null);\r
av.alignment.deleteAllGroups();\r
\r
for (int i=0; i < tree.getGroups().size(); i++)\r
{\r
SequenceNode sn = (SequenceNode) l.elementAt(j);\r
if(sg==null)\r
- sg = new SequenceGroup("TreeGroup", av.getGlobalColourScheme(), true, true,false,0,av.alignment.getWidth());\r
+ sg = new SequenceGroup("TreeGroup", av.getGlobalColourScheme(), true, true,false,0,av.alignment.getWidth());\r
\r
sg.addSequence( (Sequence) sn.element());\r
}\r
sg.getEndRes());\r
\r
c.calculate();\r
- c.verdict(false, 100);\r
+ c.verdict(false, av.ConsPercGaps);\r
ccs = new ConservationColourScheme(c, ccs.cs);\r
\r
sg.cs = ccs;\r
git://source.jalview.org / jalview.git / blobdiff