import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import jalview.bin.Cache;
import jalview.bin.Console;
import jalview.gui.Preferences;
-import jalview.structure.StructureCommand;
import jalview.structure.StructureCommandI;
+import jalview.util.Platform;
public class PymolManager
{
}
else if (os.startsWith("Windows"))
{
- for (String root : new String[] {
- String.format("%s\\AppData\\Local", System.getProperty("user.home")), // default user path
- "\\ProgramData", "C:\\ProgramData", // this is the default install path "for everyone"
- System.getProperty("user.home"),
- "\\Program Files", "C:\\Program Files", "\\Program Files (x86)",
- "C:\\Program Files (x86)" })
- {
- for (String path : new String [] {
- "Schrodinger\\PyMOL2", "PyMOL" })
+ for (String root : new String[] {
+ String.format("%s\\AppData\\Local",
+ System.getProperty("user.home")), // default user path
+ "\\ProgramData", "C:\\ProgramData", // this is the default install
+ // path "for everyone"
+ System.getProperty("user.home"), "\\Program Files",
+ "C:\\Program Files", "\\Program Files (x86)",
+ "C:\\Program Files (x86)" })
+ {
+ for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
{
- for (String binary : new String [] {"PyMOLWinWithConsole.bat"})
+ for (String binary : new String[] { "PyMOLWinWithConsole.bat",
+ "Scripts\\pymol.exe", "PyMOLWin.exe" })
{
pathList.add(String.format("%s\\%s\\%s", root, path, binary));
}
}
- }
+ }
}
else if (os.startsWith("Mac"))
{
boolean getReply)
{
String postBody = getPostRequest(command);
- // System.out.println(postBody);// debug
+ // jalview.bin.Console.outPrintln(postBody);// debug
String rpcUrl = "http://127.0.0.1:" + this.pymolXmlRpcPort;
PrintWriter out = null;
BufferedReader in = null;
}
List<String> args = new ArrayList<>();
args.add(pymolPath);
+
+ // Windows PyMOLWin.exe needs an extra argument
+ if (Platform.isWin() && pymolPath.toLowerCase(Locale.ROOT)
+ .endsWith("\\pymolwin.exe"))
+ {
+ args.add("+2");
+ }
args.add("-R"); // https://pymolwiki.org/index.php/RPC
ProcessBuilder pb = new ProcessBuilder(args);
+ Console.debug("Running PyMOL as " + String.join(" ", pb.command()));
pymolProcess = pb.start();
error = "";
break;