*/
package jalview.appletgui;
-import jalview.bin.JalviewLite;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.PDBEntry;
-import jalview.datamodel.SequenceI;
-import jalview.io.DataSourceType;
-import jalview.io.FileParse;
-import jalview.io.StructureFile;
-import jalview.schemes.BuriedColourScheme;
-import jalview.schemes.HelixColourScheme;
-import jalview.schemes.HydrophobicColourScheme;
-import jalview.schemes.PurinePyrimidineColourScheme;
-import jalview.schemes.StrandColourScheme;
-import jalview.schemes.TaylorColourScheme;
-import jalview.schemes.TurnColourScheme;
-import jalview.schemes.UserColourScheme;
-import jalview.schemes.ZappoColourScheme;
-import jalview.structure.StructureSelectionManager;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.CheckboxMenuItem;
import java.awt.Color;
import java.util.List;
import java.util.Vector;
+import jalview.bin.JalviewLite;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceI;
+import jalview.io.DataSourceType;
+import jalview.io.FileParse;
+import jalview.io.StructureFile;
+import jalview.schemes.BuriedColourScheme;
+import jalview.schemes.HelixColourScheme;
+import jalview.schemes.HydrophobicColourScheme;
+import jalview.schemes.PurinePyrimidineColourScheme;
+import jalview.schemes.StrandColourScheme;
+import jalview.schemes.TaylorColourScheme;
+import jalview.schemes.TurnColourScheme;
+import jalview.schemes.UserColourScheme;
+import jalview.schemes.ZappoColourScheme;
+import jalview.structure.StructureSelectionManager;
+import jalview.util.MessageManager;
+
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"));
AlignmentPanel ap;
- List<AlignmentPanel> _aps = new ArrayList<AlignmentPanel>(); // remove? never
+ List<AlignmentPanel> _aps = new ArrayList<>(); // remove? never
// added to
String fileLoadingError;
{
this.ap = ap;
jmb = new AppletJmolBinding(this, ap.getStructureSelectionManager(),
- new PDBEntry[] { pdbentry }, new SequenceI[][] { seq },
- protocol);
+ new PDBEntry[]
+ { pdbentry }, new SequenceI[][] { seq }, protocol);
jmb.setColourBySequence(true);
if (pdbentry.getId() == null || pdbentry.getId().length() < 1)
{
if (protocol == DataSourceType.PASTE)
{
- pdbentry.setId("PASTED PDB"
- + (chains == null ? "_" : chains.toString()));
+ pdbentry.setId(
+ "PASTED PDB" + (chains == null ? "_" : chains.toString()));
}
else
{
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 == DataSourceType.PASTE)
else if (protocol == DataSourceType.FILE
|| protocol == DataSourceType.URL)
{
- jmb.viewer.openFile(pdbentry.getFile());
+ jmb.jmolViewer.openFile(pdbentry.getFile());
}
else
{
{
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();
- // reader = new MCview.PDBfile(fp);
+ // reader = new mc_view.PDBfile(fp);
// could set ID, etc.
// if (!reader.isValid())
// {
}
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(),
+ jmb.jmolViewer.openReader(pdbentry.getFile(), pdbentry.getId(),
freader);
} catch (Exception e)
{
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)
}
}
}
- jmb.centerViewer(toshow);
+ jmb.showChains(toshow);
}
void closeViewer()
{
- jmb.closeViewer();
+ jmb.closeViewer(true);
jmb = null;
this.setVisible(false);
}
} 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());
+ jmb.colourByJalviewColourScheme(new ZappoColourScheme());
}
else if (evt.getSource() == taylor)
{
setEnabled(taylor);
- jmb.setJalviewColourScheme(new TaylorColourScheme());
+ jmb.colourByJalviewColourScheme(new TaylorColourScheme());
}
else if (evt.getSource() == hydro)
{
setEnabled(hydro);
- jmb.setJalviewColourScheme(new HydrophobicColourScheme());
+ jmb.colourByJalviewColourScheme(new HydrophobicColourScheme());
}
else if (evt.getSource() == helix)
{
setEnabled(helix);
- jmb.setJalviewColourScheme(new HelixColourScheme());
+ jmb.colourByJalviewColourScheme(new HelixColourScheme());
}
else if (evt.getSource() == strand)
{
setEnabled(strand);
- jmb.setJalviewColourScheme(new StrandColourScheme());
+ jmb.colourByJalviewColourScheme(new StrandColourScheme());
}
else if (evt.getSource() == turn)
{
setEnabled(turn);
- jmb.setJalviewColourScheme(new TurnColourScheme());
+ jmb.colourByJalviewColourScheme(new TurnColourScheme());
}
else if (evt.getSource() == buried)
{
setEnabled(buried);
- jmb.setJalviewColourScheme(new BuriedColourScheme());
+ jmb.colourByJalviewColourScheme(new BuriedColourScheme());
}
else if (evt.getSource() == purinepyrimidine)
{
- jmb.setJalviewColourScheme(new PurinePyrimidineColourScheme());
+ jmb.colourByJalviewColourScheme(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)
{
}
{
currentSize = this.getSize();
- if (jmb.viewer == null)
+ if (jmb.jmolViewer == null)
{
g.setColor(Color.black);
g.fillRect(0, 0, currentSize.width, currentSize.height);
}
else
{
- jmb.viewer.renderScreenImage(g, currentSize.width,
+ jmb.jmolViewer.renderScreenImage(g, currentSize.width,
currentSize.height);
}
}
*
* }
*/
- public void setJalviewColourScheme(UserColourScheme ucs)
+ public void colourByJalviewColourScheme(UserColourScheme ucs)
{
- jmb.setJalviewColourScheme(ucs);
+ jmb.colourByJalviewColourScheme(ucs);
}
public AlignmentPanel getAlignmentPanelFor(AlignmentI alignment)
git://source.jalview.org / jalview.git / blobdiff