Changeset 128

Timestamp:

04/29/06 03:33:17 (2 years ago)

Author:

jordi

Message:

Now when the page number changes, the observers are informed. Also, when the page is the same it doesn't "change" (doesn't notify). If the page to go is outside the range, the document class then just ignores it.

Location:

trunk

Files:

• src/IDocument.cxx (modified) (2 diffs)
• src/IDocument.h (modified) (1 diff)
• src/IDocumentObserver.h (modified) (1 diff)
• src/PDFDocument.cxx (modified) (2 diffs)
• tests/DumbDocument.cxx (modified) (1 diff)
• tests/DumbDocumentObserver.cxx (modified) (4 diffs)
• tests/DumbDocumentObserver.h (modified) (2 diffs)
• tests/PDFDocumentTest.cxx (modified) (4 diffs)
• tests/PDFDocumentTest.h (modified) (1 diff)

trunk/src/IDocument.cxx

@@ -285 +285 @@
 
 void
+IDocument::notifyPageChanged ()
+{
+    gint pageNum = getCurrentPageNum ();
+    for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
+          item = g_list_next (item) )
+    {
+        IDocumentObserver *observer = (IDocumentObserver *)item->data;
+        observer->notifyPageChanged (pageNum);
+    }
+}
+
+void
 IDocument::load (const gchar *fileName, const gchar *password)
 {
+    m_CurrentPage = 1;
+    m_Rotation = 0;
+    m_Scale = 1.0f;
+    
     JobLoad *job = new JobLoad ();
     job->setDocument (this);
@@ -850 +866 @@
 IDocument::goToPage (gint pageNum)
 {
-    m_CurrentPage = CLAMP (pageNum, 1, getNumPages ());
-
-    scheduleToRender (m_CurrentPage);
-    if ( 1 < m_CurrentPage )
-    {
-        scheduleToRender (m_CurrentPage - 1);
-    }
-    if ( m_CurrentPage < getNumPages () )
-    {
-        scheduleToRender (m_CurrentPage + 1);
+    if ( pageNum != m_CurrentPage && 1 <= pageNum && pageNum <= getNumPages ())
+    {
+        m_CurrentPage = pageNum;
+        
+        scheduleToRender (m_CurrentPage);
+        if ( 1 < m_CurrentPage )
+        {
+            scheduleToRender (m_CurrentPage - 1);
+        }
+        if ( m_CurrentPage < getNumPages () )
+        {
+            scheduleToRender (m_CurrentPage + 1);
+        }
+
+        notifyPageChanged ();
     }
 }

trunk/src/IDocument.h

@@ -180 +180 @@
             void notifyLoadError (const GError *error);
             void notifyLoadPassword (const GError *error);
+            void notifyPageChanged (void);
             
             const gchar *getTitle (void);

trunk/src/IDocumentObserver.h

@@ -29 +29 @@
             virtual void notifyLoadError (const GError *error) { }
             virtual void notifyLoadPassword (const GError *error) { }
+            virtual void notifyPageChanged (gint pageNum) { }
 
         protected:

trunk/src/PDFDocument.cxx

@@ -144 +144 @@
     m_Outline = new DocumentOutline ();
     setOutline (m_Outline, outline);
-    // Set the current rotation angle and zoom level.
-    setRotation (0);
-    setZoom (1.0f);
 
     return TRUE;
@@ -234 +231 @@
     // Get the number of pages and set the current to the first.
     setNumPages (poppler_document_get_n_pages (m_Document));
-    goToFirstPage ();
 }
 

trunk/tests/DumbDocument.cxx

@@ -70 +70 @@
         m_Loaded = FALSE;
     }
-    setRotation (0);
-    setZoom (1.0f);
     return m_Loaded;
 }

trunk/tests/DumbDocumentObserver.cxx

@@ -24 +24 @@
     IDocumentObserver ()
 {
+    m_CurrentPage = 0;
     m_Error = NULL;
     m_NotifiedError = FALSE;
@@ -39 +40 @@
 {
     m_NotifiedLoad = TRUE;
+    m_CurrentPage = 1;
 }
 
@@ -55 +57 @@
 }
 
+void
+DumbDocumentObserver::notifyPageChanged (gint pageNum)
+{
+    m_CurrentPage = pageNum;
+}
+
 ////////////////////////////////////////////////////////////////
 // Test purposes methods.
@@ -62 +70 @@
 DumbDocumentObserver::getCurrentPage (void)
 {
-    return 0;
+    return m_CurrentPage;
 }
 

trunk/tests/DumbDocumentObserver.h

@@ -30 +30 @@
             void notifyLoadError (const GError *error);
             void notifyLoadPassword (const GError *error);
+            void notifyPageChanged (gint pageNum);
 
             gint getCurrentPage (void);
@@ -43 +44 @@
 
         protected:
+            gint m_CurrentPage;
             GError *m_Error;
             gboolean m_NotifiedError;

trunk/tests/PDFDocumentTest.cxx

@@ -308 +308 @@
 }
 
-/*
 ///
 /// @brief Test changing pages.
@@ -321 +320 @@
     // First try with a 2 page document.
     gchar *testFile = getTestFile ("test2.pdf");
-    CPPUNIT_ASSERT (m_Document->loadFile (testFile, NULL, NULL));
+    m_Document->load (testFile, NULL);
     while ( !m_Observer->loadFinished () ) { }
     CPPUNIT_ASSERT (m_Observer->notifiedLoaded ());
@@ -368 +367 @@
     g_free (testFile);
     testFile = getTestFile ("test1.pdf");
-    CPPUNIT_ASSERT (m_Document->loadFile (testFile, NULL, NULL));
+    m_Document->load (testFile, NULL);
     while ( !m_Observer->loadFinished () ) { }
     CPPUNIT_ASSERT (m_Observer->notifiedLoaded ());
@@ -427 +426 @@
     g_free (testFile);
 }
-
+/*
 ///
 /// @brief Test rotating a page.

trunk/tests/PDFDocumentTest.h

@@ -32 +32 @@
         CPPUNIT_TEST (validFile);
         CPPUNIT_TEST (relativePath);
-/*        CPPUNIT_TEST (pageChange);
-        CPPUNIT_TEST (pageRotate);
+        CPPUNIT_TEST (pageChange);
+/*        CPPUNIT_TEST (pageRotate);
         CPPUNIT_TEST (pageZoom);
         CPPUNIT_TEST (pageRender);*/