Changeset 151

Timestamp:

05/07/06 09:30:06 (2 years ago)

Author:

jordi

Message:

Instead of setting a new "Loading..." empty page each time the page is resizing, the PagePter? class instructs the IPageView to resize the current page image to the new page width and height using a faster, yet uglier, algorithm.

Files:

• trunk/src/IPageView.h (modified) (1 diff)
• trunk/src/PDFDocument.cxx (modified) (1 diff)
• trunk/src/PagePter.cxx (modified) (8 diffs)
• trunk/src/PagePter.h (modified) (1 diff)
• trunk/src/gtk/PageView.cxx (modified) (4 diffs)
• trunk/src/gtk/PageView.h (modified) (1 diff)
• trunk/tests/DumbDocumentObserver.cxx (modified) (1 diff)
• trunk/tests/DumbPageView.cxx (modified) (1 diff)
• trunk/tests/DumbPageView.h (modified) (1 diff)

trunk/src/IPageView.h

@@ -107 +107 @@
-            /// @return The position of the vertical scroll bar.
-            virtual gdouble getVerticalScroll (void) = 0;
+
+            ///
+            /// @brief Resize the current page.
+            ///
+            /// When the document's scale is changed the view is instructed
+            /// to resize the current page when the cached page image is
+            /// not ready yet. The view should resize the current image using
+            /// a fast algorithm, without caring too much about the final
+            /// result.
+            ///
+            /// @param width The new width of the page.
+            /// @param height The new height of the page.
+            ///
+            virtual void resizePage (gint width, gint height) = 0;
-            
-            ///

trunk/src/PDFDocument.cxx

@@ -395 +395 @@
-    poppler_page_render_to_pixbuf (page, 0, 0, width, height, getZoom (),
-                                   getRotation (), pixbuf);
-dk_pixbuf
+_object
-    setLinks (renderedPage, page);
-    g_object_unref (G_OBJECT (page));

trunk/src/PagePter.cxx

@@ -193 +193 @@
-{
-    g_WaitingForPage = FALSE;
-
+, FALSE
-}
-
@@ -200 +200 @@
-{
-    g_WaitingForPage = FALSE;
-
+, FALSE
-}
-
@@ -207 +207 @@
-{
-    g_WaitingForPage = FALSE;
-
+, FALSE
-}
-
@@ -214 +214 @@
-{
-    g_WaitingForPage = FALSE;
-
+, TRUE
-}
-
@@ -221 +221 @@
-{
-    g_WaitingForPage = FALSE;
-
+, FALSE
-}
-
@@ -232 +232 @@
-    if ( g_WaitingForPage )
-    {
-
+, FALSE
-        return TRUE;
-    }
@@ -248 +248 @@
-/// @param pageScroll This will be passed to the main view to let it know how
-///                   to show the scroll this new page.
-
-
-
+
+
+
+
+
-{
-    g_assert (NULL != m_Document && 
@@ -269 +271 @@
-            {
-                documentPage = m_Document->getEmptyPage ();
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-                g_WaitingForPage = TRUE;

trunk/src/PagePter.h

@@ -62 +62 @@
-            IPageView *m_PageView;
-            
-
+, gboolean wasZoomed
-    };
-}

trunk/src/gtk/PageView.cxx

@@ -106 +106 @@
-
-void
+PageView::resizePage (gint width, gint height)
+{
+    GdkPixbuf *originalPage = gtk_image_get_pixbuf (GTK_IMAGE (m_PageImage));
+    if ( NULL != originalPage )
+    {
+        GdkPixbuf *scaledPage = gdk_pixbuf_scale_simple (originalPage,
+                                                         width, height,
+                                                         GDK_INTERP_NEAREST);
+        if ( NULL != scaledPage )
+        {
+            gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageImage), scaledPage);
+            g_object_unref (scaledPage);
+        }
+    }
+}
+
+void
-PageView::setCursor (PageCursor cursorType)
-{
@@ -188 +205 @@
-    GdkPixbuf *pixbuf = getPixbufFromPage (page);
-    gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageImage), pixbuf);
-dk_pixbuf
+_object
-    // Set the vertical scroll to the specified.
-    if ( PAGE_SCROLL_NONE != scroll )
@@ -274 +291 @@
-        
-        gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageImage), modifiedPage);
-dk_pixbuf
+_object
-    } 
-}
@@ -311 +328 @@
-            page->getRowStride (), NULL, NULL);
-    GdkPixbuf *finalPixbuf = gdk_pixbuf_copy (pixbuf);
-dk_pixbuf
+_object
-
-    return finalPixbuf;

trunk/src/gtk/PageView.h

@@ -33 +33 @@
-            void getSize (gint *width, gint *height);
-            gdouble getVerticalScroll (void);
+            void resizePage (gint width, gint height);
-            void scrollPage (gdouble scrollX, gdouble scrollY,
-                             gint dx, gint dy);

trunk/tests/DumbDocumentObserver.cxx

@@ -86 +86 @@
-DumbDocumentObserver::notifyReload (void)
-{
-
+ = TRUE
-}
-

trunk/tests/DumbPageView.cxx

@@ -52 +52 @@
-
-void
+DumbPageView::resizePage (gint width, gint height)
+{
+}
+
+void
-DumbPageView::scrollPage (gdouble scrollX, gdouble scrollY, gint dx, gint dy)
-{

trunk/tests/DumbPageView.h

@@ -30 +30 @@
-            void getSize (gint *width, gint *height);
-            gdouble getVerticalScroll (void);
+            void resizePage (gint width, gint height);
-            void scrollPage (gdouble scrollX, gdouble scrollY,
-                             gint dx, gint dy);