Changeset 157

Timestamp:

05/09/06 13:07:25 (2 years ago)

Author:

jordi

Message:

The FindPter? now can also search backwards.

Files:

• trunk/src/FindPter.cxx (modified) (2 diffs)
• trunk/src/FindPter.h (modified) (1 diff)
• trunk/src/JobFind.cxx (modified) (8 diffs)
• trunk/src/JobFind.h (modified) (4 diffs)
• trunk/src/epdfview.h (modified) (2 diffs)
• trunk/tests/FindPterTest.cxx (modified) (7 diffs)
• trunk/tests/FindPterTest.h (modified) (2 diffs)

trunk/src/FindPter.cxx

@@ -65 +65 @@
-    else
-    {
+        if ( FIND_DIRECTION_BACKWARDS == m_Job->getDirection () )
+        {
+            m_Job->setCurrentPage (m_Job->getCurrentPage () + 2);
+        }
+        m_Job->setDirection (FIND_DIRECTION_FORWARDS);
+        IJob::queue (m_Job);
+    }
+}
+
+///
+/// @brief The Find Previous button has been clicked.
+///
+void
+FindPter::findPreviousActivated ()
+{
+    m_CurrentMatch = g_list_previous (m_CurrentMatch);
+    if ( NULL != m_CurrentMatch )
+    {
+        DocumentRectangle *rect = ((DocumentRectangle *)m_CurrentMatch->data);
+        m_Document->goToPage (m_FindPage);
+        m_Document->notifyFindChanged (rect);
+    }
+    else
+    {
+        if ( FIND_DIRECTION_FORWARDS == m_Job->getDirection () )
+        {
+            m_Job->setCurrentPage (m_Job->getCurrentPage () - 2);
+        }
+        m_Job->setDirection (FIND_DIRECTION_BACKWARDS);
-        IJob::queue (m_Job);
-    }
@@ -98 +127 @@
-FindPter::notifyFindFinished (void)
-{
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    m_FindPage = pageNum;
-    freeFindResults ();
-    m_FindResults = results;
-
+
+
+
+
+
+
+
+
-    m_Document->goToPage (m_FindPage);
-    DocumentRectangle *rect = (DocumentRectangle *)m_CurrentMatch->data;

trunk/src/FindPter.h

@@ -38 +38 @@
-
-            void findNextActivated (void);
+            void findPreviousActivated (void);
-            IFindView &getView (void);
-            void notifyFindFinished (void);
-
+
+
-            void setView (IFindView *view);
-            void textToFindChanged (void);

trunk/src/JobFind.cxx

@@ -30 +30 @@
-    m_Canceled = FALSE;
-    m_CurrentPage = 0;
+    m_Direction = FIND_DIRECTION_FORWARDS;
-    m_Document = NULL;
-    m_FindPter = NULL;
@@ -57 +58 @@
-}
-
+FindDirection
+JobFind::getDirection ()
+{
+    return m_Direction;
+}
+
-IDocument *
-void
+
-{
-    return m_Document;
@@ -64 +71 @@
-
-FindPter *
-void
+
-{
-    return m_FindPter;
@@ -82 +89 @@
-
-gint
-void
+
-{
-    return m_StartingPage;
@@ -112 +119 @@
-        GList *result = getDocument ()->findTextInPage (currentPage,
-                                                        getTextToFind ());
-gint nextPage = currentPage + 1;
-nextPage > getDocument ()->getNumPages
-
-nextPage = 1
+
+FIND_DIRECTION_FORWARDS == getDirection
+
+setCurrentPage (currentPage + 1)
-        }
-
-
+
+
+
+
-        
-        if ( NULL != result )
@@ -127 +136 @@
-        else 
-        {
-nextPage
+getCurrentPage ()
-            {
-                JOB_NOTIFIER (job_find_end, this);
@@ -143 +152 @@
-{
-    m_CurrentPage = pageNum;
+
+    gint numPages = m_Document->getNumPages ();
+    if ( m_CurrentPage > numPages )
+    {
+        m_CurrentPage = 1;
+    }
+    else if ( 1 > m_CurrentPage )
+    {
+        m_CurrentPage = numPages;
+    }
+}
+
+void
+JobFind::setDirection (FindDirection direction)
+{
+    m_Direction = direction;
-}
-
@@ -207 +232 @@
-    JobFind *job = (JobFind *)data;
-    job->getFindPter ()->notifyFindResults (job->getResultsPage (),
-
+
+
-
-    JOB_NOTIFIER_END ();

trunk/src/JobFind.h

@@ -21 +21 @@
-namespace ePDFView
-{
+    // Forward declarations.
+    class FindPter;
+
+    ///
+    /// @brief The search direction.
+    ///
+    typedef enum
+    {
+        /// Search forwards.
+        FIND_DIRECTION_FORWARDS,
+        /// Search backwards.
+        FIND_DIRECTION_BACKWARDS
+    } FindDirection;
+    
-    class JobFind: public IJob
-    {
@@ -29 +43 @@
-            void cancel (void);
-            gint getCurrentPage (void);
+            FindDirection getDirection (void);
-            IDocument *getDocument (void);
-            FindPter *getFindPter (void);
@@ -38 +53 @@
-            gboolean run (void);
-            void setCurrentPage (gint pageNum);
+            void setDirection (FindDirection direction);
-            void setDocument (IDocument *document);
-            void setFindPter (FindPter *pter);
@@ -47 +63 @@
-            gboolean m_Canceled;
-            gint m_CurrentPage;
+            FindDirection m_Direction;
-            IDocument *m_Document;
-            FindPter *m_FindPter;

trunk/src/epdfview.h

@@ -32 +32 @@
-#include <PDFDocument.h>
-
+#include <IJob.h>
+#include <JobFind.h>
+#include <JobLoad.h>
+#include <JobRender.h>
+
-#include <IFindView.h>
-#include <IPageView.h>
@@ -39 +44 @@
-#include <MainPter.h>
-
-#include <IJob.h>
-#include <JobFind.h>
-#include <JobLoad.h>
-#include <JobRender.h>
-
-#endif //!__E_PDF_VIEW_H__

trunk/tests/FindPterTest.cxx

@@ -120 +120 @@
-FindPterTest::findNext ()
-{
-
-
+
+
+
-    
-    // The 'first' text appears twice in page 4 and also twice in
@@ -137 +138 @@
-    m_Observer->notifyFindStarted ();
-    m_FindPter->findNextActivated ();
-
+
+
-    CPPUNIT_ASSERT_EQUAL (4, m_Observer->getCurrentPage ());
-    {
@@ -147 +149 @@
-        CPPUNIT_ASSERT_DOUBLES_EQUAL (157.1100, rect->getY2 (), 0.0001);
-    }
-
-
-
-
+
+
+
+
+
-    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
-    {
@@ -163 +166 @@
-    m_Observer->notifyFindStarted ();
-    m_FindPter->findNextActivated ();
-
+
+
-    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
-    {
@@ -176 +180 @@
-    m_Observer->notifyFindStarted ();
-    m_FindPter->findNextActivated ();
-
+
+
-    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
-    {
@@ -190 +195 @@
-    m_Observer->notifyFindStarted ();
-    m_FindPter->findNextActivated ();
-
+
+
-    CPPUNIT_ASSERT_EQUAL (4, m_Observer->getCurrentPage ());
-    {
@@ -201 +207 @@
-    }
-}
+
+///
+/// @brief Tests the Find Previous button.
+///
+/// When a search starts it tried to find the next text in the document.
+/// If the user presses the Find Previous button, it will try to find the
+/// previous found text in the document, searching backwards.
+///
+void
+FindPterTest::findPrevious ()
+{   
+    m_View->setTextToFind ("first");
+    volatile gboolean stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    
+    // The 'first' text appears twice in page 4 and also twice in
+    // page 5. So the first time it will set a rect on page 4.
+    CPPUNIT_ASSERT_EQUAL (4, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (82.0000, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (137.1100, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (100.3400, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (146.1100, rect->getY2 (), 0.0001);
+    }
+    
+    m_Observer->notifyFindStarted ();
+    m_FindPter->findPreviousActivated ();
+    stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (72.0000, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (143.1745, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (116.9349, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (162.3553, rect->getY2 (), 0.0001);
+    }
+   
+    m_Observer->notifyFindStarted ();
+    m_FindPter->findPreviousActivated ();
+    stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (164.1700, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (121.1020, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (180.2800, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (130.1020, rect->getY2 (), 0.0001);
+    }
+
+    m_Observer->notifyFindStarted ();
+    m_FindPter->findPreviousActivated ();
+    stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (200.5943, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (84.5980, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (254.5158, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (107.6147, rect->getY2 (), 0.0001);
+    }
+  
+    m_Observer->notifyFindStarted ();
+    m_FindPter->findPreviousActivated ();
+    stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    CPPUNIT_ASSERT_EQUAL (4, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (96.0000, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (148.1100, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (114.3400, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (157.1100, rect->getY2 (), 0.0001);
+    }
+
+    m_Observer->notifyFindStarted ();
+    m_FindPter->findNextActivated ();
+    stillSearching = TRUE;
+    while ( stillSearching ) {stillSearching = m_Observer->isStillSearching ();}
+    CPPUNIT_ASSERT_EQUAL (5, m_Observer->getCurrentPage ());
+    {
+        DocumentRectangle *rect = m_Observer->getFindMatchRect ();
+        CPPUNIT_ASSERT (NULL != rect);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (200.5943, rect->getX1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (84.5980, rect->getY1 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (254.5158, rect->getX2 (), 0.0001);
+        CPPUNIT_ASSERT_DOUBLES_EQUAL (107.6147, rect->getY2 (), 0.0001);
+    }
+}

trunk/tests/FindPterTest.h

@@ -29 +29 @@
-        CPPUNIT_TEST (textDoesNotExist);
-        CPPUNIT_TEST (findNext);
+        CPPUNIT_TEST (findPrevious);
-        CPPUNIT_TEST_SUITE_END ();
-
@@ -38 +39 @@
-            void textDoesNotExist (void);
-            void findNext (void);
+            void findPrevious (void);
-
-        private: