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

[hansonr]

Revision: 20751
          http://sourceforge.net/p/jmol/code/20751
Author:   hansonr
Date:     2015-09-01 00:00:13 +0000 (Tue, 01 Sep 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.08.31"

bug fix: Gaussian Dialog does not add final line ending when saving

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/scriptext/MathExt.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/GaussianDialog.java
    trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java

Modified: trunk/Jmol/src/org/jmol/scriptext/MathExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/MathExt.java      2015-08-31 19:59:08 UTC 
(rev 20750)
+++ trunk/Jmol/src/org/jmol/scriptext/MathExt.java      2015-09-01 00:00:13 UTC 
(rev 20751)
@@ -1396,10 +1396,10 @@
     // format("array", x)
     SV x1 = (args.length < 2 || intValue == T.format ? mp.getX() : null);
     String format = (args.length == 0 ? "%U" : args[0].tok == T.varray ? null 
: SV.sValue(args[0]));
-    if (!isLabel && args.length > 0 && x1 != null && format != null) {
+    if (!isLabel && args.length > 0 && x1 != null && x1.tok != T.bitset && 
format != null) {
       // x1.format(["energy", "pointGroup"]);
       // x1.format("%5.3f %5s", ["energy", "pointGroup"])
-      // but not x1.format()
+      // but not x1.format() or {*}.format(....)
       if (args.length == 2) {
         Lst<SV> listIn = x1.getList();
         Lst<SV> formatList = args[1].getList();

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-08-31 19:59:08 UTC 
(rev 20750)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties      2015-09-01 00:00:13 UTC 
(rev 20751)
@@ -61,6 +61,8 @@
 
 Jmol.___JmolVersion="14.3.16_2015.08.31"
 
+bug fix: Gaussian Dialog does not add final line ending when saving
+
 new feature: Jmol SMILES/SMARTS generic stereoSMILES polyhedron option 
@PHn(....)
  -- totally generic; will work with any number of connected atoms
  -- suitable replacement for all TP, OH, etc. 

Modified: trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/GaussianDialog.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/GaussianDialog.java       
2015-08-31 19:59:08 UTC (rev 20750)
+++ trunk/Jmol/src/org/openscience/jmol/app/jmolpanel/GaussianDialog.java       
2015-09-01 00:00:13 UTC (rev 20751)
@@ -572,7 +572,7 @@
       s = PT.split(s, "<pre>")[1];
       s = PT.split(s, "</pre>")[0];
     }
-    return s.trim();
+    return s.trim() + "\n";
   }
 
   @Override

Modified: trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java    
2015-08-31 19:59:08 UTC (rev 20750)
+++ trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java    
2015-09-01 00:00:13 UTC (rev 20751)
@@ -344,7 +344,11 @@
       return;
     if (line.length() > 1)
       jpNboOutput.setText(jpNboOutput.getText() + line + "\n");
+    try {
     jpNboOutput.setCaretPosition(jpNboOutput.getText().length());
+    } catch (Exception e) {
+      System.out.println(e + " in appendOutputWithCaret");
+    }
   }
   
   protected void appendOutput(String cmd) {

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


------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits