X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fpymol%2FPymolManager.java;h=e10fc9d6fb543d714f651604e19926d86f2483ad;hp=8ba25868ac1ee985c5424c8dceef314132496b11;hb=cea2941f089e7d7a8dd94d4478ed711255eba75b;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99
diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index 8ba2586..e10fc9d 100644
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ext.pymol;
import java.io.BufferedReader;
@@ -12,12 +32,13 @@ import java.net.URL;
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
{
@@ -80,7 +101,23 @@ public class PymolManager
}
else if (os.startsWith("Windows"))
{
- // todo Windows installation path(s)
+ 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", "Scripts\\pymol.exe", "PyMOLWin.exe"})
+ {
+ pathList.add(String.format("%s\\%s\\%s", root, path, binary));
+ }
+ }
+ }
}
else if (os.startsWith("Mac"))
{
@@ -234,8 +271,15 @@ public class PymolManager
}
List 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;