();
+ String gappedTitle = sname + " (with gaps)";
+ RnaModel gappedModel = new RnaModel(gappedTitle, aa, seq, null, true);
+ addModel(gappedModel, gappedTitle);
- /**
- * set the primary alignmentPanel reference and add another alignPanel to the
- * list of ones to use for colouring and aligning
- *
- * @param nap
- */
- public void addAlignmentPanel(AlignmentPanel nap)
- {
- if (ap == null)
- {
- ap = nap;
- }
- if (!_aps.contains(nap.av.getSequenceSetId()))
- {
- _aps.add(nap.av.getSequenceSetId());
- }
+ String trimmedTitle = "trimmed " + sname;
+ RnaModel trimmedModel = new RnaModel(trimmedTitle, aa, seq, null, false);
+ addModel(trimmedModel, trimmedTitle);
+ vab.setSelectedIndex(0);
}
/**
- * remove any references held to the given alignment panel
+ * Constructor that links the viewer to a parent panel (but has no structures
+ * yet - use addModel to add them)
*
- * @param nap
+ * @param ap
*/
- public void removeAlignmentPanel(AlignmentPanel nap)
+ protected AppVarna(AlignmentPanel ap)
{
- try
+ this.ap = ap;
+ this.viewId = System.currentTimeMillis() + "." + this.hashCode();
+ vab = new AppVarnaBinding();
+ initVarna();
+
+ this.ssm = ap.getStructureSelectionManager();
+ ssm.addStructureViewerListener(this);
+ ssm.addSelectionListener(this);
+ addInternalFrameListener(new InternalFrameAdapter()
{
- _alignwith.remove(nap);
- _colourwith.remove(nap);
- if (ap == nap)
+ @Override
+ public void internalFrameClosed(InternalFrameEvent evt)
{
- ap = null;
- for (AlignmentPanel aps : getAllAlignmentPanels())
- {
- if (aps != nap)
- {
- ap = aps;
- break;
- }
- }
+ close();
}
- } catch (Exception ex)
- {
- }
- if (ap != null)
- {
- buildJmolActionMenu();
- }
- }
-
- public void useAlignmentPanelForSuperposition(AlignmentPanel nap)
- {
- addAlignmentPanel(nap);
- if (!_alignwith.contains(nap))
- {
- _alignwith.add(nap);
- }
+ });
}
- public void excludeAlignmentPanelForSuperposition(AlignmentPanel nap)
+ /**
+ * Constructor given viewer data read from a saved project file
+ *
+ * @param model
+ * @param ap
+ * the (or a) parent alignment panel
+ */
+ public AppVarna(RnaViewerModel model, AlignmentPanel ap)
{
- if (_alignwith.contains(nap))
- {
- _alignwith.remove(nap);
- }
+ this(ap);
+ setTitle(model.title);
+ this.viewId = model.viewId;
+ setBounds(model.x, model.y, model.width, model.height);
+ this.split.setDividerLocation(model.dividerLocation);
}
- public void useAlignmentPanelForColourbyseq(AlignmentPanel nap, boolean enableColourBySeq)
- {
- useAlignmentPanelForColourbyseq(nap);
- jmb.setColourBySequence(enableColourBySeq);
- seqColour.setSelected(enableColourBySeq);
- jmolColour.setSelected(!enableColourBySeq);
- }
- public void useAlignmentPanelForColourbyseq(AlignmentPanel nap)
+ /**
+ * Constructs a split pane with an empty selection list and display panel, and
+ * adds it to the desktop
+ */
+ public void initVarna()
{
- addAlignmentPanel(nap);
- if (!_colourwith.contains(nap))
- {
- _colourwith.add(nap);
- }
- }
+ VARNAPanel varnaPanel = vab.get_varnaPanel();
+ setBackground(Color.white);
+ split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true,
+ vab.getListPanel(), varnaPanel);
+ getContentPane().setLayout(new BorderLayout());
+ getContentPane().add(split, BorderLayout.CENTER);
- public void excludeAlignmentPanelForColourbyseq(AlignmentPanel nap)
- {
- if (_colourwith.contains(nap))
- {
- _colourwith.remove(nap);
- }
+ varnaPanel.addSelectionListener(this);
+ jalview.gui.Desktop.addInternalFrame(this, "", getBounds().width,
+ getBounds().height);
+ this.pack();
+ showPanel(true);
}
/**
- * pdb retrieval thread.
- */
- private Thread worker = null;
-
- /**
- * add a new structure (with associated sequences and chains) to this viewer,
- * retrieving it if necessary first.
+ * Constructs a new RNA model from the given one, without gaps. Also
+ * calculates and saves a 'shift list'
*
- * @param pdbentry
- * @param seq
- * @param chains
- * @param alignFrame
- * @param align
- * if true, new structure(s) will be align using associated alignment
+ * @param rna
+ * @param name
+ * @return
*/
- private void addStructure(final PDBEntry pdbentry, final SequenceI[] seq,
- final String[] chains, final boolean b,
- final IProgressIndicator alignFrame)
+ public RNA trimRNA(RNA rna, String name)
{
- if (pdbentry.getFile() == null)
- {
- if (worker != null && worker.isAlive())
- {
- // a retrieval is in progress, wait around and add ourselves to the
- // queue.
- new Thread(new Runnable()
- {
- public void run()
- {
- while (worker != null && worker.isAlive() && _started)
- {
- try
- {
- Thread.sleep(100 + ((int) Math.random() * 100));
-
- } catch (Exception e)
- {
- }
-
- }
- // and call ourselves again.
- addStructure(pdbentry, seq, chains, b, alignFrame);
- }
- }).start();
- return;
- }
- }
- // otherwise, start adding the structure.
- jmb.addSequenceAndChain(new PDBEntry[]
- { pdbentry }, new SequenceI[][]
- { seq }, new String[][]
- { chains });
- addingStructures = true;
- _started = false;
- alignAddedStructures = b;
- progressBar = alignFrame; // visual indication happens on caller frame.
- (worker = new Thread(this)).start();
- return;
- }
+ ShiftList offset = new ShiftList();
- private Vector getJmolsFor(AlignmentPanel ap2)
- {
- Vector otherJmols = new Vector();
- // Now this AppJmol is mapped to new sequences. We must add them to
- // the exisiting array
- JInternalFrame[] frames = Desktop.instance.getAllFrames();
-
- for (int i = 0; i < frames.length; i++)
- {
- if (frames[i] instanceof AppVarna)
- {
- AppVarna topJmol = ((AppVarna) frames[i]);
- if (topJmol.isLinkedWith(ap2))
- {
- otherJmols.addElement(topJmol);
- }
- }
- }
- return otherJmols;
- }
-
- void initJmol(String command)
- {
- jmb.setFinishedInit(false);
- renderPanel = new RenderPanel();
- // TODO: consider waiting until the structure/view is fully loaded before
- // displaying
- this.getContentPane().add(renderPanel, java.awt.BorderLayout.CENTER);
- jalview.gui.Desktop.addInternalFrame(this, jmb.getViewerTitle(),
- getBounds().width, getBounds().height);
- if (scriptWindow == null)
+ RNA rnaTrim = new RNA(name);
+ try
{
- BorderLayout bl = new BorderLayout();
- bl.setHgap(0);
- bl.setVgap(0);
- scriptWindow = new JPanel(bl);
- scriptWindow.setVisible(false);
- }
- ;
- jmb.allocateViewer(renderPanel, true, "", null, null, "", scriptWindow,
- null);
- jmb.newJmolPopup(true, "Jmol", true);
- if (command==null)
+ String structDBN = rna.getStructDBN(true);
+ rnaTrim.setRNA(rna.getSeq(), replaceOddGaps(structDBN));
+ } catch (ExceptionUnmatchedClosingParentheses e2)
{
- command="";
- }
- jmb.evalStateCommand(command);
- jmb.setFinishedInit(true);
- }
-
- void setChainMenuItems(Vector chains)
- {
- chainMenu.removeAll();
- if (chains == null)
+ e2.printStackTrace();
+ } catch (ExceptionFileFormatOrSyntax e3)
{
- return;
+ e3.printStackTrace();
}
- JMenuItem menuItem = new JMenuItem("All");
- menuItem.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent evt)
- {
- allChainsSelected = true;
- for (int i = 0; i < chainMenu.getItemCount(); i++)
- {
- if (chainMenu.getItem(i) instanceof JCheckBoxMenuItem)
- ((JCheckBoxMenuItem) chainMenu.getItem(i)).setSelected(true);
- }
- centerViewer();
- allChainsSelected = false;
- }
- });
- chainMenu.add(menuItem);
+ String seq = rnaTrim.getSeq();
+ StringBuilder struc = new StringBuilder(256);
+ struc.append(rnaTrim.getStructDBN(true));
+ int ofstart = -1;
+ int sleng = seq.length();
- for (int c = 0; c < chains.size(); c++)
+ for (int i = 0; i < sleng; i++)
{
- menuItem = new JCheckBoxMenuItem(chains.elementAt(c).toString(), true);
- menuItem.addItemListener(new ItemListener()
+ if (Comparison.isGap(seq.charAt(i)))
{
- public void itemStateChanged(ItemEvent evt)
+ if (ofstart == -1)
{
- if (!allChainsSelected)
- centerViewer();
+ ofstart = i;
}
- });
-
- chainMenu.add(menuItem);
- }
- }
-
- boolean allChainsSelected = false;
-
- private boolean alignAddedStructures = false;
-
- void centerViewer()
- {
- Vector toshow = new Vector();
- String lbl;
- int mlength, p, mnum;
- for (int i = 0; i < chainMenu.getItemCount(); i++)
- {
- if (chainMenu.getItem(i) instanceof JCheckBoxMenuItem)
- {
- JCheckBoxMenuItem item = (JCheckBoxMenuItem) chainMenu.getItem(i);
- if (item.isSelected())
+ /*
+ * mark base or base & pair in the structure with *
+ */
+ if (!rnaTrim.findPair(i).isEmpty())
{
- toshow.addElement(item.getText());
- }
- }
- }
- jmb.centerViewer(toshow);
- }
+ int m = rnaTrim.findPair(i).get(1);
+ int l = rnaTrim.findPair(i).get(0);
- void closeViewer()
- {
- jmb.closeViewer();
- ap = null;
- _aps.clear();
- _alignwith.clear();
- _colourwith.clear();
- // TODO: check for memory leaks where instance isn't finalised because jmb
- // holds a reference to the window
- jmb = null;
- }
-
- /**
- * state flag for PDB retrieval thread
- */
- private boolean _started = false;
-
- public void run()
- {
- _started = true;
- String pdbid = "";
- // todo - record which pdbids were successfuly imported.
- StringBuffer errormsgs = new StringBuffer(), files = new StringBuffer();
- try
- {
- String[] curfiles = jmb.getPdbFile(); // files currently in viewer
- // TODO: replace with reference fetching/transfer code (validate PDBentry
- // as a DBRef?)
- jalview.ws.dbsources.Pdb pdbclient = new jalview.ws.dbsources.Pdb();
- for (int pi = 0; pi < jmb.pdbentry.length; pi++)
- {
- String file = jmb.pdbentry[pi].getFile();
- if (file == null)
- {
- // retrieve the pdb and store it locally
- AlignmentI pdbseq = null;
- pdbid = jmb.pdbentry[pi].getId();
- long hdl = pdbid.hashCode() - System.currentTimeMillis();
- if (progressBar != null)
- {
- progressBar.setProgressBar("Fetching PDB " + pdbid, hdl);
- }
- try
- {
- pdbseq = pdbclient.getSequenceRecords(pdbid = jmb.pdbentry[pi]
- .getId());
- } catch (OutOfMemoryError oomerror)
- {
- new OOMWarning("Retrieving PDB id " + pdbid, oomerror);
- } catch (Exception ex)
- {
- ex.printStackTrace();
- errormsgs.append("'" + pdbid + "'");
- }
- if (progressBar != null)
- {
- progressBar.setProgressBar("Finished.", hdl);
- }
- if (pdbseq != null)
- {
- // just transfer the file name from the first sequence's first
- // PDBEntry
- jmb.pdbentry[pi].setFile(file = ((PDBEntry) pdbseq
- .getSequenceAt(0).getPDBId().elementAt(0)).getFile());
- files.append(" \"" + file + "\"");
- }
- else
- {
- errormsgs.append("'" + pdbid + "' ");
- }
+ struc.replace(m, m + 1, "*");
+ struc.replace(l, l + 1, "*");
}
else
{
- if (curfiles != null && curfiles.length > 0)
- {
- addingStructures = true; // already files loaded.
- for (int c = 0; c < curfiles.length; c++)
- {
- if (curfiles[c].equals(file))
- {
- file = null;
- break;
- }
- }
- }
- if (file != null)
- {
- files.append(" \"" + file + "\"");
- }
- }
- }
- } catch (OutOfMemoryError oomerror)
- {
- new OOMWarning("Retrieving PDB files: " + pdbid, oomerror);
- } catch (Exception ex)
- {
- ex.printStackTrace();
- errormsgs.append("When retrieving pdbfiles : current was: '" + pdbid
- + "'");
- }
- if (errormsgs.length() > 0)
- {
-
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- "The following pdb entries could not be retrieved from the PDB:\n"
- + errormsgs.toString()
- + "\nPlease try downloading them manually.",
- "Couldn't load file", JOptionPane.ERROR_MESSAGE);
-
- }
- if (files.length() > 0)
- {
- if (!addingStructures)
- {
-
- try
- {
- initJmol("load FILES " + files.toString());
- } catch (OutOfMemoryError oomerror)
- {
- new OOMWarning("When trying to open the Jmol viewer!", oomerror);
- Cache.log.debug("File locations are " + files);
- } catch (Exception ex)
- {
- Cache.log.error("Couldn't open Jmol viewer!", ex);
+ struc.replace(i, i + 1, "*");
}
}
else
{
- StringBuffer cmd = new StringBuffer();
- cmd.append("loadingJalviewdata=true\nload APPEND ");
- cmd.append(files.toString());
- cmd.append("\nloadingJalviewdata=null");
- final String command = cmd.toString();
- cmd = null;
- long lastnotify = jmb.getLoadNotifiesHandled();
- try
- {
- jmb.evalStateCommand(command);
- } catch (OutOfMemoryError oomerror)
- {
- new OOMWarning(
- "When trying to add structures to the Jmol viewer!",
- oomerror);
- Cache.log.debug("File locations are " + files);
- } catch (Exception ex)
- {
- Cache.log.error("Couldn't add files to Jmol viewer!", ex);
- }
- // need to wait around until script has finished
- while (lastnotify >= jmb.getLoadNotifiesHandled())
- ;
- {
- try
- {
- Thread.sleep(35);
- } catch (Exception e)
- {
- }
- }
- // refresh the sequence colours for the new structure(s)
- for (AlignmentPanel ap : _colourwith)
+ if (ofstart > -1)
{
- jmb.updateColours(ap);
+ offset.addShift(offset.shift(ofstart), ofstart - i);
+ ofstart = -1;
}
- // do superposition if asked to
- if (alignAddedStructures)
- {
- javax.swing.SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- alignStructs_withAllAlignPanels();
- // jmb.superposeStructures(ap.av.getAlignment(), -1, null);
- }
- });
- alignAddedStructures = false;
- }
- addingStructures = false;
}
}
- _started = false;
- worker = null;
- }
-
- public void pdbFile_actionPerformed(ActionEvent actionEvent)
- {
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
-
- chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Save PDB File");
- chooser.setToolTipText("Save");
-
- int value = chooser.showSaveDialog(this);
-
- if (value == JalviewFileChooser.APPROVE_OPTION)
+ // final gap
+ if (ofstart > -1)
{
- try
- {
- // TODO: cope with multiple PDB files in view
- BufferedReader in = new BufferedReader(new FileReader(
- jmb.getPdbFile()[0]));
- File outFile = chooser.getSelectedFile();
-
- PrintWriter out = new PrintWriter(new FileOutputStream(outFile));
- String data;
- while ((data = in.readLine()) != null)
- {
- if (!(data.indexOf("") > -1 || data.indexOf("
") > -1))
- {
- out.println(data);
- }
- }
- out.close();
- } catch (Exception ex)
- {
- ex.printStackTrace();
- }
+ offset.addShift(offset.shift(ofstart), ofstart - sleng);
+ ofstart = -1;
}
- }
- public void viewMapping_actionPerformed(ActionEvent actionEvent)
- {
- jalview.gui.CutAndPasteTransfer cap = new jalview.gui.CutAndPasteTransfer();
+ /*
+ * remove the marked gaps from the structure
+ */
+ String newStruc = struc.toString().replace("*", "");
+
+ /*
+ * remove gaps from the sequence
+ */
+ String newSeq = AlignSeq.extractGaps(Comparison.GapChars, seq);
+
try
{
- for (int pdbe = 0; pdbe < jmb.pdbentry.length; pdbe++)
- {
- cap.appendText(jmb.printMapping(
- jmb.pdbentry[pdbe].getFile()));
- cap.appendText("\n");
- }
- } catch (OutOfMemoryError e)
+ rnaTrim.setRNA(newSeq, newStruc);
+ registerOffset(rnaTrim, offset);
+ } catch (ExceptionUnmatchedClosingParentheses e)
{
- new OOMWarning(
- "composing sequence-structure alignments for display in text box.",
- e);
- cap.dispose();
- return;
+ e.printStackTrace();
+ } catch (ExceptionFileFormatOrSyntax e)
+ {
+ e.printStackTrace();
}
- jalview.gui.Desktop.addInternalFrame(cap, "PDB - Sequence Mapping",
- 550, 600);
+ return rnaTrim;
}
/**
- * DOCUMENT ME!
+ * Save the sequence to structure mapping, and also its inverse.
*
- * @param e
- * DOCUMENT ME!
+ * @param rnaTrim
+ * @param offset
*/
- public void eps_actionPerformed(ActionEvent e)
+ private void registerOffset(RNA rnaTrim, ShiftList offset)
+ {
+ offsets.put(rnaTrim, offset);
+ offsetsInv.put(rnaTrim, offset.getInverse());
+ }
+
+ public void showPanel(boolean show)
{
- makePDBImage(jalview.util.ImageMaker.EPS);
+ this.setVisible(show);
}
/**
- * DOCUMENT ME!
+ * If a mouseOver event from the AlignmentPanel is noticed the currently
+ * selected RNA in the VARNA window is highlighted at the specific position.
+ * To be able to remove it before the next highlight it is saved in
+ * _lastHighlight
*
- * @param e
- * DOCUMENT ME!
+ * @param sequence
+ * @param index
+ * the aligned sequence position (base 0)
+ * @param position
+ * the dataset sequence position (base 1)
*/
- public void png_actionPerformed(ActionEvent e)
+ @Override
+ public void mouseOverSequence(SequenceI sequence, final int index,
+ final int position)
{
- makePDBImage(jalview.util.ImageMaker.PNG);
+ RNA rna = vab.getSelectedRNA();
+ if (rna == null)
+ {
+ return;
+ }
+ RnaModel rnaModel = models.get(rna);
+ if (rnaModel.seq == sequence)
+ {
+ int highlightPos = rnaModel.gapped ? index : position - 1;
+ mouseOverHighlighter.highlightRegion(rna, highlightPos, highlightPos);
+ vab.updateSelectedRNA(rna);
+ }
}
- void makePDBImage(int type)
+ @Override
+ public void selection(SequenceGroup seqsel, ColumnSelection colsel,
+ SelectionSource source)
{
- int width = getWidth();
- int height = getHeight();
-
- jalview.util.ImageMaker im;
-
- if (type == jalview.util.ImageMaker.PNG)
+ if (source != ap.av)
{
- im = new jalview.util.ImageMaker(this, jalview.util.ImageMaker.PNG,
- "Make PNG image from view", width, height, null, null);
+ // ignore events from anything but our parent alignpanel
+ // TODO - reuse many-one panel-view system in jmol viewer
+ return;
}
- else
+ RNA rna = vab.getSelectedRNA();
+ if (rna == null)
{
- im = new jalview.util.ImageMaker(this, jalview.util.ImageMaker.EPS,
- "Make EPS file from view", width, height, null,
- this.getTitle());
+ return;
}
-
- if (im.getGraphics() != null)
+ if (seqsel != null && seqsel.getSize() > 0)
{
- Rectangle rect = new Rectangle(width, height);
- jmb.viewer.renderScreenImage(im.getGraphics(), rect.getSize(), rect);
- im.writeImage();
+ int start = seqsel.getStartRes(), end = seqsel.getEndRes();
+ ShiftList shift = offsets.get(rna);
+ if (shift != null)
+ {
+ start = shift.shift(start);
+ end = shift.shift(end);
+ }
+ selectionHighlighter.highlightRegion(rna, start, end);
+ selectionHighlighter.getLastHighlight().setOutlineColor(
+ seqsel.getOutlineColour());
+ // TODO - translate column markings to positions on structure if present.
+ vab.updateSelectedRNA(rna);
}
- }
- public void jmolColour_actionPerformed(ActionEvent actionEvent)
- {
- if (jmolColour.isSelected()) {
- // disable automatic sequence colouring.
- jmb.setColourBySequence(false);
+ else
+ {
+ selectionHighlighter.clearSelection();
}
}
- public void seqColour_actionPerformed(ActionEvent actionEvent)
+
+ /**
+ * Respond to a change of the base hovered over in the Varna viewer
+ */
+ @Override
+ public void onHoverChanged(ModeleBase previousBase, ModeleBase newBase)
{
- jmb.setColourBySequence(seqColour.isSelected());
- if (_colourwith == null)
- {
- _colourwith = new Vector();
- }
- if (jmb.isColourBySequence())
+ RNA rna = vab.getSelectedRNA();
+ ShiftList shift = offsetsInv.get(rna);
+ SequenceI seq = models.get(rna).seq;
+ if (newBase != null && seq != null)
{
- if (!jmb.isLoadingFromArchive())
+ if (shift != null)
{
- if (_colourwith.size()==0 && ap!=null) {
- // Make the currently displayed alignment panel the associated view
- _colourwith.add(ap.alignFrame.alignPanel);
- }
+ int i = shift.shift(newBase.getIndex());
+ // System.err.println("shifted "+(arg1.getIndex())+" to "+i);
+ ssm.mouseOverVamsasSequence(seq, i, this);
}
- // Set the colour using the current view for the associated alignframe
- for (AlignmentPanel ap : _colourwith)
+ else
{
- jmb.colourBySequence(ap.av.showSequenceFeatures, ap);
+ ssm.mouseOverVamsasSequence(seq, newBase.getIndex(), this);
}
}
}
- public void chainColour_actionPerformed(ActionEvent actionEvent)
+ @Override
+ public void onSelectionChanged(BaseList arg0, BaseList arg1, BaseList arg2)
{
- chainColour.setSelected(true);
- jmb.colourByChain();
- }
+ // TODO translate selected regions in VARNA to a selection on the
+ // alignpanel.
- public void chargeColour_actionPerformed(ActionEvent actionEvent)
- {
- chargeColour.setSelected(true);
- jmb.colourByCharge();
}
- public void zappoColour_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Returns the path to a temporary file containing a representation of the
+ * state of one Varna display
+ *
+ * @param rna
+ *
+ * @return
+ */
+ public String getStateInfo(RNA rna)
{
- zappoColour.setSelected(true);
- jmb.setJalviewColourScheme(new ZappoColourScheme());
+ return vab.getStateInfo(rna);
}
- public void taylorColour_actionPerformed(ActionEvent actionEvent)
+ public AlignmentPanel getAlignmentPanel()
{
- taylorColour.setSelected(true);
- jmb.setJalviewColourScheme(new TaylorColourScheme());
+ return ap;
}
- public void hydroColour_actionPerformed(ActionEvent actionEvent)
+ public String getViewId()
{
- hydroColour.setSelected(true);
- jmb.setJalviewColourScheme(new HydrophobicColourScheme());
+ return viewId;
}
- public void helixColour_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Returns true if any of the viewer's models (not necessarily the one
+ * currently displayed) is for the given sequence
+ *
+ * @param seq
+ * @return
+ */
+ public boolean isListeningFor(SequenceI seq)
{
- helixColour.setSelected(true);
- jmb.setJalviewColourScheme(new HelixColourScheme());
+ for (RnaModel model : models.values())
+ {
+ if (model.seq == seq)
+ {
+ return true;
+ }
+ }
+ return false;
}
- public void strandColour_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Returns a value representing the horizontal split divider location
+ *
+ * @return
+ */
+ public int getDividerLocation()
{
- strandColour.setSelected(true);
- jmb.setJalviewColourScheme(new StrandColourScheme());
+ return split == null ? 0 : split.getDividerLocation();
}
- public void turnColour_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Tidy up as necessary when the viewer panel is closed
+ */
+ protected void close()
{
- turnColour.setSelected(true);
- jmb.setJalviewColourScheme(new TurnColourScheme());
+ /*
+ * Deregister as a listener, to release references to this object
+ */
+ if (ssm != null)
+ {
+ ssm.removeStructureViewerListener(AppVarna.this, null);
+ ssm.removeSelectionListener(AppVarna.this);
+ }
}
- public void buriedColour_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Returns the secondary structure annotation that this viewer displays for
+ * the given sequence
+ *
+ * @return
+ */
+ public AlignmentAnnotation getAnnotation(SequenceI seq)
{
- buriedColour.setSelected(true);
- jmb.setJalviewColourScheme(new BuriedColourScheme());
+ for (RnaModel model : models.values())
+ {
+ if (model.seq == seq)
+ {
+ return model.ann;
+ }
+ }
+ return null;
}
-
- public void purinePyrimidineColour_actionPerformed(ActionEvent actionEvent)
+
+ public int getSelectedIndex()
{
- setJalviewColourScheme(new PurinePyrimidineColourScheme());
+ return this.vab.getSelectedIndex();
}
-
- public void userColour_actionPerformed(ActionEvent actionEvent)
+
+ /**
+ * Returns the set of models shown by the viewer
+ *
+ * @return
+ */
+ public Collection getModels()
{
- userColour.setSelected(true);
- new UserDefinedColours(this, null);
+ return models.values();
}
- public void backGround_actionPerformed(ActionEvent actionEvent)
+ /**
+ * Add a model (e.g. loaded from project file)
+ *
+ * @param rna
+ * @param modelName
+ */
+ public RNA addModel(RnaModel model, String modelName)
{
- java.awt.Color col = JColorChooser.showDialog(this,
- "Select Background Colour", null);
- if (col != null)
+ if (!model.ann.isValidStruc())
{
- jmb.setBackgroundColour(col);
+ throw new IllegalArgumentException("Invalid RNA structure annotation");
}
- }
- public void jmolHelp_actionPerformed(ActionEvent actionEvent)
- {
+ /*
+ * opened on request in Jalview session
+ */
+ RNA rna = new RNA(modelName);
+ String struc = model.ann.getRNAStruc();
+ struc = replaceOddGaps(struc);
+
+ String strucseq = model.seq.getSequenceAsString();
try
{
- jalview.util.BrowserLauncher
- .openURL("http://jmol.sourceforge.net/docs/JmolUserGuide/");
- } catch (Exception ex)
+ rna.setRNA(strucseq, struc);
+ } catch (ExceptionUnmatchedClosingParentheses e2)
{
- }
- }
-
- public void showConsole(boolean showConsole)
- {
-
- if (showConsole)
+ e2.printStackTrace();
+ } catch (ExceptionFileFormatOrSyntax e3)
{
- if (splitPane == null)
- {
- splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- splitPane.setTopComponent(renderPanel);
- splitPane.setBottomComponent(scriptWindow);
- this.getContentPane().add(splitPane, BorderLayout.CENTER);
- splitPane.setDividerLocation(getHeight() - 200);
- scriptWindow.setVisible(true);
- scriptWindow.validate();
- splitPane.validate();
- }
-
+ e3.printStackTrace();
}
- else
- {
- if (splitPane != null)
- {
- splitPane.setVisible(false);
- }
-
- splitPane = null;
- this.getContentPane().add(renderPanel, BorderLayout.CENTER);
+ if (!model.gapped)
+ {
+ rna = trimRNA(rna, modelName);
}
-
- validate();
+ models.put(rna, new RnaModel(modelName, model.ann, model.seq, rna,
+ model.gapped));
+ vab.addStructure(rna);
+ return rna;
}
- class RenderPanel extends JPanel
+ /**
+ * Constructs a shift list that describes the gaps in the sequence
+ *
+ * @param seq
+ * @return
+ */
+ protected ShiftList buildOffset(SequenceI seq)
{
- final Dimension currentSize = new Dimension();
-
- final Rectangle rectClip = new Rectangle();
+ // TODO refactor to avoid duplication with trimRNA()
+ // TODO JAL-1789 bugs in use of ShiftList here
+ ShiftList offset = new ShiftList();
+ int ofstart = -1;
+ int sleng = seq.getLength();
+ char[] seqChars = seq.getSequence();
- public void paintComponent(Graphics g)
+ for (int i = 0; i < sleng; i++)
{
- getSize(currentSize);
- g.getClipBounds(rectClip);
-
- if (jmb.fileLoadingError != null)
+ if (Comparison.isGap(seqChars[i]))
{
- g.setColor(Color.black);
- g.fillRect(0, 0, currentSize.width, currentSize.height);
- g.setColor(Color.white);
- g.setFont(new Font("Verdana", Font.BOLD, 14));
- g.drawString("Error loading file...", 20, currentSize.height / 2);
- StringBuffer sb = new StringBuffer();
- int lines = 0;
- for (int e = 0; e < jmb.pdbentry.length; e++)
+ if (ofstart == -1)
{
- sb.append(jmb.pdbentry[e].getId());
- if (e < jmb.pdbentry.length - 1)
- {
- sb.append(",");
- }
-
- if (e == jmb.pdbentry.length - 1 || sb.length() > 20)
- {
- lines++;
- g.drawString(sb.toString(), 20, currentSize.height / 2 - lines
- * g.getFontMetrics().getHeight());
- }
+ ofstart = i;
}
}
- else if (jmb == null || jmb.viewer == null || !jmb.isFinishedInit())
- {
- g.setColor(Color.black);
- g.fillRect(0, 0, currentSize.width, currentSize.height);
- g.setColor(Color.white);
- g.setFont(new Font("Verdana", Font.BOLD, 14));
- g.drawString("Retrieving PDB data....", 20, currentSize.height / 2);
- }
else
{
- jmb.viewer.renderScreenImage(g, currentSize, rectClip);
+ if (ofstart > -1)
+ {
+ offset.addShift(offset.shift(ofstart), ofstart - i);
+ ofstart = -1;
+ }
}
}
- }
-
- String viewId = null;
-
- public String getViewId()
- {
- if (viewId == null)
+ // final gap
+ if (ofstart > -1)
{
- viewId = System.currentTimeMillis() + "." + this.hashCode();
+ offset.addShift(offset.shift(ofstart), ofstart - sleng);
+ ofstart = -1;
}
- return viewId;
+ return offset;
}
- public void updateTitleAndMenus()
- {
- if (jmb.fileLoadingError != null && jmb.fileLoadingError.length() > 0)
- {
- repaint();
- return;
- }
- setChainMenuItems(jmb.chainNames);
-
- this.setTitle(jmb.getViewerTitle());
- if (jmb.getPdbFile().length > 1 && jmb.sequence.length > 1)
- {
- jmolActionMenu.setVisible(true);
- }
- if (!jmb.isLoadingFromArchive())
- {
- seqColour_actionPerformed(null);
- }
- }
-
- protected void buildJmolActionMenu()
+ /**
+ * Set the selected index in the model selection list
+ *
+ * @param selectedIndex
+ */
+ public void setInitialSelection(final int selectedIndex)
{
- if (_alignwith == null)
- {
- _alignwith = new Vector();
- }
- if (_alignwith.size() == 0 && ap != null)
- {
- _alignwith.add(ap);
- }
- ;
- for (Component c : jmolActionMenu.getMenuComponents())
+ /*
+ * empirically it needs a second for Varna/AWT to finish loading/drawing
+ * models for this to work; SwingUtilities.invokeLater _not_ a solution;
+ * explanation and/or better solution welcome!
+ */
+ synchronized (this)
{
- if (c != alignStructs)
+ try
{
- jmolActionMenu.remove((JMenuItem) c);
+ wait(1000);
+ } catch (InterruptedException e)
+ {
+ // meh
}
}
- final ItemListener handler;
+ vab.setSelectedIndex(selectedIndex);
}
- /*
- * (non-Javadoc)
+ /**
+ * Add a model with associated Varna session file
*
- * @see
- * jalview.jbgui.GStructureViewer#alignStructs_actionPerformed(java.awt.event
- * .ActionEvent)
+ * @param rna
+ * @param modelName
*/
- @Override
- protected void alignStructs_actionPerformed(ActionEvent actionEvent)
+ public RNA addModelSession(RnaModel model, String modelName,
+ String sessionFile)
{
- alignStructs_withAllAlignPanels();
- }
-
- private void alignStructs_withAllAlignPanels()
- {
- if (ap == null)
- {
- return;
- }
- ;
- if (_alignwith.size() == 0)
+ if (!model.ann.isValidStruc())
{
- _alignwith.add(ap);
+ throw new IllegalArgumentException("Invalid RNA structure annotation");
}
- ;
+
try
{
- AlignmentI[] als = new Alignment[_alignwith.size()];
- ColumnSelection[] alc = new ColumnSelection[_alignwith.size()];
- int[] alm = new int[_alignwith.size()];
- int a = 0;
-
- for (AlignmentPanel ap : _alignwith)
+ FullBackup fromSession = vab.vp.loadSession(sessionFile);
+ vab.addStructure(fromSession.rna, fromSession.config);
+ RNA rna = fromSession.rna;
+ // copy the model, but now including the RNA object
+ RnaModel newModel = new RnaModel(model.title, model.ann, model.seq,
+ rna, model.gapped);
+ if (!model.gapped)
{
- als[a] = ap.av.getAlignment();
- alm[a] = -1;
- alc[a++] = ap.av.getColumnSelection();
+ registerOffset(rna, buildOffset(model.seq));
}
- jmb.superposeStructures(als, alm, alc);
- } catch (Exception e)
+ models.put(rna, newModel);
+ // capture rna selection state when saved
+ selectionHighlighter = new VarnaHighlighter(rna);
+ return fromSession.rna;
+ } catch (ExceptionLoadingFailed e)
{
- StringBuffer sp = new StringBuffer();
- for (AlignmentPanel ap : _alignwith)
- {
- sp.append("'" + ap.alignFrame.getTitle() + "' ");
- }
- Cache.log.info("Couldn't align structures with the " + sp.toString()
- + "associated alignment panels.", e);
-
+ System.err
+ .println("Error restoring Varna session: " + e.getMessage());
+ return null;
}
-
- }
-
- public void setJalviewColourScheme(ColourSchemeI ucs)
- {
- jmb.setJalviewColourScheme(ucs);
-
}
/**
+ * Replace everything except RNA secondary structure characters with a period
*
- * @param alignment
- * @return first alignment panel displaying given alignment, or the default
- * alignment panel
+ * @param s
+ * @return
*/
- public AlignmentPanel getAlignmentPanelFor(AlignmentI alignment)
+ public static String replaceOddGaps(String s)
{
- for (AlignmentPanel ap : getAllAlignmentPanels())
+ if (s == null)
+ {
+ return null;
+ }
+
+ // this is measured to be 10 times faster than a regex replace
+ boolean changed = false;
+ byte[] bytes = s.getBytes();
+ for (int i = 0; i < bytes.length; i++)
{
- if (ap.av.getAlignment() == alignment)
+ boolean ok = false;
+ // todo check for ((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z')) if
+ // wanted also
+ for (int j = 0; !ok && (j < PAIRS.length); j++)
{
- return ap;
+ if (bytes[i] == PAIRS[j])
+ {
+ ok = true;
+ }
+ }
+ if (!ok)
+ {
+ bytes[i] = '.';
+ changed = true;
}
}
- return ap;
+ return changed ? new String(bytes) : s;
}
-
- /**
- *
- * @param ap2
- * @return true if this Jmol instance is linked with the given alignPanel
- */
- public boolean isLinkedWith(AlignmentPanel ap2)
- {
- return _aps.contains(ap2.av.getSequenceSetId());
- }
-
- public boolean isUsedforaligment(AlignmentPanel ap2)
- {
-
- return (_alignwith != null) && _alignwith.contains(ap2);
- }
-
- public boolean isUsedforcolourby(AlignmentPanel ap2)
- {
- return (_colourwith != null) && _colourwith.contains(ap2);
- }
-
- /**
- *
- * @return TRUE if the view is NOT being coloured by sequence associations.
- */
- public boolean isColouredByJmol()
- {
- return !jmb.isColourBySequence();
- }
-
-
}