Changeset 31

Timestamp:

04/11/06 14:53:06 (2 years ago)

Author:

jordi

Message:

The presenter is now able to control the Zoom: In, Out, toFit and toWidth.
The ZoomIn? and ZoomOut? controls also get sensitived depending if we can zoom in/out or not.

This puts an end to the presenter. I still need to check why compiling MainPterTest?.cxx takes this insane amount of time.

Location:

trunk

Files:

• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (2 diffs)
• src/MainPter.h (modified) (1 diff)
• tests/DumbDocument.cxx (modified) (1 diff)
• tests/DumbMainView.cxx (modified) (1 diff)
• tests/DumbMainView.h (modified) (1 diff)
• tests/MainPterTest.cxx (modified) (1 diff)
• tests/MainPterTest.h (modified) (2 diffs)

trunk/src/IMainView.h

@@ -48 +48 @@
             virtual void setGoToPageText (const gchar *text) = 0;
             virtual const gchar *getGoToPageText (void) = 0;
+            virtual void getPageViewSize (gint *width, gint *height) = 0;
             virtual void setTitle (const gchar *title) = 0;
 

trunk/src/MainPter.cxx

@@ -306 +306 @@
 
 ///
+/// @brief The "Zoom Fit Best" was activated.
+///
+void
+MainPter::zoomFitActivated (void)
+{
+    g_assert ( NULL != m_Document && "Tried to zoom fit a NULL document.");
+
+    gint width;
+    gint height;
+    getView ().getPageViewSize (&width, &height);
+    m_Document->zoomToFit (width, height);
+    showPage ();
+}
+
+///
+/// @brief The "Zoom In" was activated.
+///
+void
+MainPter::zoomInActivated (void)
+{
+    g_assert ( NULL != m_Document && "Tried to zoom in a NULL document.");
+
+    m_Document->zoomIn ();
+    showPage ();
+}
+
+///
+/// @brief The "Zoom Out" was activated.
+///
+void
+MainPter::zoomOutActivated (void)
+{
+    g_assert ( NULL != m_Document && "Tried to zoom out a NULL document.");
+
+    m_Document->zoomOut ();
+    showPage ();
+}
+
+///
+/// @brief The "Zoom Fit Width" was activated.
+///
+void
+MainPter::zoomWidthActivated (void)
+{
+    g_assert ( NULL != m_Document && "Tried to zoom width a NULL document.");
+
+    gint width;
+    gint height;
+    getView ().getPageViewSize (&width, &height);
+    m_Document->zoomToWidth (width);
+    showPage ();
+}
+
+///
 /// @brief Shows the current page.
 ///
@@ -332 +386 @@
     view.sensitiveGoToLastPage (m_Document->getNumPages() > currentPage);
     view.sensitiveGoToNextPage (m_Document->getNumPages() > currentPage);
+    // And the zoom sentitivity.
+    view.sensitiveZoomIn (m_Document->canZoomIn ());
+    view.sensitiveZoomOut (m_Document->canZoomOut ());
     
     DocumentPage *page = m_Document->renderPage ();

trunk/src/MainPter.h

@@ -40 +40 @@
             void rotateLeftActivated (void);
             void rotateRightActivated (void);
+            void zoomFitActivated (void);
+            void zoomInActivated (void);
+            void zoomOutActivated (void);
+            void zoomWidthActivated (void);
 
         protected:

trunk/tests/DumbDocument.cxx

@@ -74 +74 @@
 DumbDocument::getPageSize (gdouble *width, gdouble *height)
 {
-    *width = 100;
-    *height = 250;
+    if ( 0 == getRotation () || 270 == getRotation () )
+    {
+        *width = 100;
+        *height = 250;
+    }
+    else
+    {
+        *width = 250;
+        *height = 100;
+    }
 }
 

trunk/tests/DumbMainView.cxx

@@ -145 +145 @@
 
 void
+DumbMainView::getPageViewSize (gint *width, gint *height)
+{
+    *width = 75;
+    *height = 50;
+}
+
+void
 DumbMainView::setTitle (const gchar *title)
 {

trunk/tests/DumbMainView.h

@@ -40 +40 @@
             void sensitiveZoomWidth (gboolean sensitive);
             const gchar *getGoToPageText (void);
+            void getPageViewSize (gint *width, gint *height);
             void setTotalPages (gint pages);
             void setGoToPageText (const char *text);

trunk/tests/MainPterTest.cxx

@@ -425 +425 @@
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 0);
+    CPPUNIT_ASSERT_EQUAL (0, m_Document->getRotation ());
 
     m_MainPter->rotateRightActivated (); 
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 90);
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());
 
     m_MainPter->rotateLeftActivated (); 
     CPPUNIT_ASSERT (m_View->hasImagePageView ());
     CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 0);
-}
+    CPPUNIT_ASSERT_EQUAL (0, m_Document->getRotation ());
+}
+
+///
+/// @brief Tests page's zoom.
+///
+/// The DumbDocument has a fixed size of 100x250 pixels and the DumbMainView
+/// has a fixed pageView of 75x50. We will make sure that getting to the max
+/// ZoomIn unsensitives the ZoomIn button. The same for the ZoomOut.
+///
+/// Then will test Zoom Fit and Zoom Width with two different rotations.
+///
+void
+MainPterTest::pageZoom ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0f, m_Document->getZoom (), 0.0001f);
+
+    m_MainPter->zoomInActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.2f, m_Document->getZoom (), 0.0001f);
+
+    m_MainPter->zoomOutActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (1.0f, m_Document->getZoom ());
+   
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
+    // Make sure we go to the last zoom level.
+    for (int count = 0 ; count < 20 ; count++)
+    {
+        m_MainPter->zoomInActivated ();
+    }
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
+    for (int count = 0 ; count < 40 ; count ++)
+    {
+        m_MainPter->zoomOutActivated ();
+    }
+    CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
+
+    // OK, now try to zoom width. Since rotation is 0
+    // the zoom level should be 50/250 = 0.2
+    m_MainPter->zoomFitActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2f, m_Document->getZoom (), 0.0001f);
+    // For the width it should be 75/100 = 0.75
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75f, m_Document->getZoom (), 0.0001f);
+
+    // Now rotate and try again.
+    m_MainPter->rotateRightActivated (); 
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());
+    
+    // Since rotation is now 90 the zoom level should be 75/250 = 0.3
+    m_MainPter->zoomFitActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3f, m_Document->getZoom (), 0.0001f);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    // For the width it should be 75/250 = 0.3 also.
+    m_MainPter->zoomWidthActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3f, m_Document->getZoom (), 0.0001f);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+}

trunk/tests/MainPterTest.h

@@ -35 +35 @@
         CPPUNIT_TEST (pageNavigation);
         CPPUNIT_TEST (pageRotate);
+        CPPUNIT_TEST (pageZoom);
         CPPUNIT_TEST_SUITE_END();
 
@@ -50 +51 @@
             void pageNavigation (void);
             void pageRotate (void);
+            void pageZoom (void);
 
         private: