Changeset 630

Timestamp:

12/17/13 15:31:24 (11 years ago)

Author:

ngw8

Message:

WebParser bug fixes related to image repetition, default/unspecified fonts and CSS text-transform

File:

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

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

@@ -159 +159 @@
                                                                 .invoke(webEngine,
                                                                                 "function isContent(el) { "
-                                                                                + "             if (el.tagName === 'li' && window.getComputedStyle(el).getPropertyValue('list-style-type') !== 'none') { "
-                                                                                + "                     return true; "
-                                                                                + "             } "
-                                                                                + "             var text = el.textContent.replace(/(^\\s*)|(\\s*$)/, ''); "
-                                                                                + "             var w = text.split(/\\S\\s\\S/).length; var punct = text.split(/\\.|\\,|\\!/).length; "
-                                                                                + "             if (punct < 2 || w < 10) { "
+                                                                                + "             if (el.tagName === 'li' && window.getComputedStyle(el).getPropertyValue('list-style-type') !== 'none') {"
+                                                                                + "                     return true;"
+                                                                                + "             }"
+                                                                                + "             var text = el.textContent.replace(/(^\\s*)|(\\s*$)/, '');"
+                                                                                + "             var w = text.split(/\\S\\s\\S/).length; var punct = text.split(/\\.|\\,|\\!/).length;"
+                                                                                + "             if (punct < 2 || w < 10) {"
                                                                                 + "                     return false;"
                                                                                 + "             } else { "
                                                                                 + "                     return true;"
-                                                                                + "             } "
-                                                                                + "} "
+                                                                                + "             }"
+                                                                                + "}"
+
                                                                                 + "function addToSpan(text) {"
                                                                                 + "             span = document.createElement('wordSpan');"
-                                                                                + "             span.textContent = text + ' '; "
-                                                                                + "             para.appendChild(span); "
-                                                                                + "             if (prevSpan !== null && span.getBoundingClientRect().top > prevSpan.getBoundingClientRect().top) { "
+                                                                                + "             span.textContent = text + ' ';"
+                                                                                + "             para.appendChild(span);"
+                                                                                + "             if (prevSpan !== null && span.getBoundingClientRect().top > prevSpan.getBoundingClientRect().top) {"
                                                                                 + "                     span.textContent = '\\n' + span.textContent;"
                                                                                 + "                     if (prevPrevSpan !== null && prevPrevSpan.getBoundingClientRect().left == prevSpan.getBoundingClientRect().left) {"
@@ -183 +184 @@
                                                                                 + "                     }"
                                                                                 + "                     prevSpan = span;"
-                                                                                
                                                                                 + "             } else {"
                                                                                 + "                     prevSpan.textContent = prevSpan.textContent + span.textContent;"
@@ -196 +196 @@
                                                 for (int i = 0; i < contentElementsLength; i++) {
                                                         Element currentNode = (Element) JavaFX.JSObjectGetSlot.invoke(contentElements, i);
-                                                        // JavaFX.JSObjectCall.invoke(window, "addBreaks", new Object[] { currentNode });
+
                                                         JavaFX.JSObjectSetMember.invoke(window, "para", currentNode);
                                                         
                                                         JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
-                                                                        + "var exp = {};"
                                                                         + "var span = document.createElement('wordSpan');"
                                                                         + "var prevSpan = span;"
@@ -293 +292 @@
                                                                                 // Returns comma-separated list of typefaces
                                                                                 String typeface = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "font-family" });
+
                                                                                 String[] typefaces = typeface.split(", |,");
                                                                                 
@@ -302 +302 @@
                                                                                 String letterSpacing = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "letter-spacing" });
 
+                                                                                String textTransform = (String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "text-transform" });
+
                                                                                 Boolean fontFound = false;
                                                                                 Font font = new Font(null);
@@ -308 +310 @@
                                                                                 // found, or the end of the list is reached, in which case the default font is used
                                                                                 for (int j = 0; j < typefaces.length && !fontFound; j++) {
-
+                                                                                        if (typefaces[j].toLowerCase().equals("sans-serif")) {
+                                                                                                typefaces[j] = "Arial";
+                                                                                        } else if (typefaces[j].toLowerCase().equals("serif")) {
+                                                                                                typefaces[j] = "Times New Roman";
+                                                                                        }
+                                                                                        
                                                                                         // Regex will remove any inverted commas surrounding multi-word typeface names
                                                                                         font = new Font(typefaces[j].replaceAll("^'|'$", ""), Font.PLAIN, 12);
-
+                                                                                        
+                                                                                        // If the font isn't found, Java just uses Font.DIALOG, so this check checks whether the font was found
                                                                                         if (!(font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase()))) {
                                                                                                 fontFound = true;
                                                                                         }
+                                                                                }
+
+                                                                                if (font.getFamily().toLowerCase().equals(Font.DIALOG.toLowerCase())) {
+                                                                                        font = new Font("Times New Roman", Font.PLAIN, 12);
                                                                                 }
 
@@ -344 +356 @@
                                                                                 }
 
-                                                                                Node siblingNode;
-                                                                                NodeList siblings = currentNode.getParentNode().getChildNodes();
-
-                                                                                String combined = currentNode.getTextContent();
-
-                                                                                for (int j = 0; j < siblings.getLength(); j++) {
-                                                                                        siblingNode = siblings.item(j);
-                                                                                        if (siblingNode.getNodeType() == Node.TEXT_NODE) {
-                                                                                                System.out.println("sibling is text");
-                                                                                                combined = combined + siblingNode.getTextContent();
-                                                                                        }
-                                                                                }
-
-                                                                                System.out.println("Combined: " + combined);
-
-
                                                                                 Text t;
