[<hansonr@us...>]

Revision: 17957
          http://jmol.svn.sourceforge.net/jmol/?rev=17957&view=rev
Author:   hansonr
Date:     2013-03-01 12:42:47 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
___JmolVersion="13.1.14_dev"

bug fix: PyMOL PSE files not accessible by Jmol app File...Open or drag/drop

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/viewer/StateCreator.java

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2013-03-01 04:36:12 UTC (rev 17956)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2013-03-01 12:42:47 UTC (rev 17957)
@@ -11,6 +11,7 @@
 
 ___JmolVersion="13.1.14_dev"
 
+bug fix: PyMOL PSE files not accessible by Jmol app File...Open or drag/drop
 bug fix: incorrect calculation of RMSD for COMPARE and SMILES
 bug fix: ModelKit menu "SHIFT to rotate" should read "ALT to rotate"
 bug fix: starting applet console takes two clicks

Modified: trunk/Jmol/src/org/jmol/viewer/StateCreator.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateCreator.java	2013-03-01 04:36:12 UTC (rev 17956)
+++ trunk/Jmol/src/org/jmol/viewer/StateCreator.java	2013-03-01 12:42:47 UTC (rev 17957)
@@ -2238,16 +2238,15 @@
     fileName = fileName.replace('\\', '/');
     if (viewer.isApplet && fileName.indexOf("://") < 0)
       fileName = "file://"; + (fileName.startsWith("/") ? "" : "/") + fileName;
-
+    if (fileName.endsWith(".pse")) {
+      viewer.evalString("zap;load SYNC " + Escape.eS(fileName)
+          + " filter 'DORESIZE'");
+      return;
+    }
     String cmd = null;
     if (fileName.endsWith("jvxl")) {
       cmd = "isosurface ";
-    } else if (fileName.endsWith(".pse")) {
-      cmd = "zap;load SYNC " + Escape.eS(fileName)
-          + " filter 'DORESIZE'";
-      return;
-    }
-    if (!fileName.endsWith(".spt")) {
+    } else if (!fileName.endsWith(".spt")) {
       String type = viewer.fileManager.getFileTypeName(fileName);
       if (type == null) {
         type = JmolBinary.determineSurfaceTypeIs(viewer

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.