import jalview.bin.Cache;
import jalview.gui.Preferences;
+import jalview.util.FileUtils;
+import jalview.util.Platform;
import java.io.File;
import java.io.IOException;
for (String chimObjName : names)
{
// get or open the corresponding models if they already exist
- List<ChimeraModel> currentModels = chimeraManager.getChimeraModels(
- chimObjName, type);
+ List<ChimeraModel> currentModels = chimeraManager
+ .getChimeraModels(chimObjName, type);
if (currentModels.size() == 0)
{
// open and return models
// Get the corresponding "real" model
if (chimeraManager.hasChimeraModel(modelNumber, subModelNumber))
{
- ChimeraModel dataModel = chimeraManager.getChimeraModel(
- modelNumber, subModelNumber);
- if (dataModel.getResidueCount() == selectedModel
- .getResidueCount()
- || dataModel.getModelType() == StructureManager.ModelType.SMILES)
+ ChimeraModel dataModel = chimeraManager
+ .getChimeraModel(modelNumber, subModelNumber);
+ if (dataModel.getResidueCount() == selectedModel.getResidueCount()
+ || dataModel
+ .getModelType() == StructureManager.ModelType.SMILES)
{
// Select the entire model
addChimSelection(dataModel);
{
for (ChimeraChain selectedChain : selectedModel.getChains())
{
- ChimeraChain dataChain = dataModel.getChain(selectedChain
- .getChainId());
+ ChimeraChain dataChain = dataModel
+ .getChain(selectedChain.getChainId());
if (selectedChain.getResidueCount() == dataChain
.getResidueCount())
{
pathList.add("/usr/local/chimera/bin/chimera");
pathList.add("/usr/local/bin/chimera");
pathList.add("/usr/bin/chimera");
+ pathList.add(Platform.getUserPath("opt/bin/chimera"));
}
else if (os.startsWith("Windows"))
{
- for (String root : new String[] { "\\Program Files",
- "C:\\Program Files", "\\Program Files (x86)",
- "C:\\Program Files (x86)" })
- {
- for (String version : new String[] { "1.11", "1.11.1", "1.11.2",
- "1.12", "1.12.1", "1.12.2", "1.13" })
- {
- pathList.add(root + "\\Chimera " + version + "\\bin\\chimera");
- pathList.add(
- root + "\\Chimera " + version + "\\bin\\chimera.exe");
- }
- }
+ /*
+ * typical Windows installation path is
+ * C:\Program Files\Chimera 1.12\bin\chimera.exe
+ */
+ // current drive:
+ pathList.addAll(FileUtils.findMatches("\\",
+ "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
+ // C: drive (note may add as duplicates)
+ pathList.addAll(FileUtils.findMatches("C:\\",
+ "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
}
else if (os.startsWith("Mac"))
{