[Jmol-commits] SF.net SVN: jmol:[20676] trunk/Jmol

[hansonr]

Revision: 20676
          http://sourceforge.net/p/jmol/code/20676
Author:   hansonr
Date:     2015-08-06 18:36:24 +0000 (Thu, 06 Aug 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.15_2015.08.06"

bug fix: stereo setting should not be saved in state. 
  -- though saved, it was not by default set to normal,
  -- thus influencing later loads.
  
bug fix: stereo not implemented in JavaScript

new feature: stereo DTI
  -- left/right dual panel, as just STEREO
  -- compresses width by 50% for DTI mode (Dimension Technologies, Inc.)
  
bug fix: calculate STRUTS broken for 3dfr, with peptide ligand MTX

Modified Paths:
--------------
    trunk/Jmol/jars/JSpecView.jar
    trunk/Jmol/srcjsv/jspecview/appletjs/JSVApplet.java
    trunk/Jmol/srcjsv/jspecview/java/AwtPlatform.java
    trunk/Jmol/srcjsv/jspecview/js2d/JsPlatform.java

Modified: trunk/Jmol/jars/JSpecView.jar
===================================================================
(Binary files differ)

Modified: trunk/Jmol/srcjsv/jspecview/appletjs/JSVApplet.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/appletjs/JSVApplet.java 2015-08-06 18:35:56 UTC 
(rev 20675)
+++ trunk/Jmol/srcjsv/jspecview/appletjs/JSVApplet.java 2015-08-06 18:36:24 UTC 
(rev 20676)
@@ -593,11 +593,6 @@
        }
 
        @Override
-       public Object getGLmolView() {
-               return null;
-       }
-
-       @Override
        public String getFullName() {
                return app.vwr.fullName;
        }
@@ -623,13 +618,13 @@
                app.vwr.updateJS();             
        }
 
-       @Override
-       public String loadInlineString(String mol, String script, boolean 
isAppend) {
-               // not supported
-               return null;
-       }
-
-       @Override
+  /**
+   * possibly called from JSmolJSV.js upon start up
+   *  
+   * @param fileName
+   * @return error or null
+   */
+  
        public String openFile(String fileName) {
          app.vwr.openFile(fileName, true);
          return null;

Modified: trunk/Jmol/srcjsv/jspecview/java/AwtPlatform.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/java/AwtPlatform.java   2015-08-06 18:35:56 UTC 
(rev 20675)
+++ trunk/Jmol/srcjsv/jspecview/java/AwtPlatform.java   2015-08-06 18:36:24 UTC 
(rev 20676)
@@ -130,7 +130,7 @@
   }
 
   @Override
-       public void drawImage(Object g, Object img, int x, int y, int width, 
int height) {
+       public void drawImage(Object g, Object img, int x, int y, int width, 
int height, boolean isDTI) {
     Image.drawImage(g, img, x, y, width, height);
   }
 

Modified: trunk/Jmol/srcjsv/jspecview/js2d/JsPlatform.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/js2d/JsPlatform.java    2015-08-06 18:35:56 UTC 
(rev 20675)
+++ trunk/Jmol/srcjsv/jspecview/js2d/JsPlatform.java    2015-08-06 18:36:24 UTC 
(rev 20676)
@@ -138,7 +138,7 @@
 
   @Override
        public void drawImage(Object context, Object canvas, int x, int y, int 
width,
-                        int height) {
+                        int height, boolean isDTI) {
     
     // from Viewer.render1
     Image.drawImage(context, canvas, x, y, width, height);

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