Changeset 897

Timestamp:

02/16/14 00:38:14 (10 years ago)

Author:

ngw8

Message:

Changed webparser to use a for loop (rather than while) for scrolling around the page, allowing the progress bar to be updated.

File:

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

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

@@ -284 +284 @@
         public static void parsePageSimple(final JfxBrowser browserWidget, final WebEngine webEngine, final WebView webView, final Frame frame) {
                 try {
+                        
+                        final int verticalScrollPerPage = (int) (FrameGraphics.getMaxFrameSize().getHeight() * 0.85);
+                        final int horizontalScrollPerPage = (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.85);
+                                                
                         Platform.runLater(new Runnable() {
 
@@ -289 +293 @@
                                 public void run() {
                                         browserWidget.setOverlayVisible(true);
-                                        browserWidget.setWebViewSize(FrameGraphics.getMaxFrameSize().getWidth() * 0.9, FrameGraphics.getMaxFrameSize().getHeight() * 0.9);
+                                        
+                                        // Webview area is set to slightly larger than the size of a converted page, to give some overlap between each page
+                                        browserWidget.setWebViewSize(horizontalScrollPerPage * 1.1, verticalScrollPerPage * 1.1);
                                         browserWidget.setScrollbarsVisible(false);
                                 }
@@ -295 +301 @@
 
                         final Object notifier = new Object();
-                        
-                        final MutableBool bottomReached = new MutableBool(false);
-                        final MutableBool rightReached = new MutableBool(false);
-                        
+                                                
                         final MutableInt verticalCount = new MutableInt(0);
                         final MutableInt horizontalCount = new MutableInt(0);
+                        
+                        final MutableInt pagesVertical = new MutableInt(1);
+                        final MutableInt pagesHorizontal = new MutableInt(1);
 
                         final String pageTitle;
@@ -318 +324 @@
 
                         WebParser.addButton("Return to original frame", frame.getName(), null, 200, frameset, null, 0f, 10f, null);
-
 
                         Text link = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), pageTitle, null);
@@ -435 +440 @@
                                                                 // Storing the current scroll position
                                                                 + "var originalScrollX = window.pageXOffset;"
-                                                                + "var originalScrollY = window.pageYOffset");
-                                                
-                                                
-
+                                                                + "var originalScrollY = window.pageYOffset;");
+                                                                                                
+                                                window.setMember("horizontalScrollPerPage", horizontalScrollPerPage);
+                                                window.setMember("verticalScrollPerPage", verticalScrollPerPage);
+                                                
+                                                
+                                                
+                                                // The scrollPerPage will always be less than the page's height, due to the overlap being added/allowed for between pages, 
+                                                // but if the webpage fits in a single converted page, there's no need for any overlap, so just use 1 as the number of pages
+                                                if((Boolean) webEngine.executeScript("document.documentElement.scrollHeight > window.innerHeight")) {
+                                                        pagesVertical.setValue((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollHeight") / (float) verticalScrollPerPage));
+                                                }
+                                                
+                                                if((Boolean) webEngine.executeScript("document.documentElement.scrollWidth > window.innerWidth")) {
+                                                        pagesHorizontal.setValue((int) Math.ceil((Integer) webEngine.executeScript("document.documentElement.scrollWidth") / (float) horizontalScrollPerPage));
+                                                }
+                                                
+                                                System.out.println(webEngine.executeScript("document.documentElement.scrollWidth") + "/" + horizontalScrollPerPage);
+                                                System.out.println(pagesVertical.getValue() + "x" + pagesHorizontal.getValue());
+                                                
                                                 // Setting up the element that contains the CSS to hide all text. Also hiding readability mode buttons.
                                                 // This is wiped before the text is converted, then re-added before taking the screenshot
@@ -543 +564 @@
                                                         try {
                                                                 progressBar.set((50 * (j + 1)) / nodesLength);
-                                                        } catch (ArrayIndexOutOfBoundsException e) {
+                                                        } catch (Exception e) {
+                                                                // Seems to be a bug somewhere along the line when updating the progressbar, so am catching any exception 
+                                                                // thrown here to avoid it stuffing up the rest of the parsing 
                                                                 e.printStackTrace();
                                                         }
@@ -585 +608 @@
 
                         // Loop that scrolls the page horizontally
-                        while (!rightReached.getValue()) {
-                                bottomReached.setValue(false);
-                                
+                        for(int i = 0; i < pagesHorizontal.getValue(); i++) {
+                                                                
                                 Platform.runLater(new Runnable() {
                                         @Override
@@ -595 +617 @@
                                                         webEngine.executeScript(""
                                                                         + "scrollCounter = 0;"
-                                                                        + "window.scrollTo(scrollCounterHorizontal * 0.9 * window.innerWidth, 0);"
+                                                                        + "window.scrollTo(scrollCounterHorizontal * horizontalScrollPerPage, 0);"
                                                                         + "scrollCounterHorizontal = scrollCounterHorizontal+1;");
-
-                                                        rightReached.setValue((Boolean) webEngine.executeScript("(window.pageXOffset + window.innerWidth >= document.documentElement.scrollWidth)"));
 
                                                 } catch (Exception e) {
@@ -607 +627 @@
                                 
                                 // Loop that scrolls the page vertically (for each horizontal scroll position)
-                                while (!bottomReached.getValue()) {
+                                for(int j = 0; j < pagesVertical.getValue(); j++) {
+                                        
+                                        try {
+                                                progressBar.set((int) (50 + ((float)(j+1)/(pagesVertical.getValue() * pagesHorizontal.getValue())  + ((float)(i) / pagesHorizontal.getValue())) * 50));
+                                        } catch (Exception e) {
+                                                e.printStackTrace();
+                                        }
+                                        
                                         Platform.runLater(new Runnable() {
                                                 @Override
@@ -614 +641 @@
                                                                 // Scrolling down the page
                                                                 webEngine.executeScript(""
-                                                                                + "window.scrollTo(window.pageXOffset, scrollCounter * 0.9 * window.innerHeight);"
+                                                                                + "window.scrollTo(window.pageXOffset, scrollCounter * verticalScrollPerPage);"
                                                                                 + "scrollCounter = scrollCounter+1;");
-
-                                                                bottomReached.setValue((Boolean) webEngine.executeScript("(window.pageYOffset + window.innerHeight >= document.documentElement.scrollHeight)"));
         
                                                                 synchronized (notifier) {