Changeset 801 for trunk/src/org/expeditee/io

Timestamp:

01/31/14 16:42:05 (10 years ago)

Author:

jts21

Message:

Make JfxBrowser use only JavaFX Nodes, and make WebParser get images with webView.snapshot() instead of blitting the parent Swing component onto an Image

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (6 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -11 +11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.IntBuffer;
 import java.text.SimpleDateFormat;
 
@@ -18 +19 @@
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.SnapshotParameters;
+import javafx.scene.image.WritableImage;
+import javafx.scene.image.WritablePixelFormat;
 import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
 
 import javax.imageio.ImageIO;
@@ -37 +43 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.html.HTMLBodyElement;
+
+
+
+
+
+
 
 /*
@@ -279 +291 @@
          *            The Expeditee frame to output the converted page to
          */
-        public static void parsePageSimple(final WebEngine webEngine, final Object webView, final JComponent jfxPanel, final Frame frame) {
+        public static void parsePageSimple(final WebEngine webEngine, final WebView webView, final Frame frame) {
                 try {
                         final Object notifier = new Object();
@@ -354 +366 @@
                                                 System.out.println("hidden");
 
-                                                BufferedImage image = new BufferedImage(jfxPanel.getWidth(), jfxPanel.getHeight(), BufferedImage.TYPE_INT_ARGB);
-
-                                                Graphics graphics = image.createGraphics();
+                                                WritableImage tmp = new WritableImage((int)webView.getWidth(), (int)webView.getHeight());
+
                                                 System.out.println("painted");
                                                 // Drawing the JfxPanel (containing the webview) to the image
-                                                jfxPanel.paint(graphics);
+                                                webView.snapshot(new SnapshotParameters(), tmp);
+                                                
+                                                // Getting a BufferedImage from the JavaFX image
+                                                BufferedImage image = SwingFXUtils.fromFXImage(tmp, null);
 
                                                 try {
@@ -425 +439 @@
                                                 }
 
-                                                graphics.dispose();
                                                 image.flush();