- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
import jalview.datamodel.AlignmentI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
- public AppJmolBinding(AppJmol appJmol, PDBEntry[] pdbentry,
+ public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry,
- super(pdbentry, sequenceIs, chains, protocol);
+ super(sSm, pdbentry, sequenceIs, chains, protocol);
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source,topap;
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source,topap;
- // ignore events from unrelated or non-user interactive frames
- if ((topap=appJmolWindow.getAlignmentPanelFor(ap.av.getAlignment()))==null || topap.alignFrame.getCurrentView() != ap.av || !appJmolWindow.isUsedforcolourby(ap))
+ // ignore events from panels not used to colour this view
+ if (!appJmolWindow.isUsedforcolourby(ap))
return;
if (!isLoadingFromArchive()) {
colourBySequence(ap.av.getShowSequenceFeatures(), ap);
return;
if (!isLoadingFromArchive()) {
colourBySequence(ap.av.getShowSequenceFeatures(), ap);
- jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
+ jmolpopup = new JmolPopup();
+ jmolpopup.initialize(viewer, translateLocale, menuName,