logger.warn("Could not open " + modelPath);
return null;
}
- List<ChimeraModel> models = new ArrayList<ChimeraModel>();
- 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
- // TODO: find a variant that works for sub-models
- sendChimeraCommand("setattr M name " + modelName + " #"
- + modelNumbers[0], false);
- // end patch for Jalview
-
- modelNumbers = null;
- }
- }
- }
- }
- else
- {
- // 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<ChimeraModel> openModels = getModelList();
- for (ChimeraModel openModel : openModels)
- {
- 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);
- }
- }
- }
- }
-
+ List<ChimeraModel> chimeraModels = getModelList();
// assign color and residues to open models
- for (ChimeraModel newModel : models)
- {
+ for (ChimeraModel chimeraModel : chimeraModels)
+ {
+ // // patch for Jalview - set model name in Chimera
+ // // TODO: find a variant that works for sub-models
+ chimeraModel.setModelName(modelName);
+ sendChimeraCommand(
+ "setattr M name " + modelName + " #"
+ + chimeraModel.getModelNumber(), false);
// 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.)
// Create the information we need for the navigator
if (type != ModelType.SMILES)
{
- addResidues(newModel);
+ addResidues(chimeraModel);
}
}
sendChimeraCommand("focus", false);
// startListening(); // see ChimeraListener
- return models;
+ return chimeraModels;
}
/**
// 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;
}
public void startListening(String uri)
{
sendChimeraCommand("listen start models url " + uri
- + ";listen start select prefix SelectionChanged url " + uri, false);
+ + ";listen start select prefix SelectionChanged url " + uri,
+ false);
}
/**
{
chimera = null;
currentModelsMap.clear();
- this.chimeraRestPort = 0;
+ this.chimeraRestPort = 0;
structureManager.clearOnChimeraExit();
}
} catch (Exception e)
{
logger.error("Failed to get REST port number from " + responses
- + ": "
- + e.getMessage());
+ + ": " + e.getMessage());
} finally
{
try
*/
public List<String> sendChimeraCommand(String command, boolean reply)
{
-// System.out.println("chimeradebug>> " + command);
+ // System.out.println("chimeradebug>> " + command);
if (!isChimeraLaunched() || command == null
|| "".equals(command.trim()))
{
List<String> reply = new ArrayList<String>();
BufferedReader response = null;
- try {
+ 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)