Changeset 808

Timestamp:

02/03/14 11:16:55 (10 years ago)

Author:

ngw8

Message:

Fixed webparser bug where first converted page had text visible on the bg image

File:

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

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

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -11 +10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.IntBuffer;
 import java.text.SimpleDateFormat;
-
-import javafx.animation.AnimationTimer;
-import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-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;
-import javax.swing.JComponent;
-
-import netscape.javascript.JSObject;
-
-import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameUtils;
-import org.expeditee.gui.MessageBay;
-import org.expeditee.gui.MessageBay.Progress;
-import org.expeditee.items.ItemUtils;
-import org.expeditee.items.Justification;
-import org.expeditee.items.Picture;
-import org.expeditee.items.Text;
-import org.w3c.dom.Node;
-import org.w3c.dom.html.HTMLBodyElement;
-
-
-
-
-
-
-
 /*
  * JavaFX is not on the default java classpath until Java 8 (but is still included with Java 7), so your IDE will probably complain that the imports below can't be resolved. 
@@ -60 +21 @@
 import java.util.Arrays;
 import java.util.Date;
+
+import javafx.animation.AnimationTimer;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+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.web.WebEngine;
+import javafx.scene.web.WebView;
+
+import javax.imageio.ImageIO;
+
+import netscape.javascript.JSObject;
+
+import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.MessageBay.Progress;
+import org.expeditee.items.ItemUtils;
+import org.expeditee.items.Justification;
+import org.expeditee.items.Picture;
+import org.expeditee.items.Text;
+import org.w3c.dom.Node;
+import org.w3c.dom.html.HTMLBodyElement;
 
 /**
@@ -308 +298 @@
                         frameset.getTitleItem().setSize(14);
 
-                        Text link = new Text(DisplayIO.getCurrentFrame().getNextItemID(), webEngine.getTitle());
-
-                        link.setPosition(100, 100);
-
-                        DisplayIO.getCurrentFrame().addItem(link);
-
+                        Text link = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), webEngine.getTitle(), null);
                         link.setLink(frameset.getName());
+
+                        FrameMouseActions.pickup(link);
 
                         // Timer that fires every time JFX is redrawn. After a few redraws, the handle method of this takes a screenshot of the page,
@@ -338 +325 @@
 
                                                 try {
-                                                        if(pageCount.getValue() > 1) {
-                                                                webEngine.executeScript(""
-                                                                                + "document.getElementsByTagName('head')[0].removeChild(cssHide);");
-                                                        }
+                                                        // removing the CSS that hides the text (otherwise the text would not pass the visibility check that is run on
+                                                        // it before adding it to the frame)
+                                                        webEngine.executeScript("cssHide.innerHTML = '';");
+
                                                         HTMLBodyElement doc = (HTMLBodyElement) webEngine.executeScript("document.body");
 
@@ -358 +345 @@
                                                 webEngine.executeScript(""
                                                                 // Setting all text to be hidden before taking the screenshot
-                                                                + "var cssHide = document.createElement('style');"
-                                                                + "cssHide.type = 'text/css';"
-                                                                + "var style = 'WordSpan { visibility: hidden; color: red }';"
-                                                                + "cssHide.appendChild(document.createTextNode(style));"
-                                                                + "document.getElementsByTagName('head')[0].appendChild(cssHide);");
+                                                                + "var style = 'WordSpan { visibility: hidden !important;}';"
+                                                                + "cssHide.appendChild(document.createTextNode(style));");
                                                 
-                                                System.out.println("hidden");
-
-                                                WritableImage tmp = new WritableImage((int)webView.getWidth(), (int)webView.getHeight());
-
-                                                System.out.println("painted");
-                                                // Drawing the JfxPanel (containing the webview) to the image
-                                                webView.snapshot(new SnapshotParameters(), tmp);
-                                                
+                                                WritableImage img = new WritableImage((int)webView.getWidth(), (int)webView.getHeight());
+
+                                                webView.snapshot(new SnapshotParameters(), img);
+
                                                 // Getting a BufferedImage from the JavaFX image
-                                                BufferedImage image = SwingFXUtils.fromFXImage(tmp, null);
+                                                BufferedImage image = SwingFXUtils.fromFXImage(img, null);
 
                                                 try {
@@ -381 +361 @@
                                                         out.mkdirs();
                                                         ImageIO.write(image, "png", out);
-                                                        
-
-                                                        // Adding the image
+
+                                                        // Adding the image to the frame
                                                         frameToAddTo.addText(0, 0, "@i: " + out.getName(), null);
                                                         
-                                                        Text thumb = frameset.addText(100, (int) (((((float) thumbWidth / image.getWidth()) * image.getHeight()) + 10) * pageCount.getValue()), "@i: " + out.getName() + " "
-                                                                        + thumbWidth,
-                                                                        null);
+                                                        // Adding thumbnail to the overview page
+                                                        Text thumb = frameset.addText(100, (int) (((((float) thumbWidth / image.getWidth()) * image.getHeight()) + 10) * pageCount.getValue()), "@i: " + out.getName() + " " + thumbWidth, null);
                                                         thumb.setLink(frameToAddTo.getName());
                                                         thumb.setBorderColor(Color.lightGray);
@@ -457 +435 @@
                                                                 + "var scrollCounter = 0;");
 
+                                                // Setting up the element that contains the CSS to hide all text.
+                                                // This is wiped before the text is converted, then re-added before taking the screenshot
+                                                webEngine.executeScript(""
+                                                                + "var cssHide = document.createElement('style');"
+                                                                + "cssHide.type = 'text/css';"
+                                                                + "var style = 'WordSpan { visibility: hidden !important;}';"
+                                                                + "cssHide.appendChild(document.createTextNode(style));"
+                                                                + "document.getElementsByTagName('head')[0].appendChild(cssHide);");
+                                                
                                                 HTMLBodyElement doc = (HTMLBodyElement) webEngine.executeScript("document.body");
 
@@ -549 +536 @@
                                                         // Will never reach 100% here, as the processing is not quite finished - progress is set to 100% at the end of
                                                         // the addPageToFrame loop below
-                                                        progressBar.set((100 * (j)) / nodesLength);
+                                                        progressBar.set((50 * (j + 1)) / nodesLength);
                                                 }
 
@@ -580 +567 @@
                         synchronized (notifier) {
                                 try {
-                                        // Waiting for the JavaFX thread to finish
+                                        // Waiting for the page setup (splitting into spans) to finish
                                         notifier.wait();
                                 } catch (InterruptedException e) {
@@ -614 +601 @@
                                 synchronized (notifier) {
                                         try {
-                                                // Waiting for the JavaFX thread to finish
+                                                // Waiting for the page to be scrolled
                                                 notifier.wait();
                                         } catch (InterruptedException e) {
@@ -635 +622 @@
 
                         }
+
+                        progressBar.set(100);
+
+                        Platform.runLater(new Runnable() {
+                                @Override
+                                public void run() {
+                                        // Reloading the page once the parsing is done - only realistic way to reset (i.e. remove all the added WordSpan tags)
+                                        // the page
+                                        webEngine.reload();
+                                }
+                        });
 
                 } catch (Exception ex) {