X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=3a376b89b96e74dd5657e5e827511270e36933e0;hb=a23cc416cd520ac6dec6052591575b264f5d25bc;hp=22202e55ffc68d1f454add4d5e2cd84847e0f382;hpb=a65993fd311b1a53617c5df3c84abfb78740a900;p=jalview.git
diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index 22202e5..3a376b8 100644
--- a/src/jalview/gui/AppJmolBinding.java
+++ b/src/jalview/gui/AppJmolBinding.java
@@ -1,81 +1,80 @@
/*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.Container;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
-import java.util.BitSet;
-
-import javax.swing.JPanel;
-
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
-import jalview.datamodel.AlignmentI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
+import jalview.ext.jmol.JalviewJmolBinding;
+import jalview.structure.StructureSelectionManager;
+
+import java.awt.Container;
+import java.util.BitSet;
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.api.JmolViewer;
import org.jmol.popup.JmolPopup;
import org.openscience.jmol.app.jmolpanel.AppConsole;
-public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
+public class AppJmolBinding extends JalviewJmolBinding
{
-
- /**
- *
- */
private AppJmol appJmolWindow;
- public AppJmolBinding(AppJmol appJmol, PDBEntry[] pdbentry,
- SequenceI[][] sequenceIs, String[][] chains, String protocol)
+ private FeatureRenderer fr = null;
+
+ public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm,
+ PDBEntry[] pdbentry, SequenceI[][] sequenceIs, String[][] chains,
+ String protocol)
{
- super(pdbentry, sequenceIs, chains, protocol);
+ super(sSm, pdbentry, sequenceIs, chains, protocol);
appJmolWindow = appJmol;
}
- FeatureRenderer fr = null;
-
@Override
- public jalview.api.FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
+ public FeatureRenderer getFeatureRenderer(
+ AlignmentViewPanel alignment)
{
- AlignmentPanel ap = (alignment==null) ? appJmolWindow.ap : (AlignmentPanel) alignment;
- if (ap.av.showSequenceFeatures)
+ AlignmentPanel ap = (alignment == null) ? appJmolWindow.getAlignmentPanel()
+ : (AlignmentPanel) alignment;
+ if (ap.av.isShowSequenceFeatures())
{
if (fr == null)
{
- fr = new FeatureRenderer((AlignmentPanel)alignment);
+ fr = (jalview.gui.FeatureRenderer) ap.cloneFeatureRenderer();
+ }
+ else
+ {
+ ap.updateFeatureRenderer(fr);
}
-
- fr.transferSettings(((AlignmentPanel)alignment).
- seqPanel.seqCanvas.getFeatureRenderer());
}
return fr;
}
@Override
- public jalview.api.SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
+ public SequenceRenderer getSequenceRenderer(
+ AlignmentViewPanel alignment)
{
- return new SequenceRenderer(((AlignmentPanel)alignment).av);
+ return new SequenceRenderer(((AlignmentPanel) alignment).av);
}
public void sendConsoleEcho(String strEcho)
@@ -125,12 +124,15 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
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))
+ AlignmentPanel ap = (AlignmentPanel) source, topap;
+ // ignore events from panels not used to colour this view
+ if (!appJmolWindow.isUsedforcolourby(ap))
+ {
return;
- if (!isLoadingFromArchive()) {
- colourBySequence(ap.av.getShowSequenceFeatures(), ap);
+ }
+ if (!isLoadingFromArchive())
+ {
+ colourBySequence(ap.av.isShowSequenceFeatures(), ap);
}
}
@@ -150,9 +152,8 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void newJmolPopup(boolean translateLocale, String menuName,
boolean asPopup)
{
-
- jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
- asPopup);
+ jmolpopup = new JmolPopup();
+ jmolpopup.initialize(viewer, translateLocale, menuName, asPopup);
}
public void selectionChanged(BitSet arg0)
@@ -172,25 +173,6 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
appJmolWindow.showConsole(b);
}
- /**
- * add the given sequences to the mapping scope for the given pdb file handle
- *
- * @param pdbFile
- * - pdbFile identifier
- * @param seq
- * - set of sequences it can be mapped to
- */
- public void addSequenceForStructFile(String pdbFile, SequenceI[] seq)
- {
- for (int pe = 0; pe < pdbentry.length; pe++)
- {
- if (pdbentry[pe].getFile().equals(pdbFile))
- {
- addSequence(pe, seq);
- }
- }
- }
-
@Override
protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
Container consolePanel, String buttonsToShow)
@@ -202,28 +184,15 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
protected void releaseUIResources()
{
appJmolWindow = null;
- if (console != null)
- {
- try
- {
- console.setVisible(false);
- } catch (Error e)
- {
- } catch (Exception x)
- {
- }
- ;
- console = null;
- }
-
+ closeConsole();
}
@Override
public void releaseReferences(Object svl)
{
- if (svl instanceof SeqPanel) {
+ if (svl instanceof SeqPanel)
+ {
appJmolWindow.removeAlignmentPanel(((SeqPanel) svl).ap);
-
- };
+ }
}
}