-
-                                                                                t = frame.addText((int) x, (int) y, currentNode.getTextContent().replaceAll("[^\\S\\n]+", " ").trim(), null);
+                                                                                String textContent = currentNode.getTextContent().replaceAll("[^\\S\\n]+", " ").trim();
+
+                                                                                if (textTransform.equals("uppercase")) {
+                                                                                        textContent = textContent.toUpperCase();
+                                                                                } else if (textTransform.equals("lowercase")) {
+                                                                                        textContent = textContent.toUpperCase();
+                                                                                }
+
+                                                                                t = frame.addText((int) x, (int) y, textContent, null);
 
                                                                                 t.setColor(rgbStringToColor(color));
@@ -396 +399 @@
 
                                                                                         String bgSize = ((String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "background-size" })).toLowerCase();
+                                                                                        String bgRepeat = ((String) JavaFX.JSObjectCall.invoke(style, "getPropertyValue", new Object[] { "background-repeat" })).toLowerCase();
 
                                                                                         // Returns "[x]px [y]px", "[x]% [y]%", "[x]px [y]%" or "[x]% [y]px"
@@ -446 +450 @@
 
                                                                                         try {
-                                                                                                WebParser.addImageFromUrl(bgImage, frame, x, y, bgWidth, cropStartX, cropStartY, cropEndX, cropEndY);
+                                                                                                System.out.println("START-Y: " + cropStartY + " END-Y: " + cropEndY);
+                                                                                                WebParser.addImageFromUrl(bgImage, frame, x, y, bgWidth, cropStartX, cropStartY, cropEndX, cropEndY, bgRepeat);
                                                                                         } catch (MalformedURLException mue) {
                                                                                                 // probably a 'data:' url, not supported yet
@@ -457 +462 @@
                                                                                 if (currentNode.getNodeName().toLowerCase().equals("img") && (imgSrc = JavaFX.JSObjectGetMember.invoke(currentNode, "src").toString()) != null) {
                                                                                         try {
-                                                                                                WebParser.addImageFromUrl(imgSrc, frame, x, y, (int) width, null, null, null, null);
+                                                                                                WebParser.addImageFromUrl(imgSrc, frame, x, y, (int) width, null, null, null, null, null);
                                                                                         } catch (MalformedURLException mue) {
                                                                                                 // probably a 'data:' url, not supported yet
@@ -547 +552 @@
          * @throws IOException
          */
-        private static void addImageFromUrl(String imgSrc, final Frame frame, float x, float y, int width, Integer cropStartX, Integer cropStartY, Integer cropEndX, Integer cropEndY)
+        private static void addImageFromUrl(String imgSrc, final Frame frame, float x, float y, int width, Integer cropStartX, Integer cropStartY, Integer cropEndX, Integer cropEndY, String repeat)
                         throws MalformedURLException,
                         IOException {
@@ -564 +569 @@
                 out.mkdirs();
                 ImageIO.write(img, "png", out);
-                
-                
+
                 if (cropEndX == null || cropStartX == null || cropEndY == null || cropStartY == null) {
                         cropStartX = 0;
@@ -571 +575 @@
                         cropEndX = img.getWidth();
                         cropEndY = img.getHeight();
+                } else if (cropStartX < 0) {
+                        cropEndX = cropEndX - cropStartX;
+                        x = x + Math.abs(cropStartX);
+                        cropStartX = 0;
+                }
+
+                if (cropStartY < 0) {
+                        cropEndY = cropEndY - cropStartY;
+                        y = y + Math.abs(cropStartY);
+                        cropStartY = 0;
+
                 }
 
@@ -576 +591 @@
                         width = img.getWidth();
                 }
-                
+
+                if (repeat != null) {
+                        if (repeat.equals("no-repeat")) {
+                                int tmpCropEndY = (int) (cropStartY + ((float) width / img.getWidth()) * img.getHeight());
+                                int tmpCropEndX = cropStartX + width;
+
+                                cropEndX = (cropEndX < tmpCropEndX) ? cropEndX : tmpCropEndX;
+                                cropEndY = (cropEndY < tmpCropEndY) ? cropEndY : tmpCropEndY;
+                        } else if (repeat.equals("repeat-x")) {
+                                int tmpCropEndY = (int) (cropStartY + ((float) width / img.getWidth()) * img.getHeight());
+                                cropEndY = (cropEndY < tmpCropEndY) ? cropEndY : tmpCropEndY;
+                        } else if (repeat.equals("repeat-y")) {
+                                int tmpCropEndX = cropStartX + width;
+                                cropEndX = (cropEndX < tmpCropEndX) ? cropEndX : tmpCropEndX;
+                        }
+                }
+
                 Text text = new Text("@i: " + out.getName() + " " + width);
                 text.setPosition(x, y);
@@ -583 +614 @@
                 
                 float invScale = 1 / pic.getScale();
-                
-                // System.out.println("unscaled crop: " + cropStartX + " " + cropStartY + " " + cropEndX + " " + cropEndY);
-                // System.out.println("crop: " + cropStartX * invScale + " " + cropStartY * invScale + " " + cropEndX * invScale + " " + cropEndY * invScale);
-                
+
                 pic.setCrop((int)(cropStartX * invScale), (int)(cropStartY * invScale), (int)(cropEndX * invScale), (int)(cropEndY * invScale));
-                
-                // System.out.println("source = " + pic.getSource().getText());
-                
+
                 frame.addItem(pic);
                 pic.anchor();