Revision: 20959
http://sourceforge.net/p/jmol/code/20959
Author: hansonr
Date: 2016-02-14 19:27:32 +0000 (Sun, 14 Feb 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.5.2_2016.02.14"
FEATURE CHANGE: JSmol default for Info._disableInitialConsole changed to true
-- no longer necessary with JSmol_spinner.gif
new feature: j2s/img/JSmol_spinner.gif implemented as default for
Info._appletLoadingImage
new feature: j2s/img/cursor_wait.gif animation implemented
bug fix: XmlMolProReader does not recognize FILTER "NOMO"
bug fix: JSmol has never shown cursors
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
branches/v14_4/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
branches/v14_4/Jmol/src/org/jmol/awtjs2d/Display.java
branches/v14_4/Jmol/src/org/jmol/awtjs2d/Platform.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
trunk/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
trunk/Jmol/src/org/jmol/awtjs2d/Display.java
trunk/Jmol/src/org/jmol/awtjs2d/Platform.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
2016-02-10 02:28:32 UTC (rev 20958)
+++ branches/v14_4/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
2016-02-14 19:27:32 UTC (rev 20959)
@@ -48,6 +48,8 @@
}
protected boolean processStartMO(String localName) {
+ if (!parent.doReadMolecularOrbitals)
+ return false;
if (localName.equals("molecule")) {
String method = atts.get("method");
if (method != null)
Modified: branches/v14_4/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
2016-02-10 02:28:32 UTC (rev 20958)
+++ branches/v14_4/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
2016-02-14 19:27:32 UTC (rev 20959)
@@ -23,6 +23,8 @@
void _setCanvasImage(Object canvas, int width, int height);
+ void _setCursor(Object html5Applet, int c);
+
Object _getHiddenCanvas(Object html5Applet, String string, int w, int h);
Object _loadImage(Platform platform, String echoName, String path,
@@ -32,7 +34,7 @@
GenericImageDialog _consoleGetImageDialog(Viewer vwr,
String title,
Map<String,
GenericImageDialog>imageMap);
-
+
/// more ///
Modified: branches/v14_4/Jmol/src/org/jmol/awtjs2d/Display.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/awtjs2d/Display.java 2016-02-10
02:28:32 UTC (rev 20958)
+++ branches/v14_4/Jmol/src/org/jmol/awtjs2d/Display.java 2016-02-14
19:27:32 UTC (rev 20959)
@@ -67,26 +67,29 @@
}
}
- static void setTransparentCursor(Object canvas) {
- /**
- * @j2sNative
- *
- */
- {
- System.out.println(canvas);
- }
- }
+
+// static void setTransparentCursor(Object canvas) {
+// /**
+// * @j2sNative
+// *
+// */
+// {
+// System.out.println(canvas);
+// }
+// }
- static void setCursor(int c, Object canvas) {
- /**
- * @j2sNative
- *
- */
- {
- System.out.println("" + c + canvas);
- }
- }
-
+// static void setCursor(Object vwr, int c) {
+// Platform.Jmol()._setCursor(((Viewer) vwr).html5Applet, c);
+// }
+//
+
+ /**
+ * @param label
+ * @param data
+ * @param list
+ * @param asButtons
+ * @return "null" or result of prompt
+ */
public static String prompt(String label, String data, String[] list,
boolean asButtons) {
/**
@@ -100,7 +103,7 @@
return "null";
}
- public static void convertPointFromScreen(Object canvas, P3 ptTemp) {
+ public static void convertPointFromScreen(Object canvas, P3 ptTemp) {
/**
* @j2sNative
*
Modified: branches/v14_4/Jmol/src/org/jmol/awtjs2d/Platform.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/awtjs2d/Platform.java 2016-02-10
02:28:32 UTC (rev 20958)
+++ branches/v14_4/Jmol/src/org/jmol/awtjs2d/Platform.java 2016-02-14
19:27:32 UTC (rev 20959)
@@ -192,12 +192,12 @@
@Override
public void setTransparentCursor(Object canvas) {
- Display.setTransparentCursor(canvas);
+ //Display.setTransparentCursor(canvas);
}
@Override
public void setCursor(int c, Object canvas) {
- Display.setCursor(c, canvas);
+ Jmol()._setCursor(((Viewer) vwr).html5Applet, c);
}
// //// Image
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-10
02:28:32 UTC (rev 20958)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-14
19:27:32 UTC (rev 20959)
@@ -7,8 +7,20 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.2_2016.02.09"
+Jmol.___JmolVersion="14.5.2_2016.02.14"
+FEATURE CHANGE: JSmol default for Info._disableInitialConsole changed to true
+ -- no longer necessary with JSmol_spinner.gif
+
+new feature: j2s/img/JSmol_spinner.gif implemented as default for
Info._appletLoadingImage
+
+new feature: j2s/img/cursor_wait.gif animation implemented
+
+bug fix: XmlMolProReader does not recognize FILTER "NOMO"
+bug fix: JSmol has never shown cursors
+
+JmolVersion="14.4.2_2016.02.09"
+
bug fix: SMARTS pattern [ALA.*] not working without biological polymer type
indication
bug fix: SMARTS pattern [r500] not working outside of MINIMIZE
Modified: trunk/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
2016-02-10 02:28:32 UTC (rev 20958)
+++ trunk/Jmol/src/org/jmol/adapter/readers/xml/XmlMOReader.java
2016-02-14 19:27:32 UTC (rev 20959)
@@ -48,6 +48,8 @@
}
protected boolean processStartMO(String localName) {
+ if (!parent.doReadMolecularOrbitals)
+ return false;
if (localName.equals("molecule")) {
String method = atts.get("method");
if (method != null)
Modified: trunk/Jmol/src/org/jmol/api/JmolToJSmolInterface.java
===================================================================
--- trunk/Jmol/src/org/jmol/api/JmolToJSmolInterface.java 2016-02-10
02:28:32 UTC (rev 20958)
+++ trunk/Jmol/src/org/jmol/api/JmolToJSmolInterface.java 2016-02-14
19:27:32 UTC (rev 20959)
@@ -23,6 +23,8 @@
void _setCanvasImage(Object canvas, int width, int height);
+ void _setCursor(Object html5Applet, int c);
+
Object _getHiddenCanvas(Object html5Applet, String string, int w, int h);
Object _loadImage(Platform platform, String echoName, String path,
@@ -32,7 +34,7 @@
GenericImageDialog _consoleGetImageDialog(Viewer vwr,
String title,
Map<String,
GenericImageDialog>imageMap);
-
+
/// more ///
Modified: trunk/Jmol/src/org/jmol/awtjs2d/Display.java
===================================================================
--- trunk/Jmol/src/org/jmol/awtjs2d/Display.java 2016-02-10 02:28:32 UTC
(rev 20958)
+++ trunk/Jmol/src/org/jmol/awtjs2d/Display.java 2016-02-14 19:27:32 UTC
(rev 20959)
@@ -67,26 +67,29 @@
}
}
- static void setTransparentCursor(Object canvas) {
- /**
- * @j2sNative
- *
- */
- {
- System.out.println(canvas);
- }
- }
+
+// static void setTransparentCursor(Object canvas) {
+// /**
+// * @j2sNative
+// *
+// */
+// {
+// System.out.println(canvas);
+// }
+// }
- static void setCursor(int c, Object canvas) {
- /**
- * @j2sNative
- *
- */
- {
- System.out.println("" + c + canvas);
- }
- }
-
+// static void setCursor(Object vwr, int c) {
+// Platform.Jmol()._setCursor(((Viewer) vwr).html5Applet, c);
+// }
+//
+
+ /**
+ * @param label
+ * @param data
+ * @param list
+ * @param asButtons
+ * @return "null" or result of prompt
+ */
public static String prompt(String label, String data, String[] list,
boolean asButtons) {
/**
@@ -100,7 +103,7 @@
return "null";
}
- public static void convertPointFromScreen(Object canvas, P3 ptTemp) {
+ public static void convertPointFromScreen(Object canvas, P3 ptTemp) {
/**
* @j2sNative
*
Modified: trunk/Jmol/src/org/jmol/awtjs2d/Platform.java
===================================================================
--- trunk/Jmol/src/org/jmol/awtjs2d/Platform.java 2016-02-10 02:28:32 UTC
(rev 20958)
+++ trunk/Jmol/src/org/jmol/awtjs2d/Platform.java 2016-02-14 19:27:32 UTC
(rev 20959)
@@ -192,12 +192,12 @@
@Override
public void setTransparentCursor(Object canvas) {
- Display.setTransparentCursor(canvas);
+ //Display.setTransparentCursor(canvas);
}
@Override
public void setCursor(int c, Object canvas) {
- Display.setCursor(c, canvas);
+ Jmol()._setCursor(((Viewer) vwr).html5Applet, c);
}
// //// Image
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-10 02:28:32 UTC
(rev 20958)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-02-14 19:27:32 UTC
(rev 20959)
@@ -64,8 +64,20 @@
TODO: isosurface molecular has an issue with 2gb1
-Jmol.___JmolVersion="14.5.2_2016.02.09"
+Jmol.___JmolVersion="14.5.2_2016.02.14"
+FEATURE CHANGE: JSmol default for Info._disableInitialConsole changed to true
+ -- no longer necessary with JSmol_spinner.gif
+
+new feature: j2s/img/JSmol_spinner.gif implemented as default for
Info._appletLoadingImage
+
+new feature: j2s/img/cursor_wait.gif animation implemented
+
+bug fix: XmlMolProReader does not recognize FILTER "NOMO"
+bug fix: JSmol has never shown cursors
+
+JmolVersion="14.5.2_2016.02.09"
+
new feature: invertselected ATOMS {ring atoms to invert}
-- inverts ring stereochemistry
-- requires prior selection of all atoms to be involved in the inversion
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
