Revision: 20182
http://sourceforge.net/p/jmol/code/20182
Author: hansonr
Date: 2015-01-12 00:05:33 +0000 (Mon, 12 Jan 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/srcjsv/jspecview/common/Annotation.java
trunk/Jmol/srcjsv/jspecview/common/GraphSet.java
trunk/Jmol/srcjsv/jspecview/common/JSVersion.java
trunk/Jmol/srcjsv/jspecview/common/JSViewer.java
trunk/Jmol/srcjsv/jspecview/common/PDFWriter.java
trunk/Jmol/srcjsv/jspecview/common/PanelData.java
trunk/Jmol/srcjsv/jspecview/java/AwtG2D.java
trunk/Jmol/srcjsv/jspecview/js2d/JsG2D.java
Removed Paths:
-------------
trunk/Jmol/srcjsv/jspecview/api/JSVGraphics.java
Deleted: trunk/Jmol/srcjsv/jspecview/api/JSVGraphics.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/api/JSVGraphics.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/api/JSVGraphics.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -1,59 +0,0 @@
-package jspecview.api;
-
-import javajs.api.GenericColor;
-import javajs.awt.Font;
-
-
-
-public interface JSVGraphics {
-
- GenericColor getColor1(int argb);
-
- GenericColor getColor3(int red, int green, int blue);
-
- GenericColor getColor4(int r, int g, int b, int a);
-
- Object newGrayScaleImage(Object g, Object image, int width, int height,
int[] buffer);
-
-
- boolean canDoLineTo();
-
- void doStroke(Object g, boolean isBegin);
-
- void drawGrayScaleImage(Object g, Object image2D, int destX0, int destY0,
int destX1, int destY1, int srcX0, int srcY0, int srcX1, int srcY1);
-
- void drawLine(Object g, int x0, int y0, int x1, int y1);
-
- void drawCircle(Object g, int x, int y, int diameter);
-
- void drawPolygon(Object g, int[] axPoints, int[] ayPoints, int nPoints);
-
- void drawRect(Object g, int xPixel, int yPixel,
- int xPixels, int yPixels);
-
- void drawString(Object g, String s, int x, int y);
-
- void drawStringRotated(Object g, String s, int x, int y, double angle);
-
- void fillCircle(Object g, int x, int y, int diameter);
-
- void fillPolygon(Object g, int[] ayPoints, int[] axPoints, int nPoints);
-
- void fillRect(Object g, int x, int y, int width, int height);
-
- void fillBackground(Object g, GenericColor bgcolor);
-
- void lineTo(Object g, int x2, int y2);
-
- void setGraphicsColor(Object g, GenericColor c);
-
- Font setFont(Object g, Font font);
-
- void setStrokeBold(Object g, boolean tf);
-
- void translateScale(Object g, double x, double y, double scale);
-
- void setWindowParameters(int width, int height);
-
-
-}
Modified: trunk/Jmol/srcjsv/jspecview/common/Annotation.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/Annotation.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/Annotation.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -24,10 +24,11 @@
package jspecview.common;
+import org.jmol.api.GenericGraphics;
+
import javajs.api.GenericColor;
import javajs.util.CU;
import javajs.util.Lst;
-import jspecview.api.JSVGraphics;
@@ -85,7 +86,7 @@
}
- public static Annotation getColoredAnnotation(JSVGraphics g2d,
+ public static Annotation getColoredAnnotation(GenericGraphics g2d,
Spectrum spec, Lst<String> args, Annotation
lastAnnotation) {
String arg;
int xPt = 0;
Modified: trunk/Jmol/srcjsv/jspecview/common/GraphSet.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/GraphSet.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/GraphSet.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -12,11 +12,11 @@
import javajs.util.DF;
import javajs.util.Lst;
+import org.jmol.api.GenericGraphics;
import org.jmol.util.Logger;
import javajs.util.PT;
import jspecview.api.AnnotationData;
-import jspecview.api.JSVGraphics;
import jspecview.api.JSVPanel;
import jspecview.api.VisibleInterface;
import jspecview.common.Annotation.AType;
@@ -4137,7 +4137,7 @@
private JSVPanel jsvp;
private Object image2D;
private GenericColor[] plotColors;
- private JSVGraphics g2d;
+ private GenericGraphics g2d;
private Object gMain;
Modified: trunk/Jmol/srcjsv/jspecview/common/JSVersion.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/JSVersion.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/JSVersion.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -40,8 +40,8 @@
/**
* @j2sNative
*
- * tmpVersion = self.___version; tmpDate =
self.___date; tmpSVN =
- * self.___svnRev;
+ * tmpVersion = Jmol.___JSVVersion; tmpDate =
Jmol.___JSVDate;
+ * tmpSVN = Jmol.___JSVSvnRev;
*
*/
{
@@ -53,10 +53,9 @@
bis = new BufferedInputStream(is);
Properties props = new Properties();
props.load(bis);
- tmpVersion = PT
-
.trimQuotes(props.getProperty("___version", tmpVersion));
- tmpDate =
PT.trimQuotes(props.getProperty("___date", tmpDate));
- tmpSVN =
PT.trimQuotes(props.getProperty("___svnRev", tmpSVN));
+ tmpVersion =
PT.trimQuotes(props.getProperty("Jmol.___JSVVersion", tmpVersion));
+ tmpDate =
PT.trimQuotes(props.getProperty("Jmol.___JSVDate", tmpDate));
+ tmpSVN =
PT.trimQuotes(props.getProperty("Jmol.___JSVSvnRev", tmpSVN));
} catch (Exception e) {
// Nothing to do
} finally {
@@ -78,10 +77,9 @@
}
if (tmpDate != null)
tmpDate = tmpDate.substring(7, 23);
- if (tmpSVN != null)
- tmpSVN = tmpSVN.substring(22, 27);
+ tmpSVN = (tmpSVN == null ? "" : "/SVN" + tmpSVN.substring(22,
27));
VERSION_SHORT = (tmpVersion != null ? tmpVersion : "(Unknown
version)");
- VERSION = VERSION_SHORT + "/SVN" + tmpSVN + "/"
+ VERSION = VERSION_SHORT + tmpSVN + "/"
+ (tmpDate != null ? tmpDate : "(Unknown
date)");
}
Modified: trunk/Jmol/srcjsv/jspecview/common/JSViewer.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/JSViewer.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/JSViewer.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -23,6 +23,7 @@
import javajs.api.PlatformViewer;
import javajs.awt.Dimension;
+import org.jmol.api.GenericGraphics;
import org.jmol.util.Logger;
import javajs.util.PT;
@@ -30,7 +31,6 @@
import jspecview.api.ExportInterface;
import jspecview.api.JSVFileHelper;
-import jspecview.api.JSVGraphics;
import jspecview.api.JSVMainPanel;
import jspecview.api.JSVPanel;
import jspecview.api.JSVPopupMenu;
@@ -77,7 +77,7 @@
private final static int NLEVEL_MAX = 100;
public ScriptInterface si;
- public JSVGraphics g2d;
+ public GenericGraphics g2d;
public JSVTree spectraTree;
public JDXSource currentSource;
public Lst<PanelNode> panelNodes;
@@ -153,7 +153,7 @@
this.isSigned = si.isSigned();
apiPlatform = (GenericPlatform)
getPlatformInterface("Platform");
apiPlatform.setViewer(this, this.display);
- g2d = (JSVGraphics) getPlatformInterface("G2D");
+ g2d = (GenericGraphics) getPlatformInterface("G2D");
spectraTree = new SimpleTree(this);
parameters = (ColorParameters)
getPlatformInterface("Parameters");
parameters.setName("applet");
Modified: trunk/Jmol/srcjsv/jspecview/common/PDFWriter.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/PDFWriter.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/PDFWriter.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -27,12 +27,13 @@
import java.util.Hashtable;
import java.util.Map;
+import org.jmol.api.GenericGraphics;
+
import javajs.api.GenericColor;
import javajs.awt.Font;
import javajs.export.PDFCreator;
import javajs.util.CU;
-import jspecview.api.JSVGraphics;
import jspecview.api.JSVPanel;
import jspecview.api.JSVPdfWriter;
import jspecview.common.JSVersion;
@@ -43,9 +44,9 @@
* javajs.export.PDFCreator.
*
*/
-public class PDFWriter implements JSVGraphics, JSVPdfWriter {
+public class PDFWriter implements GenericGraphics, JSVPdfWriter {
- private JSVGraphics g2d;
+ private GenericGraphics g2d;
private String date;
private PDFCreator pdf;
private boolean inPath;
Modified: trunk/Jmol/srcjsv/jspecview/common/PanelData.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/common/PanelData.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/common/PanelData.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -50,7 +50,6 @@
import javajs.util.Lst;
import jspecview.api.AnnotationData;
-import jspecview.api.JSVGraphics;
import jspecview.api.JSVPanel;
import jspecview.api.PanelListener;
import jspecview.api.VisibleInterface;
@@ -59,6 +58,7 @@
import jspecview.dialog.JSVDialog;
+import org.jmol.api.GenericGraphics;
import org.jmol.util.Logger;
/**
@@ -74,7 +74,7 @@
public class PanelData implements EventManager {
- public JSVGraphics g2d, g2d0;
+ public GenericGraphics g2d, g2d0;
JSViewer vwr;
public PanelData(JSVPanel panel, JSViewer viewer) {
@@ -1388,7 +1388,7 @@
* @param pdfCreator
* @param pl
*/
- public void printPdf(JSVGraphics pdfCreator, PrintLayout pl) {
+ public void printPdf(GenericGraphics pdfCreator, PrintLayout pl) {
boolean isPortrait = !pl.layout.equals("landscape");
print(pdfCreator, (isPortrait ? pl.imageableHeight :
pl.imageableWidth),
(isPortrait ? pl.imageableWidth :
pl.imageableHeight),
@@ -1403,8 +1403,8 @@
if (pi == 0) {
isPrinting = true;
boolean addFilePath = false;
- if (g instanceof JSVGraphics) {// JsPdfCreator
- g2d = (JSVGraphics) g;
+ if (g instanceof GenericGraphics) {// JsPdfCreator
+ g2d = (GenericGraphics) g;
g = gMain;
}
if (printGraphPosition.equals("default")) {
Modified: trunk/Jmol/srcjsv/jspecview/java/AwtG2D.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/java/AwtG2D.java 2015-01-12 00:04:25 UTC
(rev 20181)
+++ trunk/Jmol/srcjsv/jspecview/java/AwtG2D.java 2015-01-12 00:05:33 UTC
(rev 20182)
@@ -46,23 +46,20 @@
import java.awt.geom.GeneralPath;
import java.awt.image.BufferedImage;
+import org.jmol.api.GenericGraphics;
+
import javajs.api.GenericColor;
import javajs.awt.Font;
-import jspecview.api.JSVGraphics;
/**
- * JSVPanel class represents a View combining one or more GraphSets, each with
one or more JDXSpectra.
+ * generic 2D drawing methods -- AWT version
*
- * @author Debbie-Ann Facey
- * @author Khari A. Bryan
- * @author Craig A.D. Walters
- * @author Prof Robert J. Lancashire
* @author Bob Hanson hans...@stolaf.edu
*/
-public class AwtG2D implements JSVGraphics {
+public class AwtG2D implements GenericGraphics {
BasicStroke strokeBasic = new BasicStroke();
BasicStroke strokeBold = new BasicStroke(2f);
Modified: trunk/Jmol/srcjsv/jspecview/js2d/JsG2D.java
===================================================================
--- trunk/Jmol/srcjsv/jspecview/js2d/JsG2D.java 2015-01-12 00:04:25 UTC (rev
20181)
+++ trunk/Jmol/srcjsv/jspecview/js2d/JsG2D.java 2015-01-12 00:05:33 UTC (rev
20182)
@@ -37,25 +37,22 @@
package jspecview.js2d;
+import org.jmol.api.GenericGraphics;
+
import javajs.api.GenericColor;
import javajs.awt.Color;
import javajs.awt.Font;
import javajs.util.CU;
-import jspecview.api.JSVGraphics;
/**
- * JSVPanel class represents a View combining one or more GraphSets, each with
one or more JDXSpectra.
+ * generic 2D drawing methods -- JavaScript version
*
- * @author Debbie-Ann Facey
- * @author Khari A. Bryan
- * @author Craig A.D. Walters
- * @author Prof Robert J. Lancashire
* @author Bob Hanson hans...@stolaf.edu
*/
-public class JsG2D implements JSVGraphics {
+public class JsG2D implements GenericGraphics {
private int windowWidth;
private int windowHeight;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
vanity: www.gigenet.com
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
