[Jmol-commits] SF.net SVN: jmol:[16527] trunk/Jmol/src/org

[<ha...@us...>]

Revision: 16527
          http://jmol.svn.sourceforge.net/jmol/?rev=16527&view=rev
Author:   hansonr
Date:     2011-11-23 21:33:32 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
version=12.3.7

# code: MPJmolApp work
# bug fix: user variables being reset by INITIALIZE

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/viewer/StateManager.java
    trunk/Jmol/src/org/jmol/viewer/Viewer.java
    trunk/Jmol/src/org/molecularplayground/MPJmolApp.java
    trunk/Jmol/src/org/molecularplayground/MPJmolAppConfig.spt
    trunk/Jmol/src/org/openscience/jmol/app/jsonkiosk/JsonNioService.java

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2011-11-23 21:33:32 UTC (rev 16527)
@@ -3,6 +3,8 @@
 
 version=12.3.7
 
+# code: MPJmolApp work
+# bug fix: user variables being reset by INITIALIZE
 # new feature: "Write PNG+JMOL" added to application and signed applet menu
 # code: dispensing with InputStream in favor of BufferedInputStream
 # new feature: write PNGJ

Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateManager.java	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/jmol/viewer/StateManager.java	2011-11-23 21:33:32 UTC (rev 16527)
@@ -662,6 +662,7 @@
 
       if (g != null) {
         //persistent values not reset with the "initialize" command
+        htUserVariables = g.htUserVariables; // 12.3.7, 12.2.7
         debugScript = g.debugScript;
         disablePopupMenu = g.disablePopupMenu;
         messageStyleChime = g.messageStyleChime;

Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java	2011-11-23 21:33:32 UTC (rev 16527)
@@ -8924,7 +8924,7 @@
       dir = ".";
     }
     dir = fileManager.getDefaultDirectory(dir
-        + (dir.equals("=") || dir.endsWith("/") ? "" : "/X"));
+        + (dir.equals("=") ? "" : dir.endsWith("/") ? "X" : "/X"));
     if (dir.length() > 0)
       setStringProperty("defaultDirectory", dir);
     String path = fileManager.getFilePath(dir + "/", true, false);

Modified: trunk/Jmol/src/org/molecularplayground/MPJmolApp.java
===================================================================
--- trunk/Jmol/src/org/molecularplayground/MPJmolApp.java	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/molecularplayground/MPJmolApp.java	2011-11-23 21:33:32 UTC (rev 16527)
@@ -111,7 +111,7 @@
   protected JmolViewer jmolViewer;
 
   public static void main(String args[]) {
-    new MPJmolApp(args.length > 1 ? Integer.parseInt(args[1]) : 31416);
+    new MPJmolApp(args.length > 0 ? Integer.parseInt(args[0]) : 31416);
   }
 
   public MPJmolApp() {

Modified: trunk/Jmol/src/org/molecularplayground/MPJmolAppConfig.spt
===================================================================
--- trunk/Jmol/src/org/molecularplayground/MPJmolAppConfig.spt	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/molecularplayground/MPJmolAppConfig.spt	2011-11-23 21:33:32 UTC (rev 16527)
@@ -1,14 +1,13 @@
-NIOcontentScript="biophysics/biophysics.spt"
-contentdir = "biophysics/"
+topicdir = "biophysics/"
+NIOcontentScript=topicdir + "biophysics.spt"
+cd @topicdir
 
 function loadModel(jmolFile,more,banner) {
   if (!jmolFile) { return }
   zap
   var msg = "banner:" + banner
   message @msg
-  cd ""
-  cd @contentdir
   load @jmolFile
-  if (more) { script @more }
-  delay 30
+  if (more) { script inline @more }
+  delay 120
 }
\ No newline at end of file

Modified: trunk/Jmol/src/org/openscience/jmol/app/jsonkiosk/JsonNioService.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jsonkiosk/JsonNioService.java	2011-11-23 21:30:17 UTC (rev 16526)
+++ trunk/Jmol/src/org/openscience/jmol/app/jsonkiosk/JsonNioService.java	2011-11-23 21:33:32 UTC (rev 16527)
@@ -243,50 +243,56 @@
     // inSocket listens for JSON commands from the NIO server
     // when initialized, it identifies itself to the server as the "out" connection
 
-    inSocket = openSocket("127.0.0.1", port);
-    inSocket.setPacketReader(new AsciiLinePacketReader());
-    inSocket.setPacketWriter(new RawPacketWriter());
-    inSocket.listen(new SocketObserver() {
+    if (port != 0) {
+      inSocket = openSocket("127.0.0.1", port);
+      inSocket.setPacketReader(new AsciiLinePacketReader());
+      inSocket.setPacketWriter(new RawPacketWriter());
+      inSocket.listen(new SocketObserver() {
 
-      public void connectionOpened(NIOSocket nioSocket) {
-        initialize("out", nioSocket);
-      }
+        public void connectionOpened(NIOSocket nioSocket) {
+          initialize("out", nioSocket);
+        }
 
-      public void packetReceived(NIOSocket socket, byte[] packet) {
-        processMessage(packet, null);
-      }
+        public void packetReceived(NIOSocket socket, byte[] packet) {
+          processMessage(packet, null);
+        }
 
-      public void connectionBroken(NIOSocket nioSocket, Exception exception) {
-        halt = true;
-        Logger.info(Thread.currentThread().getName() + " inSocket connectionBroken");
-      }
-    });
+        public void connectionBroken(NIOSocket nioSocket, Exception exception) {
+          halt = true;
+          Logger.info(Thread.currentThread().getName()
+              + " inSocket connectionBroken");
+        }
+      });
 
-    // outSocket is used to send JSON commands to the NIO server
-    // when initialized, it identifies itself to the server as the "in" connection
+      // outSocket is used to send JSON commands to the NIO server
+      // when initialized, it identifies itself to the server as the "in" connection
 
-    outSocket = openSocket("127.0.0.1", port);
-    outSocket.setPacketReader(new AsciiLinePacketReader());
-    outSocket.setPacketWriter(new RawPacketWriter());
-    outSocket.listen(new SocketObserver() {
+      outSocket = openSocket("127.0.0.1", port);
+      outSocket.setPacketReader(new AsciiLinePacketReader());
+      outSocket.setPacketWriter(new RawPacketWriter());
+      outSocket.listen(new SocketObserver() {
 
-      public void connectionOpened(NIOSocket nioSocket) {
-        initialize("in", nioSocket);
-      }
+        public void connectionOpened(NIOSocket nioSocket) {
+          initialize("in", nioSocket);
+        }
 
-      public void packetReceived(NIOSocket nioSocket, byte[] packet) {
-        System.out.println("outpacketreceived");
-        // not used
-      }
+        public void packetReceived(NIOSocket nioSocket, byte[] packet) {
+          System.out.println("outpacketreceived");
+          // not used
+        }
 
-      public void connectionBroken(NIOSocket nioSocket, Exception exception) {
-        halt = true;
-        Logger.info(Thread.currentThread().getName() + " outSocket connectionBroken");
-      }
-    });
+        public void connectionBroken(NIOSocket nioSocket, Exception exception) {
+          halt = true;
+          Logger.info(Thread.currentThread().getName()
+              + " outSocket connectionBroken");
+        }
+      });
 
+    }
     thread = new Thread(new JsonNioThread(), "JsonNiosThread" + myName);
     thread.start();
+    if (port == 0 && contentDisabled)
+      client.nioRunContent(this);
   }
 
   private void setEnabled() {

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