*/
package jalview.appletgui;
+import jalview.bin.JalviewLite;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SequenceI;
-import jalview.io.AppletFormatAdapter;
+import jalview.io.DataSourceType;
import jalview.io.FileParse;
import jalview.io.StructureFile;
import jalview.schemes.BuriedColourScheme;
+import jalview.schemes.ColourSchemeI;
import jalview.schemes.HelixColourScheme;
import jalview.schemes.HydrophobicColourScheme;
import jalview.schemes.PurinePyrimidineColourScheme;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ZappoColourScheme;
import jalview.structure.StructureSelectionManager;
+import jalview.structures.models.AAStructureBindingModel.ColourBy;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
import java.util.Vector;
public class AppletJmol extends EmbmenuFrame implements
-// StructureListener,
+ // StructureListener,
KeyListener, ActionListener, ItemListener
{
CheckboxMenuItem jmolColour = new CheckboxMenuItem(
MessageManager.getString("action.using_jmol"), false);
- MenuItem chain = new MenuItem(MessageManager.getString("action.by_chain"));
+ MenuItem chain = new MenuItem(
+ MessageManager.getString("action.by_chain"));
MenuItem charge = new MenuItem(
MessageManager.getString("label.charge_cysteine"));
- MenuItem zappo = new MenuItem(MessageManager.getString("label.zappo"));
+ MenuItem zappo = new MenuItem(
+ MessageManager.getString("label.colourScheme_zappo"));
- MenuItem taylor = new MenuItem(MessageManager.getString("label.taylor"));
+ MenuItem taylor = new MenuItem(
+ MessageManager.getString("label.colourScheme_taylor"));
MenuItem hydro = new MenuItem(
- MessageManager.getString("label.hydrophobicity"));
+ MessageManager.getString("label.colourScheme_hydrophobic"));
MenuItem helix = new MenuItem(
- MessageManager.getString("label.helix_propensity"));
+ MessageManager.getString("label.colourScheme_helix_propensity"));
MenuItem strand = new MenuItem(
- MessageManager.getString("label.strand_propensity"));
+ MessageManager.getString("label.colourScheme_strand_propensity"));
MenuItem turn = new MenuItem(
- MessageManager.getString("label.turn_propensity"));
+ MessageManager.getString("label.colourScheme_turn_propensity"));
MenuItem buried = new MenuItem(
- MessageManager.getString("label.buried_index"));
+ MessageManager.getString("label.colourScheme_buried_index"));
MenuItem purinepyrimidine = new MenuItem(
- MessageManager.getString("label.purine_pyrimidine"));
+ MessageManager.getString("label.colourScheme_purine/pyrimidine"));
MenuItem user = new MenuItem(
MessageManager.getString("label.user_defined_colours"));
AlignmentPanel ap;
- List<AlignmentPanel> _aps = new ArrayList<AlignmentPanel>(); // remove? never
+ List<AlignmentPanel> _aps = new ArrayList<>(); // remove? never
// added to
String fileLoadingError;
}
public AppletJmol(PDBEntry pdbentry, SequenceI[] seq, String[] chains,
- AlignmentPanel ap, String protocol)
+ AlignmentPanel ap, DataSourceType protocol)
{
this.ap = ap;
jmb = new AppletJmolBinding(this, ap.getStructureSelectionManager(),
- new PDBEntry[] { pdbentry }, new SequenceI[][] { seq },
- protocol);
- jmb.setColourBySequence(true);
+ new PDBEntry[]
+ { pdbentry }, new SequenceI[][] { seq }, protocol);
+ jmb.setColourBy(ColourBy.Sequence);
if (pdbentry.getId() == null || pdbentry.getId().length() < 1)
{
- if (protocol.equals(AppletFormatAdapter.PASTE))
+ if (protocol == DataSourceType.PASTE)
{
- pdbentry.setId("PASTED PDB"
- + (chains == null ? "_" : chains.toString()));
+ pdbentry.setId(
+ "PASTED PDB" + (chains == null ? "_" : chains.toString()));
}
else
{
}
}
- if (jalview.bin.JalviewLite.debug)
+ if (JalviewLite.debug)
{
System.err
.println("AppletJmol: PDB ID is '" + pdbentry.getId() + "'");
StructureFile reader = null;
if (alreadyMapped != null)
{
- reader = StructureSelectionManager.getStructureSelectionManager(
- ap.av.applet).setMapping(seq, chains, pdbentry.getFile(),
- protocol);
+ reader = StructureSelectionManager
+ .getStructureSelectionManager(ap.av.applet)
+ .setMapping(seq, chains, pdbentry.getFile(), protocol, null);
// PROMPT USER HERE TO ADD TO NEW OR EXISTING VIEW?
// FOR NOW, LETS JUST OPEN A NEW WINDOW
}
try
{
- jmb.allocateViewer(renderPanel, true, ap.av.applet.getName()
- + "_jmol_", ap.av.applet.getDocumentBase(),
- ap.av.applet.getCodeBase(), "-applet", scriptWindow, null);
+ jmb.allocateViewer(renderPanel, true,
+ ap.av.applet.getName() + "_jmol_",
+ ap.av.applet.getDocumentBase(), ap.av.applet.getCodeBase(),
+ "-applet", scriptWindow, null);
} catch (Exception e)
{
- System.err
- .println("Couldn't create a jmol viewer. Args to allocate viewer were:\nDocumentBase="
- + ap.av.applet.getDocumentBase()
- + "\nCodebase="
+ System.err.println(
+ "Couldn't create a jmol viewer. Args to allocate viewer were:\nDocumentBase="
+ + ap.av.applet.getDocumentBase() + "\nCodebase="
+ ap.av.applet.getCodeBase());
e.printStackTrace();
dispose();
}
});
pdbentry.setProperty("protocol", protocol);
-
if (pdbentry.getFile() != null)
+
{
// import structure data from pdbentry.getFile based on given protocol
- if (protocol.equals(AppletFormatAdapter.PASTE))
+ if (protocol == DataSourceType.PASTE)
{
// TODO: JAL-623 : correctly record file contents for matching up later
// pdbentry.getProperty().put("pdbfilehash",""+pdbentry.getFile().hashCode());
loadInline(pdbentry.getFile());
}
- else if (protocol.equals(AppletFormatAdapter.FILE)
- || protocol.equals(AppletFormatAdapter.URL))
+ else if (protocol == DataSourceType.FILE
+ || protocol == DataSourceType.URL)
{
jmb.viewer.openFile(pdbentry.getFile());
}
{
if (jalview.bin.JalviewLite.debug)
{
- System.err
- .println("AppletJmol:Trying to reuse existing PDBfile IO parser.");
+ System.err.println(
+ "AppletJmol:Trying to reuse existing PDBfile IO parser.");
}
// re-use the one we opened earlier
freader = reader.getReader();
{
if (jalview.bin.JalviewLite.debug)
{
- System.err
- .println("AppletJmol:Creating new PDBfile IO parser.");
+ System.err.println(
+ "AppletJmol:Creating new PDBfile IO parser.");
}
FileParse fp = new FileParse(pdbentry.getFile(), protocol);
fp.mark();
}
if (freader == null)
{
- throw new Exception(
- MessageManager
- .getString("exception.invalid_datasource_couldnt_obtain_reader"));
+ throw new Exception(MessageManager.getString(
+ "exception.invalid_datasource_couldnt_obtain_reader"));
}
jmb.viewer.openReader(pdbentry.getFile(), pdbentry.getId(),
freader);
void centerViewer()
{
- Vector<String> toshow = new Vector<String>();
+ Vector<String> toshow = new Vector<>();
for (int i = 0; i < chainMenu.getItemCount(); i++)
{
if (chainMenu.getItem(i) instanceof CheckboxMenuItem)
} catch (OutOfMemoryError ex)
{
frame.dispose();
- System.err
- .println("Out of memory when trying to create dialog box with sequence-structure mapping.");
+ System.err.println(
+ "Out of memory when trying to create dialog box with sequence-structure mapping.");
return;
}
jalview.bin.JalviewLite.addFrame(frame,
else if (evt.getSource() == zappo)
{
setEnabled(zappo);
- jmb.setJalviewColourScheme(new ZappoColourScheme());
+ setColourScheme(new ZappoColourScheme());
}
else if (evt.getSource() == taylor)
{
setEnabled(taylor);
- jmb.setJalviewColourScheme(new TaylorColourScheme());
+ setColourScheme(new TaylorColourScheme());
}
else if (evt.getSource() == hydro)
{
setEnabled(hydro);
- jmb.setJalviewColourScheme(new HydrophobicColourScheme());
+ setColourScheme(new HydrophobicColourScheme());
}
else if (evt.getSource() == helix)
{
setEnabled(helix);
- jmb.setJalviewColourScheme(new HelixColourScheme());
+ setColourScheme(new HelixColourScheme());
}
else if (evt.getSource() == strand)
{
setEnabled(strand);
- jmb.setJalviewColourScheme(new StrandColourScheme());
+ setColourScheme(new StrandColourScheme());
}
else if (evt.getSource() == turn)
{
setEnabled(turn);
- jmb.setJalviewColourScheme(new TurnColourScheme());
+ setColourScheme(new TurnColourScheme());
}
else if (evt.getSource() == buried)
{
setEnabled(buried);
- jmb.setJalviewColourScheme(new BuriedColourScheme());
+ setColourScheme(new BuriedColourScheme());
}
else if (evt.getSource() == purinepyrimidine)
{
- jmb.setJalviewColourScheme(new PurinePyrimidineColourScheme());
+ setColourScheme(new PurinePyrimidineColourScheme());
}
else if (evt.getSource() == user)
{
{
try
{
- ap.av.applet.getAppletContext().showDocument(
- new java.net.URL(
+ ap.av.applet.getAppletContext()
+ .showDocument(new java.net.URL(
"http://jmol.sourceforge.net/docs/JmolUserGuide/"),
- "jmolHelp");
+ "jmolHelp");
} catch (java.net.MalformedURLException ex)
{
}
}
}
- /**
+ private void setColourScheme(ColourSchemeI cs)
+ {
+ jmb.setJalviewColourScheme(cs, ap, ap.av.isShowSequenceFeatures());
+ }
+
+/**
* tick or untick the seqColour menu entry or jmoColour entry depending upon
* if it was selected or not.
*
{
jmolColour.setState(itm == jmolColour);
seqColour.setState(itm == seqColour);
- jmb.setColourBySequence(itm == seqColour);
+ jmb.setColourBy(itm == seqColour ? ColourBy.Sequence : ColourBy.Viewer);
}
@Override
if (evt.getSource() == jmolColour)
{
setEnabled(jmolColour);
- jmb.setColourBySequence(false);
+ jmb.setColourBy(ColourBy.Viewer);
}
else if (evt.getSource() == seqColour)
{
setEnabled(seqColour);
- jmb.colourBySequence(ap);
+ jmb.colourBySequence(ap, ap.av.isShowSequenceFeatures());
}
else if (!allChainsSelected)
{
public void updateColours(Object source)
{
AlignmentPanel panel = (AlignmentPanel) source;
- jmb.colourBySequence(panel);
+ jmb.colourBySequence(panel, ap.av.isShowSequenceFeatures());
}
public void updateTitleAndMenus()
{
- if (jmb.fileLoadingError != null && jmb.fileLoadingError.length() > 0)
+ if (jmb.hasFileLoadingError())
{
repaint();
return;
}
setChainMenuItems(jmb.getChainNames());
- jmb.colourBySequence(ap);
+ jmb.colourBySequence(ap, ap.av.isShowSequenceFeatures());
setTitle(jmb.getViewerTitle());
}
*/
public void setJalviewColourScheme(UserColourScheme ucs)
{
- jmb.setJalviewColourScheme(ucs);
+ setColourScheme(ucs);
}
public AlignmentPanel getAlignmentPanelFor(AlignmentI alignment)
git://source.jalview.org / jalview.git / blobdiff