Revision: 20323
http://sourceforge.net/p/jmol/code/20323
Author: hansonr
Date: 2015-02-25 03:47:54 +0000 (Wed, 25 Feb 2015)
Log Message:
-----------
GenericPlatform update -- requires cleaning
Modified Paths:
--------------
trunk/Jmol/src/javajs/api/GenericPlatform.java
trunk/Jmol/src/org/jmol/awt/Image.java
trunk/Jmol/src/org/jmol/awt/Platform.java
trunk/Jmol/src/org/jmol/awtjs2d/Image.java
trunk/Jmol/src/org/jmol/awtjs2d/Platform.java
trunk/Jmol/src/org/jmol/console/ImageDialog.java
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/StatusManager.java
Added Paths:
-----------
trunk/Jmol/src/javajs/api/GenericImageDialog.java
Removed Paths:
-------------
trunk/Jmol/src/org/jmol/api/JmolImageDialog.java
Copied: trunk/Jmol/src/javajs/api/GenericImageDialog.java (from rev 20315,
trunk/Jmol/src/org/jmol/api/JmolImageDialog.java)
===================================================================
--- trunk/Jmol/src/javajs/api/GenericImageDialog.java
(rev 0)
+++ trunk/Jmol/src/javajs/api/GenericImageDialog.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -0,0 +1,9 @@
+package javajs.api;
+
+public interface GenericImageDialog {
+
+ void closeMe();
+
+ void setImage(Object image);
+
+}
Modified: trunk/Jmol/src/javajs/api/GenericPlatform.java
===================================================================
--- trunk/Jmol/src/javajs/api/GenericPlatform.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/javajs/api/GenericPlatform.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -4,7 +4,6 @@
import java.net.URL;
import java.util.Map;
-import org.jmol.api.JmolImageDialog;
import javajs.awt.Font;
import javajs.util.P3;
@@ -136,7 +135,7 @@
String getLocalUrl(String fileName);
- JmolImageDialog getImageDialog(String title,
- Map<String, JmolImageDialog> imageMap);
+ GenericImageDialog getImageDialog(String title,
+ Map<String, GenericImageDialog> imageMap);
}
Deleted: trunk/Jmol/src/org/jmol/api/JmolImageDialog.java
===================================================================
--- trunk/Jmol/src/org/jmol/api/JmolImageDialog.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/org/jmol/api/JmolImageDialog.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -1,9 +0,0 @@
-package org.jmol.api;
-
-public interface JmolImageDialog {
-
- void closeMe();
-
- void setImage(Object image);
-
-}
Modified: trunk/Jmol/src/org/jmol/awt/Image.java
===================================================================
--- trunk/Jmol/src/org/jmol/awt/Image.java 2015-02-25 02:50:56 UTC (rev
20322)
+++ trunk/Jmol/src/org/jmol/awt/Image.java 2015-02-25 03:47:54 UTC (rev
20323)
@@ -44,6 +44,7 @@
import java.net.URL;
import java.util.Map;
+import javajs.api.GenericImageDialog;
import javajs.api.PlatformViewer;
import javajs.img.BMPDecoder;
import javajs.util.AU;
@@ -52,7 +53,6 @@
import javax.swing.JPanel;
import org.jmol.api.Interface;
-import org.jmol.api.JmolImageDialog;
import org.jmol.console.ImageDialog;
import org.jmol.viewer.Viewer;
@@ -263,9 +263,9 @@
((java.awt.Graphics) graphicForText).dispose();
}
- public static JmolImageDialog getImageDialog(PlatformViewer vwr,
+ public static GenericImageDialog getImageDialog(PlatformViewer vwr,
String title,
- Map<String, JmolImageDialog>
imageMap) {
+ Map<String, GenericImageDialog>
imageMap) {
return new ImageDialog((Viewer) vwr, title, imageMap);
}
Modified: trunk/Jmol/src/org/jmol/awt/Platform.java
===================================================================
--- trunk/Jmol/src/org/jmol/awt/Platform.java 2015-02-25 02:50:56 UTC (rev
20322)
+++ trunk/Jmol/src/org/jmol/awt/Platform.java 2015-02-25 03:47:54 UTC (rev
20323)
@@ -17,8 +17,8 @@
import netscape.javascript.JSObject;
import org.jmol.api.Interface;
-import org.jmol.api.JmolImageDialog;
+import javajs.api.GenericImageDialog;
import javajs.api.GenericPlatform;
import javajs.api.GenericFileInterface;
import javajs.api.GenericMouseInterface;
@@ -318,8 +318,8 @@
}
@Override
- public JmolImageDialog getImageDialog(String title,
- Map<String, JmolImageDialog> imageMap)
{
+ public GenericImageDialog getImageDialog(String title,
+ Map<String, GenericImageDialog>
imageMap) {
return Image.getImageDialog(vwr, title, imageMap);
}
Modified: trunk/Jmol/src/org/jmol/awtjs2d/Image.java
===================================================================
--- trunk/Jmol/src/org/jmol/awtjs2d/Image.java 2015-02-25 02:50:56 UTC (rev
20322)
+++ trunk/Jmol/src/org/jmol/awtjs2d/Image.java 2015-02-25 03:47:54 UTC (rev
20323)
@@ -27,9 +27,9 @@
import java.util.Map;
-import org.jmol.api.JmolImageDialog;
import org.jmol.viewer.Viewer;
+import javajs.api.GenericImageDialog;
import javajs.awt.Font;
/**
@@ -191,9 +191,9 @@
}
}
- public static JmolImageDialog getImageDialog(Viewer vwr,
+ public static GenericImageDialog getImageDialog(Viewer vwr,
String title,
- Map<String, JmolImageDialog>
imageMap) {
+ Map<String, GenericImageDialog>
imageMap) {
/**
* @j2sNative
*
Modified: trunk/Jmol/src/org/jmol/awtjs2d/Platform.java
===================================================================
--- trunk/Jmol/src/org/jmol/awtjs2d/Platform.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/org/jmol/awtjs2d/Platform.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -5,9 +5,9 @@
import java.util.Map;
import org.jmol.api.Interface;
-import org.jmol.api.JmolImageDialog;
import org.jmol.viewer.Viewer;
+import javajs.api.GenericImageDialog;
import javajs.api.GenericPlatform;
import javajs.api.GenericFileInterface;
import javajs.api.GenericMouseInterface;
@@ -460,8 +460,8 @@
}
@Override
- public JmolImageDialog getImageDialog(String title,
- Map<String, JmolImageDialog> imageMap)
{
+ public GenericImageDialog getImageDialog(String title,
+ Map<String, GenericImageDialog>
imageMap) {
return Image.getImageDialog((Viewer) vwr, title, imageMap);
}
Modified: trunk/Jmol/src/org/jmol/console/ImageDialog.java
===================================================================
--- trunk/Jmol/src/org/jmol/console/ImageDialog.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/org/jmol/console/ImageDialog.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -24,6 +24,7 @@
package org.jmol.console;
+import javajs.api.GenericImageDialog;
import javajs.util.PT;
import javax.swing.JDialog;
@@ -48,11 +49,10 @@
import java.util.Map;
import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.api.JmolImageDialog;
import org.jmol.awt.Platform;
import org.jmol.viewer.Viewer;
-public class ImageDialog extends JDialog implements JmolImageDialog,
WindowListener, ActionListener {
+public class ImageDialog extends JDialog implements GenericImageDialog,
WindowListener, ActionListener {
private JMenuBar menubar;
@@ -62,11 +62,11 @@
protected Viewer vwr;
protected Canvas canvas;
private String title;
- private Map<String, JmolImageDialog> imageMap;
+ private Map<String, GenericImageDialog> imageMap;
private JmolAppConsoleInterface console;
- public ImageDialog(Viewer vwr, String title, Map<String, JmolImageDialog>
imageMap){
+ public ImageDialog(Viewer vwr, String title, Map<String, GenericImageDialog>
imageMap){
super(Platform.getWindow((Container) vwr.display) instanceof JFrame ?
(JFrame) Platform.getWindow((Container) vwr.display) : null, title, false);
this.vwr = vwr;
console = vwr.getConsole();
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -3617,10 +3617,15 @@
msg = ((SV) eval.theToken).escape();
break;
case T.image:
+ vwr.getConsole();// especially important for JavaScript
if (slen == 2 || slen == 4 && !chk) {
+ // show image
+ // show image 400 400
write(null);
return;
}
+ // show image close
+ // show image close "myfile"
String fileName = eval.optParameterAsString(2);
boolean isClose = false;
if (fileName.equalsIgnoreCase("close")) {
Modified: trunk/Jmol/src/org/jmol/viewer/StatusManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StatusManager.java 2015-02-25 02:50:56 UTC
(rev 20322)
+++ trunk/Jmol/src/org/jmol/viewer/StatusManager.java 2015-02-25 03:47:54 UTC
(rev 20323)
@@ -25,6 +25,8 @@
import org.jmol.script.SV;
import org.jmol.script.T;
+
+import javajs.api.GenericImageDialog;
import javajs.awt.Dimension;
import org.jmol.util.Logger;
import javajs.util.Lst;
@@ -41,7 +43,6 @@
import org.jmol.api.JmolAppConsoleInterface;
import org.jmol.api.JmolCallbackListener;
import org.jmol.api.JmolDialogInterface;
-import org.jmol.api.JmolImageDialog;
import org.jmol.api.JmolStatusListener;
import org.jmol.c.CBK;
import org.jmol.java.BS;
@@ -354,7 +355,7 @@
new Object[] {sJmol, strInfo, Integer.valueOf(-1), id,
Float.valueOf(pt.x), Float.valueOf(pt.y), Float.valueOf(pt.z) });
}
- private Map<String, JmolImageDialog> imageMap;
+ private Map<String, GenericImageDialog> imageMap;
/**
* called by Viewer.loadImageData to pop up a window with an image in it
@@ -377,8 +378,8 @@
return;
}
if (imageMap == null)
- imageMap = new Hashtable<String, JmolImageDialog>();
- JmolImageDialog d = imageMap.get(title);
+ imageMap = new Hashtable<String, GenericImageDialog>();
+ GenericImageDialog d = imageMap.get(title);
if (Boolean.FALSE.equals(image)) {
if (d != null)
d.closeMe();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
