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
Multiple Views
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
70aeb60
..
a9c3ae0
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-49,6
+49,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
NJTree tree;
\r
JScrollPane scrollPane;
\r
AlignViewport av;
\r
NJTree tree;
\r
JScrollPane scrollPane;
\r
AlignViewport av;
\r
+ AlignmentPanel ap;
\r
Font font;
\r
FontMetrics fm;
\r
boolean fitToWindow = true;
\r
Font font;
\r
FontMetrics fm;
\r
boolean fitToWindow = true;
\r
@@
-73,14
+74,15
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
* @param scroller DOCUMENT ME!
\r
* @param label DOCUMENT ME!
\r
*/
\r
* @param scroller DOCUMENT ME!
\r
* @param label DOCUMENT ME!
\r
*/
\r
- public TreeCanvas(AlignViewport av, JScrollPane scroller)
\r
+ public TreeCanvas(AlignmentPanel ap, JScrollPane scroller)
\r
{
\r
{
\r
- this.av = av;
\r
+ this.av = ap.av;
\r
+ this.ap = ap;
\r
font = av.getFont();
\r
scrollPane = scroller;
\r
addMouseListener(this);
\r
addMouseMotionListener(this);
\r
font = av.getFont();
\r
scrollPane = scroller;
\r
addMouseListener(this);
\r
addMouseMotionListener(this);
\r
- PaintRefresher.Register(this, av.alignment);
\r
+ PaintRefresher.Register(this, ap.av.getSequenceSetId());
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-680,7
+682,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
}
\r
}
\r
\r
}
\r
}
\r
\r
- PaintRefresher.Refresh(this, av.alignment);
\r
+ PaintRefresher.Refresh(this, av.getSequenceSetId());
\r
repaint();
\r
}
\r
}
\r
repaint();
\r
}
\r
}
\r
@@
-728,7
+730,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceI)
\r
{
\r
treeSelectionChanged( (Sequence) ob);
\r
if (ob instanceof SequenceI)
\r
{
\r
treeSelectionChanged( (Sequence) ob);
\r
- PaintRefresher.Refresh(this, av.alignment);
\r
+ PaintRefresher.Refresh(this, ap.av.getSequenceSetId());
\r
repaint();
\r
return;
\r
}
\r
repaint();
\r
return;
\r
}
\r
@@
-750,7
+752,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
colourGroups();
\r
}
\r
\r
colourGroups();
\r
}
\r
\r
- PaintRefresher.Refresh(this, av.alignment);
\r
+ PaintRefresher.Refresh(this, ap.av.getSequenceSetId());
\r
repaint();
\r
}
\r
\r
repaint();
\r
}
\r
\r