X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=3f8175d204631cfb5e6a3a21c5b7ce3cf858dbc3;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=932517205d2a76048dad99a679419d7c1cab6239;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java index 9325172..3f8175d 100644 --- a/src/jalview/gui/AppJmolBinding.java +++ b/src/jalview/gui/AppJmolBinding.java @@ -20,32 +20,41 @@ */ package jalview.gui; +import java.awt.Container; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.swing.JComponent; + +import org.jmol.api.JmolAppConsoleInterface; +import org.openscience.jmol.app.jmolpanel.console.AppConsole; + import jalview.api.AlignmentViewPanel; import jalview.api.structures.JalviewStructureDisplayI; -import jalview.bin.Cache; +import jalview.bin.Console; +import jalview.datamodel.AlignmentI; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JalviewJmolBinding; import jalview.io.DataSourceType; import jalview.structure.StructureSelectionManager; - -import java.awt.Container; -import java.util.Map; - -import org.jmol.api.JmolAppConsoleInterface; -import org.jmol.java.BS; -import org.openscience.jmol.app.jmolpanel.console.AppConsole; +import jalview.util.MessageManager; +import jalview.util.Platform; +import jalview.ws.dbsources.EBIAlfaFold; +import jalview.ws.dbsources.Pdb; +import jalview.ws.utils.UrlDownloadClient; +import javajs.util.BS; public class AppJmolBinding extends JalviewJmolBinding { - private AppJmol appJmolWindow; - public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol) { super(sSm, pdbentry, sequenceIs, protocol); - appJmolWindow = appJmol; + setViewer(appJmol); } @Override @@ -82,7 +91,7 @@ public class AppJmolBinding extends JalviewJmolBinding jalview.util.BrowserLauncher.openURL(url); } catch (Exception e) { - Cache.log.error("Failed to launch Jmol-associated url " + url, e); + Console.error("Failed to launch Jmol-associated url " + url, e); // TODO: 2.6 : warn user if browser was not configured. } } @@ -90,34 +99,26 @@ public class AppJmolBinding extends JalviewJmolBinding @Override public void refreshGUI() { + if (getMappedStructureCount() == 0) + { + // too soon! + return; + } // appJmolWindow.repaint(); javax.swing.SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - appJmolWindow.updateTitleAndMenus(); - appJmolWindow.revalidate(); + JalviewStructureDisplayI theViewer = getViewer(); + // invokes colourbySequence() via seqColour_ActionPerformed() + theViewer.updateTitleAndMenus(); + ((JComponent) theViewer).revalidate(); } }); } @Override - public void updateColours(Object source) - { - AlignmentPanel ap = (AlignmentPanel) source; - // ignore events from panels not used to colour this view - if (!appJmolWindow.isUsedforcolourby(ap)) - { - return; - } - if (!isLoadingFromArchive()) - { - colourBySequence(ap); - } - } - - @Override public void notifyScriptTermination(String strStatus, int msWalltime) { // todo - script termination doesn't happen ? @@ -141,35 +142,28 @@ public class AppJmolBinding extends JalviewJmolBinding @Override public void selectionChanged(BS arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void refreshPdbEntries() - { - // TODO Auto-generated method stub - } @Override public void showConsole(boolean b) { - appJmolWindow.showConsole(b); + getViewer().showConsole(b); } @Override protected JmolAppConsoleInterface createJmolConsole( Container consolePanel, String buttonsToShow) { - viewer.setJmolCallbackListener(this); - return new AppConsole(viewer, consolePanel, buttonsToShow); + jmolViewer.setJmolCallbackListener(this); + // BH comment: can't do this yet [for JS only, or generally?] + return Platform.isJS() ? null + : new AppConsole(jmolViewer, consolePanel, buttonsToShow); } @Override protected void releaseUIResources() { - appJmolWindow = null; + setViewer(null); closeConsole(); } @@ -178,7 +172,7 @@ public class AppJmolBinding extends JalviewJmolBinding { if (svl instanceof SeqPanel) { - appJmolWindow.removeAlignmentPanel(((SeqPanel) svl).ap); + getViewer().removeAlignmentPanel(((SeqPanel) svl).ap); } } @@ -189,24 +183,114 @@ public class AppJmolBinding extends JalviewJmolBinding return null; } - @Override - public JalviewStructureDisplayI getViewer() + @SuppressWarnings("unused") + public void cacheFiles(List files) { - return appJmolWindow; + if (files == null) + { + return; + } + for (File f : files) + { + Platform.cacheFileData(f); + } } - @Override - public jalview.api.FeatureRenderer getFeatureRenderer( - AlignmentViewPanel alignment) + /** + * Retrieves and saves as file any modelled PDB entries for which we do not + * already have a file saved. Returns a list of absolute paths to structure + * files which were either retrieved, or already stored but not modelled in + * the structure viewer (i.e. files to add to the viewer display). + * + * Currently only used by Jmol - similar but different code used for Chimera/X + * and Pymol so still need to refactor + * + * @param structureViewer + * UI proxy for the structure viewer + * @return list of absolute paths to structures retrieved that need to be + * added to the display + */ + public List fetchPdbFiles(StructureViewerBase structureViewer) { - AlignmentPanel ap = (alignment == null) - ? appJmolWindow.getAlignmentPanel() - : (AlignmentPanel) alignment; - if (ap.av.isShowSequenceFeatures()) + // todo - record which pdbids were successfully imported. + StringBuilder errormsgs = new StringBuilder(); + + List files = new ArrayList<>(); + String pdbid = ""; + try { - return ap.av.getAlignPanel().getSeqPanel().seqCanvas.fr; - } + String[] filesInViewer = getStructureFiles(); + // TODO: replace with reference fetching/transfer code (validate PDBentry + // as a DBRef?) - return null; + for (int pi = 0; pi < getPdbCount(); pi++) + { + PDBEntry strucEntry = getPdbEntry(pi); + + String file = strucEntry.getFile(); + if (file == null) + { + pdbid = strucEntry.getId(); + try + { + file = structureViewer.fetchPdbFile(strucEntry); + } catch (OutOfMemoryError oomerror) + { + new OOMWarning("Retrieving PDB id " + pdbid, oomerror); + } catch (Exception ex) + { + ex.printStackTrace(); + errormsgs.append("'").append(pdbid).append("'"); + } + if (file != null) + { + // success + files.add(file); + } + else + { + errormsgs.append("'").append(pdbid).append("' "); + } + } + else + { + if (filesInViewer != null && filesInViewer.length > 0) + { + structureViewer.setAddingStructures(true); // already files loaded. + for (int c = 0; c < filesInViewer.length; c++) + { + if (Platform.pathEquals(filesInViewer[c], file)) + { + file = null; + break; + } + } + } + if (file != null) + { + files.add(file); + } + } + } + } catch (OutOfMemoryError oomerror) + { + new OOMWarning("Retrieving PDB files: " + pdbid, oomerror); + } catch (Exception ex) + { + ex.printStackTrace(); + errormsgs.append("When retrieving pdbfiles : current was: '") + .append(pdbid).append("'"); + } + if (errormsgs.length() > 0) + { + JvOptionPane.showInternalMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.pdb_entries_couldnt_be_retrieved", new String[] + { errormsgs.toString() }), + MessageManager.getString("label.couldnt_load_file"), + JvOptionPane.ERROR_MESSAGE); + } + return files; } + }