X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureChooser.java;h=3350f6cc62327c338415713360233537290d1a83;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=3df7e0c8c3a08df73b704ade978d604ab3cc349b;hpb=14c840a69bcdc5d9709fde571d62c1add051e4f6;p=jalview.git diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java index 3df7e0c..3350f6c 100644 --- a/src/jalview/gui/StructureChooser.java +++ b/src/jalview/gui/StructureChooser.java @@ -21,19 +21,23 @@ package jalview.gui; +import jalview.bin.Jalview; import jalview.datamodel.DBRefEntry; import jalview.datamodel.DBRefSource; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; +import jalview.fts.api.FTSData; +import jalview.fts.api.FTSDataColumnI; +import jalview.fts.api.FTSRestClientI; +import jalview.fts.core.FTSRestRequest; +import jalview.fts.core.FTSRestResponse; +import jalview.fts.service.pdb.PDBFTSRestClient; import jalview.jbgui.GStructureChooser; -import jalview.jbgui.PDBDocFieldPreferences; +import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; -import jalview.ws.dbsources.PDBRestClient; -import jalview.ws.dbsources.PDBRestClient.PDBDocField; -import jalview.ws.uimodel.PDBRestRequest; -import jalview.ws.uimodel.PDBRestResponse; -import jalview.ws.uimodel.PDBRestResponse.PDBResponseSummary; +import jalview.ws.DBRefFetcher; +import jalview.ws.sifts.SiftsSettings; import java.awt.event.ItemEvent; import java.util.ArrayList; @@ -41,6 +45,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.Vector; import javax.swing.JCheckBox; import javax.swing.JComboBox; @@ -55,26 +62,27 @@ import javax.swing.table.AbstractTableModel; * */ @SuppressWarnings("serial") -public class StructureChooser extends GStructureChooser +public class StructureChooser extends GStructureChooser implements + IProgressIndicator { - private boolean structuresDiscovered = false; - private SequenceI selectedSequence; private SequenceI[] selectedSequences; private IProgressIndicator progressIndicator; - private Collection discoveredStructuresSet; + private Collection discoveredStructuresSet; - private PDBRestRequest lastPdbRequest; + private FTSRestRequest lastPdbRequest; - private PDBRestClient pdbRestCleint; + private FTSRestClientI pdbRestCleint; private String selectedPdbFileName; private boolean isValidPBDEntry; + private boolean cachedPDBExists; + public StructureChooser(SequenceI[] selectedSeqs, SequenceI selectedSeq, AlignmentPanel ap) { @@ -90,6 +98,13 @@ public class StructureChooser extends GStructureChooser */ public void init() { + if (!Jalview.isHeadlessMode()) + { + progressBar = new ProgressBar(this.statusPanel, this.statusBar); + } + + // ensure a filter option is in force for search + populateFilterComboBox(true, cachedPDBExists); Thread discoverPDBStructuresThread = new Thread(new Runnable() { @Override @@ -104,7 +119,8 @@ public class StructureChooser extends GStructureChooser .getString("status.searching_for_pdb_structures"), startTime); fetchStructuresMetaData(); - populateFilterComboBox(); + // revise filter options if no results were found + populateFilterComboBox(isStructuresDiscovered(), cachedPDBExists); updateProgressIndicator(null, startTime); mainFrame.setVisible(true); updateCurrentView(); @@ -136,22 +152,26 @@ public class StructureChooser extends GStructureChooser public void fetchStructuresMetaData() { long startTime = System.currentTimeMillis(); - Collection wantedFields = PDBDocFieldPreferences + pdbRestCleint = PDBFTSRestClient.getInstance(); + Collection wantedFields = pdbDocFieldPrefs .getStructureSummaryFields(); - discoveredStructuresSet = new LinkedHashSet(); + discoveredStructuresSet = new LinkedHashSet(); HashSet errors = new HashSet(); for (SequenceI seq : selectedSequences) { - PDBRestRequest pdbRequest = new PDBRestRequest(); + FTSRestRequest pdbRequest = new FTSRestRequest(); pdbRequest.setAllowEmptySeq(false); pdbRequest.setResponseSize(500); pdbRequest.setFieldToSearchBy("("); + FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption + .getSelectedItem()); + pdbRequest.setFieldToSortBy(selectedFilterOpt.getValue(), + !chk_invertFilter.isSelected()); pdbRequest.setWantedFields(wantedFields); pdbRequest.setSearchTerm(buildQuery(seq) + ")"); pdbRequest.setAssociatedSequence(seq); - pdbRestCleint = new PDBRestClient(); - PDBRestResponse resultList; + FTSRestResponse resultList; try { resultList = pdbRestCleint.executeRequest(pdbRequest); @@ -175,9 +195,9 @@ public class StructureChooser extends GStructureChooser if (discoveredStructuresSet != null && !discoveredStructuresSet.isEmpty()) { - tbl_summary.setModel(PDBRestResponse.getTableModel(lastPdbRequest, - discoveredStructuresSet)); - structuresDiscovered = true; + getResultTable().setModel( + FTSRestResponse.getTableModel(lastPdbRequest, + discoveredStructuresSet)); noOfStructuresFound = discoveredStructuresSet.size(); mainFrame.setTitle(MessageManager.formatMessage( "label.structure_chooser_no_of_structures", @@ -219,7 +239,7 @@ public class StructureChooser extends GStructureChooser } } } - + cachedPDBExists = !entries.isEmpty(); PDBEntryTableModel tableModelx = new PDBEntryTableModel(entries); tbl_local_pdb.setModel(tableModelx); } @@ -237,7 +257,7 @@ public class StructureChooser extends GStructureChooser boolean isPDBRefsFound = false; boolean isUniProtRefsFound = false; StringBuilder queryBuilder = new StringBuilder(); - HashSet seqRefs = new LinkedHashSet(); + Set seqRefs = new LinkedHashSet(); if (seq.getAllPDBEntries() != null) { @@ -245,10 +265,8 @@ public class StructureChooser extends GStructureChooser { if (isValidSeqName(entry.getId())) { - queryBuilder.append(PDBRestClient.PDBDocField.PDB_ID.getCode()) - .append(":") -.append(entry.getId().toLowerCase()) - .append(" OR "); + queryBuilder.append("pdb_id:") + .append(entry.getId().toLowerCase()).append(" OR "); isPDBRefsFound = true; // seqRefs.add(entry.getId()); } @@ -263,23 +281,17 @@ public class StructureChooser extends GStructureChooser { if (dbRef.getSource().equalsIgnoreCase(DBRefSource.UNIPROT)) { - queryBuilder - .append(PDBRestClient.PDBDocField.UNIPROT_ACCESSION - .getCode()).append(":") - .append(getDBRefId(dbRef)) - .append(" OR "); - queryBuilder - .append(PDBRestClient.PDBDocField.UNIPROT_ID.getCode()) - .append(":") + queryBuilder.append("uniprot_accession:") .append(getDBRefId(dbRef)).append(" OR "); + queryBuilder.append("uniprot_id:").append(getDBRefId(dbRef)) + .append(" OR "); isUniProtRefsFound = true; } else if (dbRef.getSource().equalsIgnoreCase(DBRefSource.PDB)) { - queryBuilder.append(PDBRestClient.PDBDocField.PDB_ID.getCode()) - .append(":").append(getDBRefId(dbRef).toLowerCase()) - .append(" OR "); + queryBuilder.append("pdb_id:") + .append(getDBRefId(dbRef).toLowerCase()).append(" OR "); isPDBRefsFound = true; } else @@ -293,6 +305,7 @@ public class StructureChooser extends GStructureChooser if (!isPDBRefsFound && !isUniProtRefsFound) { String seqName = seq.getName(); + seqName = sanitizeSeqName(seqName); String[] names = seqName.toLowerCase().split("\\|"); for (String name : names) { @@ -320,6 +333,20 @@ public class StructureChooser extends GStructureChooser } /** + * Remove the following special characters from input string +, -, &, !, (, ), + * {, }, [, ], ^, ", ~, *, ?, :, \ + * + * @param seqName + * @return + */ + static String sanitizeSeqName(String seqName) + { + Objects.requireNonNull(seqName); + return seqName.replaceAll("\\[\\d*\\]", "") + .replaceAll("[^\\dA-Za-z|_]", "").replaceAll("\\s+", "+"); + } + + /** * Ensures sequence ref names are not less than 3 characters and does not * contain a database name * @@ -369,24 +396,40 @@ public class StructureChooser extends GStructureChooser public void run() { long startTime = System.currentTimeMillis(); + pdbRestCleint = PDBFTSRestClient.getInstance(); lbl_loading.setVisible(true); - Collection wantedFields = PDBDocFieldPreferences + Collection wantedFields = pdbDocFieldPrefs .getStructureSummaryFields(); - Collection filteredResponse = new HashSet(); + Collection filteredResponse = new HashSet(); HashSet errors = new HashSet(); + for (SequenceI seq : selectedSequences) { - PDBRestRequest pdbRequest = new PDBRestRequest(); - pdbRequest.setAllowEmptySeq(false); - pdbRequest.setResponseSize(1); - pdbRequest.setFieldToSearchBy("("); - pdbRequest.setFieldToSortBy(fieldToFilterBy, - !chk_invertFilter.isSelected()); - pdbRequest.setSearchTerm(buildQuery(seq) + ")"); - pdbRequest.setWantedFields(wantedFields); - pdbRequest.setAssociatedSequence(seq); - pdbRestCleint = new PDBRestClient(); - PDBRestResponse resultList; + FTSRestRequest pdbRequest = new FTSRestRequest(); + if (fieldToFilterBy.equalsIgnoreCase("uniprot_coverage")) + { + pdbRequest.setAllowEmptySeq(false); + pdbRequest.setResponseSize(1); + pdbRequest.setFieldToSearchBy("("); + pdbRequest.setSearchTerm(buildQuery(seq) + ")"); + pdbRequest.setWantedFields(wantedFields); + pdbRequest.setAssociatedSequence(seq); + pdbRequest.setFacet(true); + pdbRequest.setFacetPivot(fieldToFilterBy + ",entry_entity"); + pdbRequest.setFacetPivotMinCount(1); + } + else + { + pdbRequest.setAllowEmptySeq(false); + pdbRequest.setResponseSize(1); + pdbRequest.setFieldToSearchBy("("); + pdbRequest.setFieldToSortBy(fieldToFilterBy, + !chk_invertFilter.isSelected()); + pdbRequest.setSearchTerm(buildQuery(seq) + ")"); + pdbRequest.setWantedFields(wantedFields); + pdbRequest.setAssociatedSequence(seq); + } + FTSRestResponse resultList; try { resultList = pdbRestCleint.executeRequest(pdbRequest); @@ -409,14 +452,21 @@ public class StructureChooser extends GStructureChooser if (!filteredResponse.isEmpty()) { final int filterResponseCount = filteredResponse.size(); - Collection reorderedStructuresSet = new LinkedHashSet(); + Collection reorderedStructuresSet = new LinkedHashSet(); reorderedStructuresSet.addAll(filteredResponse); reorderedStructuresSet.addAll(discoveredStructuresSet); - tbl_summary.setModel(PDBRestResponse.getTableModel( - lastPdbRequest, reorderedStructuresSet)); - + getResultTable().setModel( + FTSRestResponse.getTableModel(lastPdbRequest, + reorderedStructuresSet)); + + FTSRestResponse.configureTableColumn(getResultTable(), + wantedFields, tempUserPrefs); + getResultTable().getColumn("Ref Sequence").setPreferredWidth(120); + getResultTable().getColumn("Ref Sequence").setMinWidth(100); + getResultTable().getColumn("Ref Sequence").setMaxWidth(200); // Update table selection model here - tbl_summary.addRowSelectionInterval(0, filterResponseCount - 1); + getResultTable().addRowSelectionInterval(0, + filterResponseCount - 1); mainFrame.setTitle(MessageManager.formatMessage( "label.structure_chooser_filter_time", totalTime)); } @@ -476,36 +526,47 @@ public class StructureChooser extends GStructureChooser * Populates the filter combo-box options dynamically depending on discovered * structures */ - @Override - protected void populateFilterComboBox() + protected void populateFilterComboBox(boolean haveData, + boolean cachedPDBExists) { - if (isStructuresDiscovered()) + /* + * temporarily suspend the change listener behaviour + */ + cmb_filterOption.removeItemListener(this); + + cmb_filterOption.removeAllItems(); + if (haveData) { cmb_filterOption.addItem(new FilterOption("Best Quality", - PDBDocField.OVERALL_QUALITY.getCode(), VIEWS_FILTER)); - cmb_filterOption.addItem(new FilterOption("Best UniProt Coverage", - PDBDocField.UNIPROT_COVERAGE.getCode(), VIEWS_FILTER)); - cmb_filterOption.addItem(new FilterOption("Highest Resolution", - PDBDocField.RESOLUTION.getCode(), VIEWS_FILTER)); - cmb_filterOption.addItem(new FilterOption("Highest Protein Chain", - PDBDocField.PROTEIN_CHAIN_COUNT.getCode(), VIEWS_FILTER)); - cmb_filterOption.addItem(new FilterOption("Highest Bound Molecules", - PDBDocField.BOUND_MOLECULE_COUNT.getCode(), VIEWS_FILTER)); - cmb_filterOption.addItem(new FilterOption("Highest Polymer Residues", - PDBDocField.POLYMER_RESIDUE_COUNT.getCode(), VIEWS_FILTER)); + "overall_quality", VIEWS_FILTER)); + cmb_filterOption.addItem(new FilterOption("Best Resolution", + "resolution", VIEWS_FILTER)); + cmb_filterOption.addItem(new FilterOption("Most Protein Chain", + "number_of_protein_chains", VIEWS_FILTER)); + cmb_filterOption.addItem(new FilterOption("Most Bound Molecules", + "number_of_bound_molecules", VIEWS_FILTER)); + cmb_filterOption.addItem(new FilterOption("Most Polymer Residues", + "number_of_polymer_residues", VIEWS_FILTER)); } cmb_filterOption.addItem(new FilterOption("Enter PDB Id", "-", VIEWS_ENTER_ID)); cmb_filterOption.addItem(new FilterOption("From File", "-", VIEWS_FROM_FILE)); - cmb_filterOption.addItem(new FilterOption("Cached PDB Entries", "-", - VIEWS_LOCAL_PDB)); + FilterOption cachedOption = new FilterOption("Cached PDB Entries", "-", + VIEWS_LOCAL_PDB); + cmb_filterOption.addItem(cachedOption); + + if (/*!haveData &&*/cachedPDBExists) + { + cmb_filterOption.setSelectedItem(cachedOption); + } + + cmb_filterOption.addItemListener(this); } /** * Updates the displayed view based on the selected filter option */ - @Override protected void updateCurrentView() { FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption @@ -545,7 +606,7 @@ public class StructureChooser extends GStructureChooser String currentView = selectedFilterOpt.getView(); if (currentView == VIEWS_FILTER) { - if (tbl_summary.getSelectedRows().length > 0) + if (getResultTable().getSelectedRows().length > 0) { btn_view.setEnabled(true); } @@ -669,134 +730,221 @@ public class StructureChooser extends GStructureChooser @Override public void ok_ActionPerformed() { - FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption - .getSelectedItem()); - String currentView = selectedFilterOpt.getView(); - if (currentView == VIEWS_FILTER) + final long progressSessionId = System.currentTimeMillis(); + final StructureSelectionManager ssm = ap.getStructureSelectionManager(); + final int preferredHeight = pnl_filter.getHeight(); + ssm.setProgressIndicator(this); + ssm.setProgressSessionId(progressSessionId); + new Thread(new Runnable() { - int pdbIdColIndex = tbl_summary.getColumn( - PDBRestClient.PDBDocField.PDB_ID.getName()).getModelIndex(); - int refSeqColIndex = tbl_summary.getColumn("Ref Sequence") - .getModelIndex(); - int[] selectedRows = tbl_summary.getSelectedRows(); - PDBEntry[] pdbEntriesToView = new PDBEntry[selectedRows.length]; - int count = 0; - ArrayList selectedSeqsToView = new ArrayList(); - for (int row : selectedRows) + @Override + public void run() { - String pdbIdStr = tbl_summary.getValueAt(row, pdbIdColIndex) - .toString(); - SequenceI selectedSeq = (SequenceI) tbl_summary.getValueAt(row, - refSeqColIndex); - selectedSeqsToView.add(selectedSeq); - PDBEntry pdbEntry = selectedSeq.getPDBEntry(pdbIdStr); - if (pdbEntry == null) + FilterOption selectedFilterOpt = ((FilterOption) cmb_filterOption + .getSelectedItem()); + String currentView = selectedFilterOpt.getView(); + if (currentView == VIEWS_FILTER) { - pdbEntry = new PDBEntry(); - pdbEntry.setId(pdbIdStr); - pdbEntry.setType(PDBEntry.Type.PDB); - selectedSeq.getDatasetSequence().addPDBId(pdbEntry); + int pdbIdColIndex = getResultTable().getColumn("PDB Id") + .getModelIndex(); + int refSeqColIndex = getResultTable().getColumn("Ref Sequence") + .getModelIndex(); + int[] selectedRows = getResultTable().getSelectedRows(); + PDBEntry[] pdbEntriesToView = new PDBEntry[selectedRows.length]; + int count = 0; + ArrayList selectedSeqsToView = new ArrayList(); + for (int row : selectedRows) + { + String pdbIdStr = getResultTable().getValueAt(row, + pdbIdColIndex).toString(); + SequenceI selectedSeq = (SequenceI) getResultTable() + .getValueAt(row, refSeqColIndex); + selectedSeqsToView.add(selectedSeq); + PDBEntry pdbEntry = selectedSeq.getPDBEntry(pdbIdStr); + if (pdbEntry == null) + { + pdbEntry = getFindEntry(pdbIdStr, + selectedSeq.getAllPDBEntries()); + } + if (pdbEntry == null) + { + pdbEntry = new PDBEntry(); + pdbEntry.setId(pdbIdStr); + pdbEntry.setType(PDBEntry.Type.PDB); + selectedSeq.getDatasetSequence().addPDBId(pdbEntry); + } + pdbEntriesToView[count++] = pdbEntry; + } + SequenceI[] selectedSeqs = selectedSeqsToView + .toArray(new SequenceI[selectedSeqsToView.size()]); + launchStructureViewer(ssm, pdbEntriesToView, ap, selectedSeqs); } - pdbEntriesToView[count++] = pdbEntry; - } - SequenceI[] selectedSeqs = selectedSeqsToView - .toArray(new SequenceI[selectedSeqsToView.size()]); - launchStructureViewer(ap.getStructureSelectionManager(), - pdbEntriesToView, ap, selectedSeqs); - } - else if (currentView == VIEWS_LOCAL_PDB) - { - int[] selectedRows = tbl_local_pdb.getSelectedRows(); - PDBEntry[] pdbEntriesToView = new PDBEntry[selectedRows.length]; - int count = 0; - int pdbIdColIndex = tbl_local_pdb.getColumn( - PDBRestClient.PDBDocField.PDB_ID.getName()).getModelIndex(); - int refSeqColIndex = tbl_local_pdb.getColumn("Ref Sequence") - .getModelIndex(); - ArrayList selectedSeqsToView = new ArrayList(); - for (int row : selectedRows) - { - PDBEntry pdbEntry = (PDBEntry) tbl_local_pdb.getValueAt(row, - pdbIdColIndex); - pdbEntriesToView[count++] = pdbEntry; - SequenceI selectedSeq = (SequenceI) tbl_local_pdb.getValueAt(row, - refSeqColIndex); - selectedSeqsToView.add(selectedSeq); - } - SequenceI[] selectedSeqs = selectedSeqsToView - .toArray(new SequenceI[selectedSeqsToView.size()]); - launchStructureViewer(ap.getStructureSelectionManager(), - pdbEntriesToView, ap, selectedSeqs); - } - else if (currentView == VIEWS_ENTER_ID) - { - SequenceI userSelectedSeq = ((AssociateSeqOptions) idInputAssSeqPanel - .getCmb_assSeq().getSelectedItem()).getSequence(); - if (userSelectedSeq != null) - { - selectedSequence = userSelectedSeq; - } + else if (currentView == VIEWS_LOCAL_PDB) + { + int[] selectedRows = tbl_local_pdb.getSelectedRows(); + PDBEntry[] pdbEntriesToView = new PDBEntry[selectedRows.length]; + int count = 0; + int pdbIdColIndex = tbl_local_pdb.getColumn("PDB Id") + .getModelIndex(); + int refSeqColIndex = tbl_local_pdb.getColumn("Ref Sequence") + .getModelIndex(); + ArrayList selectedSeqsToView = new ArrayList(); + for (int row : selectedRows) + { + PDBEntry pdbEntry = (PDBEntry) tbl_local_pdb.getValueAt(row, + pdbIdColIndex); + pdbEntriesToView[count++] = pdbEntry; + SequenceI selectedSeq = (SequenceI) tbl_local_pdb.getValueAt( + row, refSeqColIndex); + selectedSeqsToView.add(selectedSeq); + } + SequenceI[] selectedSeqs = selectedSeqsToView + .toArray(new SequenceI[selectedSeqsToView.size()]); + launchStructureViewer(ssm, pdbEntriesToView, ap, selectedSeqs); + } + else if (currentView == VIEWS_ENTER_ID) + { + SequenceI userSelectedSeq = ((AssociateSeqOptions) idInputAssSeqPanel + .getCmb_assSeq().getSelectedItem()).getSequence(); + if (userSelectedSeq != null) + { + selectedSequence = userSelectedSeq; + } - String pdbIdStr = txt_search.getText(); - PDBEntry pdbEntry = selectedSequence.getPDBEntry(pdbIdStr); - if (pdbEntry == null) - { - pdbEntry = new PDBEntry(); - pdbEntry.setId(pdbIdStr); - pdbEntry.setType(PDBEntry.Type.PDB); - selectedSequence.getDatasetSequence().addPDBId(pdbEntry); + String pdbIdStr = txt_search.getText(); + PDBEntry pdbEntry = selectedSequence.getPDBEntry(pdbIdStr); + if (pdbEntry == null) + { + pdbEntry = new PDBEntry(); + if (pdbIdStr.split(":").length > 1) + { + pdbEntry.setId(pdbIdStr.split(":")[0]); + pdbEntry.setChainCode(pdbIdStr.split(":")[1].toUpperCase()); + } + else + { + pdbEntry.setId(pdbIdStr); + } + pdbEntry.setType(PDBEntry.Type.PDB); + selectedSequence.getDatasetSequence().addPDBId(pdbEntry); + } + + PDBEntry[] pdbEntriesToView = new PDBEntry[] { pdbEntry }; + launchStructureViewer(ssm, pdbEntriesToView, ap, + new SequenceI[] { selectedSequence }); + } + else if (currentView == VIEWS_FROM_FILE) + { + SequenceI userSelectedSeq = ((AssociateSeqOptions) fileChooserAssSeqPanel + .getCmb_assSeq().getSelectedItem()).getSequence(); + if (userSelectedSeq != null) + { + selectedSequence = userSelectedSeq; + } + PDBEntry fileEntry = new AssociatePdbFileWithSeq() + .associatePdbWithSeq(selectedPdbFileName, + jalview.io.AppletFormatAdapter.FILE, + selectedSequence, true, Desktop.instance); + + launchStructureViewer(ssm, new PDBEntry[] { fileEntry }, ap, + new SequenceI[] { selectedSequence }); + } + closeAction(preferredHeight); } + }).start(); + } - PDBEntry[] pdbEntriesToView = new PDBEntry[] { pdbEntry }; - launchStructureViewer(ap.getStructureSelectionManager(), - pdbEntriesToView, ap, new SequenceI[] { selectedSequence }); - } - else if (currentView == VIEWS_FROM_FILE) + private PDBEntry getFindEntry(String id, Vector pdbEntries) + { + Objects.requireNonNull(id); + Objects.requireNonNull(pdbEntries); + PDBEntry foundEntry = null; + for (PDBEntry entry : pdbEntries) { - SequenceI userSelectedSeq = ((AssociateSeqOptions) fileChooserAssSeqPanel - .getCmb_assSeq().getSelectedItem()).getSequence(); - if (userSelectedSeq != null) + if (entry.getId().equalsIgnoreCase(id)) { - selectedSequence = userSelectedSeq; + return entry; } - PDBEntry fileEntry = new AssociatePdbFileWithSeq() - .associatePdbWithSeq(selectedPdbFileName, - jalview.io.AppletFormatAdapter.FILE, - selectedSequence, true, Desktop.instance); - - launchStructureViewer(ap.getStructureSelectionManager(), - new PDBEntry[] { fileEntry }, ap, - new SequenceI[] { selectedSequence }); } - mainFrame.dispose(); + return foundEntry; } - private void launchStructureViewer(final StructureSelectionManager ssm, + private void launchStructureViewer(StructureSelectionManager ssm, final PDBEntry[] pdbEntriesToView, - final AlignmentPanel alignPanel, final SequenceI[] sequences) + final AlignmentPanel alignPanel, SequenceI[] sequences) { + ssm.setProgressBar(MessageManager + .getString("status.launching_3d_structure_viewer")); final StructureViewer sViewer = new StructureViewer(ssm); - new Thread(new Runnable() + + if (SiftsSettings.isMapWithSifts()) { - @Override - public void run() + List seqsWithoutSourceDBRef = new ArrayList(); + int p = 0; + // TODO: skip PDBEntry:Sequence pairs where PDBEntry doesn't look like a + // real PDB ID. For moment, we can also safely do this if there is already + // a known mapping between the PDBEntry and the sequence. + for (SequenceI seq : sequences) { - if (pdbEntriesToView.length > 1) + PDBEntry pdbe = pdbEntriesToView[p++]; + if (pdbe != null && pdbe.getFile() != null) { - ArrayList seqsMap = new ArrayList(); - for (SequenceI seq : sequences) + StructureMapping[] smm = ssm.getMapping(pdbe.getFile()); + if (smm != null && smm.length > 0) { - seqsMap.add(new SequenceI[] { seq }); + for (StructureMapping sm : smm) + { + if (sm.getSequence() == seq) + { + continue; + } + } } - SequenceI[][] collatedSeqs = seqsMap.toArray(new SequenceI[0][0]); - sViewer.viewStructures(pdbEntriesToView, collatedSeqs, alignPanel); } - else + if (seq.getPrimaryDBRefs().size() == 0) { - sViewer.viewStructures(pdbEntriesToView[0], sequences, alignPanel); + seqsWithoutSourceDBRef.add(seq); + continue; } } - }).start(); + if (!seqsWithoutSourceDBRef.isEmpty()) + { + int y = seqsWithoutSourceDBRef.size(); + ssm.setProgressBar(null); + ssm.setProgressBar(MessageManager.formatMessage( + "status.fetching_dbrefs_for_sequences_without_valid_refs", + y)); + SequenceI[] seqWithoutSrcDBRef = new SequenceI[y]; + int x = 0; + for (SequenceI fSeq : seqsWithoutSourceDBRef) + { + seqWithoutSrcDBRef[x++] = fSeq; + } + DBRefFetcher dbRefFetcher = new DBRefFetcher(seqWithoutSrcDBRef); + dbRefFetcher.fetchDBRefs(true); + } + } + if (pdbEntriesToView.length > 1) + { + ArrayList seqsMap = new ArrayList(); + for (SequenceI seq : sequences) + { + seqsMap.add(new SequenceI[] { seq }); + } + SequenceI[][] collatedSeqs = seqsMap.toArray(new SequenceI[0][0]); + ssm.setProgressBar(null); + ssm.setProgressBar(MessageManager + .getString("status.fetching_3d_structures_for_selected_entries")); + sViewer.viewStructures(pdbEntriesToView, collatedSeqs, alignPanel); + } + else + { + ssm.setProgressBar(null); + ssm.setProgressBar(MessageManager.formatMessage( + "status.fetching_3d_structures_for", + pdbEntriesToView[0].getId())); + sViewer.viewStructures(pdbEntriesToView[0], sequences, alignPanel); + } } /** @@ -830,15 +978,11 @@ public class StructureChooser extends GStructureChooser public boolean isStructuresDiscovered() { - return structuresDiscovered; - } - - public void setStructuresDiscovered(boolean structuresDiscovered) - { - this.structuresDiscovered = structuresDiscovered; + return discoveredStructuresSet != null + && !discoveredStructuresSet.isEmpty(); } - public Collection getDiscoveredStructuresSet() + public Collection getDiscoveredStructuresSet() { return discoveredStructuresSet; } @@ -855,17 +999,20 @@ public class StructureChooser extends GStructureChooser isValidPBDEntry = false; if (txt_search.getText().length() > 0) { - List wantedFields = new ArrayList(); - wantedFields.add(PDBDocField.PDB_ID); - PDBRestRequest pdbRequest = new PDBRestRequest(); + String searchTerm = txt_search.getText().toLowerCase(); + searchTerm = searchTerm.split(":")[0]; + // System.out.println(">>>>> search term : " + searchTerm); + List wantedFields = new ArrayList(); + FTSRestRequest pdbRequest = new FTSRestRequest(); pdbRequest.setAllowEmptySeq(false); pdbRequest.setResponseSize(1); pdbRequest.setFieldToSearchBy("(pdb_id:"); pdbRequest.setWantedFields(wantedFields); - pdbRequest.setSearchTerm(txt_search.getText() + ")"); + pdbRequest.setSearchTerm(searchTerm + ")"); pdbRequest.setAssociatedSequence(selectedSequence); - pdbRestCleint = new PDBRestClient(); - PDBRestResponse resultList; + pdbRestCleint = PDBFTSRestClient.getInstance(); + wantedFields.add(pdbRestCleint.getPrimaryKeyColumn()); + FTSRestResponse resultList; try { resultList = pdbRestCleint.executeRequest(pdbRequest); @@ -1005,4 +1152,24 @@ public class StructureChooser extends GStructureChooser } } + + private IProgressIndicator progressBar; + + @Override + public void setProgressBar(String message, long id) + { + progressBar.setProgressBar(message, id); + } + + @Override + public void registerHandler(long id, IProgressIndicatorHandler handler) + { + progressBar.registerHandler(id, handler); + } + + @Override + public boolean operationInProgress() + { + return progressBar.operationInProgress(); + } }