X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fext%2Fedu%2Fucsf%2Frbvi%2Fstrucviz2%2FChimeraManager.java;h=c0c7c467cfb728c3535864d2151c78465264f2d9;hb=dddd6b7545b9b75f1d387f838b66867d4c19c1f8;hp=2c40e1ce271b60cf181da4b11446da1764b7a4ab;hpb=31f1b88951cc5ff3aea7ae0bc1a9d8fbdd264ea3;p=jalview.git diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java index 2c40e1c..c0c7c46 100644 --- a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java +++ b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java @@ -177,7 +177,8 @@ public class ChimeraManager ModelType type) { logger.info("chimera open " + modelPath); - stopListening(); + // stopListening(); + List modelList = getModelList(); List response = null; // TODO: [Optional] Handle modbase models if (type == ModelType.MODBASE_MODEL) @@ -197,76 +198,29 @@ public class ChimeraManager logger.warn("Could not open " + modelPath); return null; } - List models = new ArrayList(); - int[] modelNumbers = null; - if (type == ModelType.PDB_MODEL) - { - for (String line : response) - { - if (line.startsWith("#")) - { - modelNumbers = ChimUtils.parseOpenedModelNumber(line); - if (modelNumbers != null) - { - int modelNumber = ChimUtils.makeModelKey(modelNumbers[0], - modelNumbers[1]); - if (currentModelsMap.containsKey(modelNumber)) - { - continue; - } - ChimeraModel newModel = new ChimeraModel(modelName, type, - modelNumbers[0], modelNumbers[1]); - currentModelsMap.put(modelNumber, newModel); - models.add(newModel); - - // - // patch for Jalview - set model name in Chimera - // - sendChimeraCommand("setattr M name " + modelName + " #" - + modelNumbers[0], false); - // end patch for Jalview - - modelNumbers = null; - } - } - } - } - else + + // patch for Jalview - set model name in Chimera + // TODO: find a variant that works for sub-models + for (ChimeraModel newModel : getModelList()) { - // TODO: [Optional] Open smiles from file would fail. Do we need it? - // If parsing fails, iterate over all open models to get the right one - List openModels = getModelList(); - for (ChimeraModel openModel : openModels) + if (!modelList.contains(newModel)) { - String openModelName = openModel.getModelName(); - if (openModelName.endsWith("...")) - { - openModelName = openModelName.substring(0, - openModelName.length() - 3); - } - if (modelPath.startsWith(openModelName)) - { - openModel.setModelName(modelPath); - int modelNumber = ChimUtils - .makeModelKey(openModel.getModelNumber(), - openModel.getSubModelNumber()); - if (!currentModelsMap.containsKey(modelNumber)) - { - currentModelsMap.put(modelNumber, openModel); - models.add(openModel); - } - } + newModel.setModelName(modelName); + sendChimeraCommand( + "setattr M name " + modelName + " #" + + newModel.getModelNumber(), false); + modelList.add(newModel); } } // assign color and residues to open models - for (ChimeraModel newModel : models) + for (ChimeraModel chimeraModel : modelList) { // get model color - Color modelColor = getModelColor(newModel); + Color modelColor = getModelColor(chimeraModel); if (modelColor != null) { - newModel.setModelColor(modelColor); + chimeraModel.setModelColor(modelColor); } // Get our properties (default color scheme, etc.) @@ -276,13 +230,13 @@ public class ChimeraManager // Create the information we need for the navigator if (type != ModelType.SMILES) { - addResidues(newModel); + addResidues(chimeraModel); } } sendChimeraCommand("focus", false); - startListening(); - return models; + // startListening(); // see ChimeraListener + return modelList; } /** @@ -302,13 +256,12 @@ public class ChimeraManager // TODO: [Optional] Convert path to name in a better way if (modelPath.lastIndexOf(File.separator) > 0) { - modelName = modelPath.substring(modelPath - .lastIndexOf(File.separator) + 1); + modelName = modelPath + .substring(modelPath.lastIndexOf(File.separator) + 1); } else if (modelPath.lastIndexOf("/") > 0) { - modelName = modelPath - .substring(modelPath.lastIndexOf("/") + 1); + modelName = modelPath.substring(modelPath.lastIndexOf("/") + 1); } return modelName; } @@ -339,12 +292,24 @@ public class ChimeraManager public void startListening() { - sendChimeraCommand("listen start models; listen start select", false); + sendChimeraCommand("listen start models; listen start selection", false); } public void stopListening() { - sendChimeraCommand("listen stop models; listen stop select", false); + sendChimeraCommand("listen stop models ; listen stop selection ", false); + } + + /** + * Tell Chimera we are listening on the given URI + * + * @param uri + */ + public void startListening(String uri) + { + sendChimeraCommand("listen start models url " + uri + + ";listen start select prefix SelectionChanged url " + uri, + false); } /** @@ -355,8 +320,8 @@ public class ChimeraManager */ public void select(String command) { - sendChimeraCommand("listen stop select; " + command - + "; listen start select", false); + sendChimeraCommand("listen stop selection; " + command + + "; listen start selection", false); } public void focus() @@ -368,7 +333,7 @@ public class ChimeraManager { chimera = null; currentModelsMap.clear(); - this.chimeraRestPort = 0; + this.chimeraRestPort = 0; structureManager.clearOnChimeraExit(); } @@ -407,6 +372,12 @@ public class ChimeraManager return selectedModelsMap; } + /** + * Sends a 'list selection level residue' command to Chimera and returns the + * list of selected atomspecs + * + * @return + */ public List getSelectedResidueSpecs() { List selectedResidues = new ArrayList(); @@ -514,6 +485,14 @@ public class ChimeraManager return launched; } + /** + * Launch Chimera, unless an instance linked to this object is already + * running. Returns true if chimera is successfully launched, or already + * running, else false. + * + * @param chimeraPaths + * @return + */ public boolean launchChimera(List chimeraPaths) { // Do nothing if Chimera is already launched @@ -529,6 +508,8 @@ public class ChimeraManager for (String chimeraPath : chimeraPaths) { File path = new File(chimeraPath); + // uncomment the next line to simulate Chimera not installed + // path = new File(chimeraPath + "x"); if (!path.canExecute()) { error += "File '" + path + "' does not exist.\n"; @@ -538,6 +519,8 @@ public class ChimeraManager { List args = new ArrayList(); args.add(chimeraPath); + // shows Chimera output window but suppresses REST responses: + // args.add("--debug"); args.add("--start"); args.add("RESTServer"); ProcessBuilder pb = new ProcessBuilder(args); @@ -561,8 +544,8 @@ public class ChimeraManager structureManager.setChimeraPathProperty(workingPath); // TODO: [Optional] Check Chimera version and show a warning if below 1.8 // Ask Chimera to give us updates - startListening(); - return true; + // startListening(); // later - see ChimeraListener + return (chimeraRestPort > 0); } // Tell the user that Chimera could not be started because of an error @@ -579,21 +562,29 @@ public class ChimeraManager InputStream readChan = chimera.getInputStream(); BufferedReader lineReader = new BufferedReader(new InputStreamReader( readChan)); - String response = null; + StringBuilder responses = new StringBuilder(); try { - // expect: REST server on host 127.0.0.1 port port_number - response = lineReader.readLine(); - String [] tokens = response.split(" "); - if (tokens.length == 7 && "port".equals(tokens[5])) { - port = Integer.parseInt(tokens[6]); - logger.info("Chimera REST service listening on port " - + chimeraRestPort); + String response = lineReader.readLine(); + while (response != null) + { + responses.append("\n" + response); + // expect: REST server on host 127.0.0.1 port port_number + if (response.startsWith("REST server")) + { + String[] tokens = response.split(" "); + if (tokens.length == 7 && "port".equals(tokens[5])) + { + port = Integer.parseInt(tokens[6]); + break; + } + } + response = lineReader.readLine(); } } catch (Exception e) { - logger.error("Failed to get REST port number from " + response + ": " - + e.getMessage()); + logger.error("Failed to get REST port number from " + responses + + ": " + e.getMessage()); } finally { try @@ -603,6 +594,13 @@ public class ChimeraManager { } } + if (port == 0) + { + System.err + .println("Failed to start Chimera with REST service, response was: " + + responses); + } + logger.info("Chimera REST service listening on port " + chimeraRestPort); return port; } @@ -731,6 +729,7 @@ public class ChimeraManager */ public List sendChimeraCommand(String command, boolean reply) { + // System.out.println("chimeradebug>> " + command); if (!isChimeraLaunched() || command == null || "".equals(command.trim())) { @@ -775,23 +774,24 @@ public class ChimeraManager */ protected List sendRestCommand(String command) { - // TODO start a separate thread to do this so we don't block? String restUrl = "http://127.0.0.1:" + this.chimeraRestPort + "/run"; List commands = new ArrayList(1); commands.add(new BasicNameValuePair("command", command)); List reply = new ArrayList(); BufferedReader response = null; - try { - response = HttpClientUtils.doHttpUrlPost(restUrl, - commands); + try + { + response = HttpClientUtils + .doHttpUrlPost(restUrl, commands, 100, 5000); String line = ""; - while ((line = response.readLine()) != null) { + while ((line = response.readLine()) != null) + { reply.add(line); } } catch (Exception e) { - logger.error("REST call " + command + " failed: " + e.getMessage()); + logger.error("REST call '" + command + "' failed: " + e.getMessage()); } finally { if (response != null) @@ -850,5 +850,4 @@ public class ChimeraManager { return busy; } - }