git://source.jalview.org
/
jalviewjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading
[jalviewjs.git]
/
site
/
j2s
/
swingjs
/
JSGraphics2D.js
diff --git
a/site/j2s/swingjs/JSGraphics2D.js
b/site/j2s/swingjs/JSGraphics2D.js
index
a7c4a9c
..
1485d7b
100644
(file)
--- a/
site/j2s/swingjs/JSGraphics2D.js
+++ b/
site/j2s/swingjs/JSGraphics2D.js
@@
-97,10
+97,6
@@
this.ctx.beginPath ();
this.ctx.rect (x, y, width, height);
this.ctx.stroke ();
}, "~N,~N,~N,~N");
this.ctx.rect (x, y, width, height);
this.ctx.stroke ();
}, "~N,~N,~N,~N");
-Clazz.defineMethod (c$, "drawString",
-function (s, x, y) {
-this.ctx.fillText (s, x, y);
-}, "~S,~N,~N");
Clazz.defineMethod (c$, "background",
function (bgcolor) {
this.backgroundColor = bgcolor;
Clazz.defineMethod (c$, "background",
function (bgcolor) {
this.backgroundColor = bgcolor;
@@
-216,8
+212,6
@@
this.ctx.fill("evenodd");
}, "java.awt.Shape");
Clazz.defineMethod (c$, "drawImage",
function (img, x, y, observer) {
}, "java.awt.Shape");
Clazz.defineMethod (c$, "drawImage",
function (img, x, y, observer) {
-xxxi = img
-xxx = this;
if (img != null) {
var imgNode = this.getImageNode (img);
if (imgNode != null) this.ctx.drawImage (imgNode, x, y, img.getWidth (observer), img.getHeight (observer));
if (img != null) {
var imgNode = this.getImageNode (img);
if (imgNode != null) this.ctx.drawImage (imgNode, x, y, img.getWidth (observer), img.getHeight (observer));
@@
-259,7
+253,6
@@
Clazz.defineMethod (c$, "getImageNode",
var imgNode = null;
{
imgNode = img._imgNode || img._canvas;
var imgNode = null;
{
imgNode = img._imgNode || img._canvas;
-xxxii = imgNode;
}if (imgNode == null) imgNode = swingjs.JSToolkit.getCompositor ().createImageNode (img);
return imgNode;
}, "java.awt.Image");
}if (imgNode == null) imgNode = swingjs.JSToolkit.getCompositor ().createImageNode (img);
return imgNode;
}, "java.awt.Image");
@@
-459,6
+452,14
@@
function () {
swingjs.JSToolkit.notImplemented (null);
return null;
});
swingjs.JSToolkit.notImplemented (null);
return null;
});
+Clazz.defineMethod (c$, "drawString",
+function (s, x, y) {
+this.ctx.fillText (s, x, y);
+}, "~S,~N,~N");
+Clazz.defineMethod (c$, "drawStringUnique",
+function (s, x, y) {
+this.ctx.fillText (s, x, y);
+}, "~S,~N,~N");
Clazz.overrideMethod (c$, "drawStringTrans",
function (str, x, y) {
swingjs.JSToolkit.notImplemented (null);
Clazz.overrideMethod (c$, "drawStringTrans",
function (str, x, y) {
swingjs.JSToolkit.notImplemented (null);