Menu
▾
▴
[Jmol-commits] SF.net SVN: jmol:[16913] branches/v12_2/Jmol/src/org
|
From: <ha...@us...> - 2012-03-19 21:33:44
|
Revision: 16913
http://jmol.svn.sourceforge.net/jmol/?rev=16913&view=rev
Author: hansonr
Date: 2012-03-19 21:33:37 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
version=12.2.19_dev
# bug fix: Jmol defaults not being loaded with startup option -n (no display)
# bug fix: UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()
# failed for non-graphics system, and even though it is an exception, it
# isn't trapped by try/catch.
# bug fix: point() function does not accept 3x1 array
# bug fix: show x where x is a matrix does not have ',' before tabs, so it can't be clipped directly
# back into Jmol
Modified Paths:
--------------
branches/v12_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
branches/v12_2/Jmol/src/org/jmol/util/Escape.java
branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v12_2/Jmol/src/org/jmol/viewer/Viewer.java
branches/v12_2/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java
Modified: branches/v12_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2012-03-19 21:32:27 UTC (rev 16912)
+++ branches/v12_2/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2012-03-19 21:33:37 UTC (rev 16913)
@@ -1599,7 +1599,10 @@
case 1:
if (args[0].tok == Token.decimal || args[0].tok == Token.integer)
return addX(Integer.valueOf(ScriptVariable.iValue(args[0])));
- Object pt = Escape.unescapePoint(ScriptVariable.sValue(args[0]));
+ String s = ScriptVariable.sValue(args[0]);
+ if (args[0].tok == Token.varray)
+ s = "{" + s + "}";
+ Object pt = Escape.unescapePoint(s);
if (pt instanceof Point3f)
return addX((Point3f) pt);
return addX("" + pt);
Modified: branches/v12_2/Jmol/src/org/jmol/util/Escape.java
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/util/Escape.java 2012-03-19 21:32:27 UTC (rev 16912)
+++ branches/v12_2/Jmol/src/org/jmol/util/Escape.java 2012-03-19 21:33:37 UTC (rev 16913)
@@ -80,9 +80,9 @@
if (x instanceof BitSet)
return escape((BitSet) x, true);
if (x instanceof Matrix3f)
- return ((Matrix3f) x).toString();
+ return TextFormat.simpleReplace(((Matrix3f) x).toString(), "\t", ",\t");
if (x instanceof Matrix4f)
- return ((Matrix4f) x).toString();
+ return TextFormat.simpleReplace(((Matrix4f) x).toString(), "\t", ",\t");
if (x instanceof Tuple3f)
return escape((Tuple3f) x);
if (x instanceof Point4f) {
Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-03-19 21:32:27 UTC (rev 16912)
+++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-03-19 21:33:37 UTC (rev 16913)
@@ -4,6 +4,14 @@
version=12.2.19_dev
+# bug fix: Jmol defaults not being loaded with startup option -n (no display)
+# bug fix: UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName()
+# failed for non-graphics system, and even though it is an exception, it
+# isn't trapped by try/catch.
+# bug fix: point() function does not accept 3x1 array
+# bug fix: show x where x is a matrix does not have ',' before tabs, so it can't be clipped directly
+# back into Jmol
+
# ------------------------------------------------------------------------------
#version=12.2.18
Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/v12_2/Jmol/src/org/jmol/viewer/Viewer.java 2012-03-19 21:32:27 UTC (rev 16912)
+++ branches/v12_2/Jmol/src/org/jmol/viewer/Viewer.java 2012-03-19 21:33:37 UTC (rev 16913)
@@ -497,6 +497,7 @@
zap(false, true, false); // here to allow echos
global.setParameterValue("language", GT.getLanguage());
+ stateManager.setJmolDefaults();
}
public boolean isDataOnly() {
@@ -7388,7 +7389,7 @@
@Override
public void setJmolDefaults() {
- setDefaults("Jmol");
+ setDefaults();
}
private void setDefaults(String type) {
@@ -7396,6 +7397,10 @@
stateManager.setRasMolDefaults();
return;
}
+ setDefaults();
+ }
+
+ private void setDefaults() {
stateManager.setJmolDefaults();
setShapeSize(JmolConstants.SHAPE_BALLS, rd, getModelUndeletedAtomsBitSet(-1));
}
Modified: branches/v12_2/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java
===================================================================
--- branches/v12_2/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java 2012-03-19 21:32:27 UTC (rev 16912)
+++ branches/v12_2/Jmol/src/org/openscience/jmol/app/jmolpanel/PreferencesDialog.java 2012-03-19 21:33:37 UTC (rev 16913)
@@ -27,6 +27,7 @@
import org.jmol.console.KeyJMenuItem;
import org.jmol.i18n.GT;
import org.jmol.util.Logger;
+import org.jmol.viewer.JmolConstants;
import org.openscience.jmol.app.jmolpanel.GuiMap;
import org.openscience.jmol.app.jmolpanel.JmolPanel;
@@ -109,11 +110,11 @@
"showBoundingBox", "false",
"axesOrientationRasmol", "false",
"openFilePreview", "true",
- "percentVdwAtom", "23",
"autoBond", "true",
- "marBond", "150",
- "minBondDistance", "0.40",
- "bondTolerance", "0.45",
+ "percentVdwAtom", "" + JmolConstants.DEFAULT_PERCENT_VDW_ATOM,
+ "marBond", "" + JmolConstants.DEFAULT_BOND_MILLIANGSTROM_RADIUS,
+ "minBondDistance", "" + JmolConstants.DEFAULT_MIN_BOND_DISTANCE,
+ "bondTolerance", "" + JmolConstants.DEFAULT_BOND_TOLERANCE,
};
final static String[] rasmolOverrides = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|