Changeset 713

Timestamp:

01/16/14 16:23:39 (10 years ago)

Author:

ngw8

Message:

Web parser now creates Expeditee rectangles for elements that have a background colour

File:

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

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

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -243 +244 @@
                                                                 );
 
-                                                WebParser.addPageToFrame(doc, null, window, webEngine, frame);
+                                                WebParser.addPageToFrame(doc, window, webEngine, frame);
 
                                                 progressBar.set(100);
@@ -308 +309 @@
          * @throws IllegalAccessException
          */
-        private static void addPageToFrame(Node rootElement, Color parentBgColor, Object window, Object webEngine, Frame frame) throws InvocationTargetException, IllegalAccessException,
+        private static void addPageToFrame(Node rootElement, Object window, Object webEngine, Frame frame) throws InvocationTargetException, IllegalAccessException,
                         IllegalArgumentException {
                 
                 Node currentNode = rootElement;
-
-                Color bgColor = null;
 
                 if (currentNode.getNodeType() == Node.TEXT_NODE || currentNode.getNodeType() == Node.ELEMENT_NODE) {
@@ -343 +342 @@
                         float height = Float.valueOf(JavaFX.JSObjectGetMember.invoke(bounds, "height").toString());
 
-                        // Have to get the bg color even if the element isn't visible, so it can be cascaded down to child elements
-                        // Always returns in format "rgb(x,x,x)" or "rgba(x,x,x,x)"
-                        String bgColorString = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "background-color" });
-
-                        bgColor = rgbStringToColor(bgColorString);
-
-                        bgColor = (bgColor != null ? bgColor : parentBgColor);
-                        
-
                         // Checking if the element is actually visible on the page
                         if (WebParser.elementVisible(x, y, width, height, style)) {
@@ -365 +355 @@
                                         String color = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "color" });
                                         
+                                        // Always returns in format "rgb(x,x,x)" or "rgba(x,x,x,x)"
+                                        String bgColorString = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "background-color" });
+
                                         String align = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "text-align" });
                                         
@@ -468 +461 @@
                                         }
 
-                                        t = frame.addText(Math.round(x), Math.round(y), textContent, null);
+                                        // Adding the text to the frame. Expeditee text seems to be positioned relative to the baseline of the first line, so
+                                        // the font size has to be added to the y-position
+                                        t = frame.addText(Math.round(x), Math.round(y + fontSizeFloat), textContent, null);
 
                                         t.setColor(rgbStringToColor(color));
-                                        t.setBackgroundColor(bgColor);
+                                        t.setBackgroundColor(rgbStringToColor(bgColorString));
                                         t.setFont(font);
                                         t.setSize(fontSizeFloat);
@@ -503 +498 @@
                                 } else if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
 
+                                        // Always returns in format "rgb(x,x,x)" or "rgba(x,x,x,x)"
+                                        String bgColorString = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "background-color" });
+
+                                        Color bgColor = rgbStringToColor(bgColorString);
+
+                                        // If the element has a background color then add it (to Expeditee) as a rectangle with that background color
+                                        if (bgColor != null) {
+                                                System.out.println("bg");
+                                                frame.addRectangle(Math.round(x), Math.round(y), Math.round(width), Math.round(height), 0, null, bgColor);
+                                        }
+
                                         // background image, returns in format "url(protocol://absolute/path/to/img.extension)" for images,
                                         // may also return gradients, data, etc. (not handled yet). Only need to add bg image on
@@ -511 +517 @@
 
                                         if (bgImage.startsWith("url(")) {
-
                                                 bgImage = bgImage.substring(4, bgImage.length() - 1);
 
@@ -599 +604 @@
 
                         while (childNode != null) {
-                                addPageToFrame(childNode, bgColor, window, webEngine, frame);
+                                addPageToFrame(childNode, window, webEngine, frame);
                                 childNode = childNode.getNextSibling();
                         }