Changeset 104

Timestamp:

04/21/06 05:47:55 (2 years ago)

Author:

jordi

Message:

Rotation the page also keeps the zoom to fit and zoom to width options.

Files:

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

trunk/src/MainPter.cxx

@@ -362 +362 @@
-
-    m_Document->rotateLeft ();
+
+    Config &config = Config::getConfig ();
+    if ( config.zoomToWidth () )
+    {
+        zoomWidth ();
+    }
+    else if ( config.zoomToFit () )
+    {
+        zoomFit ();
+    }
-    showPage ();
-}
@@ -374 +384 @@
-
-    m_Document->rotateRight ();
+
+    Config &config = Config::getConfig ();
+    if ( config.zoomToWidth () )
+    {
+        zoomWidth ();
+    }
+    else if ( config.zoomToFit () )
+    {
+        zoomFit ();
+    }
-    showPage ();
-}
@@ -410 +430 @@
-    Config::getConfig().setShowToolbar (show);
-    getView ().showToolbar (show);
+}
+
+///
+/// @brief Performs the "Zoom Fit Best".
+///
+/// Gets the width of the current page view and then calls the zoom to fit
+/// function from document.
+///
+void
+MainPter::zoomFit ()
+{
+    gint width;
+    gint height;
+    getView ().getPageViewSize (&width, &height);
+    m_Document->zoomToFit (width, height);
-}
-
@@ -429 +464 @@
-    if ( active )
-    {
-
-
-
-
+
-        showPage ();
-    }
@@ -475 +507 @@
-    m_Document->zoomOut ();
-    showPage ();
+}
+
+///
+/// @brief Performs the "Zoom Fit Width".
+///
+/// Gets the width of the current page view and then calls the zoom to width
+/// function from document.
+///
+void
+MainPter::zoomWidth ()
+{
+    gint width;
+    gint height;
+    getView ().getPageViewSize (&width, &height);
+    m_Document->zoomToWidth (width);
-}
-
@@ -494 +541 @@
-    if ( active )
-    {
-
-
-
-
+
-        showPage ();
-    }

trunk/src/MainPter.h

@@ -72 +72 @@
-            DocumentPage *m_DocumentPage;
-            IMainView *m_View;
+
+            void zoomFit (void);
+            void zoomWidth (void);
-    };
-}

trunk/tests/DumbDocument.cxx

@@ -77 +77 @@
-DumbDocument::getPageSize (gdouble *width, gdouble *height)
-{
-
+
+
+
+
+
+
-    {
-        *width = 100;
-        *height = 250;
-    }
-    else
-    {
-        *width = 250;
-        *height = 100;
-    }
-}

trunk/tests/MainPterTest.cxx

@@ -676 +676 @@
-}
-
+///
+/// @brief Checks rotation and zoom.
+///
+/// This tests that rotation while the zoom to width or zoom to
+/// fit are activated also changed the zoom level.
+///
+void
+MainPterTest::pageZoomAndRotate ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
+
+    // The document is 100x250 and the page view 75x50.
+    // ZoomToWidth 75/100 = 0.75
+    m_MainPter->zoomWidthActivated (TRUE);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+    // Rotate left. 75/250 = 0.3
+    m_MainPter->rotateLeftActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateRightActivated ();    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateRightActivated ();    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateLeftActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+
+    // Now try the same with zoom to fit.
+    // 50/250 = 0.2
+    m_MainPter->zoomFitActivated (TRUE);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+    // Rotate left, 75/250 = 0.3
+    m_MainPter->rotateLeftActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateRightActivated ();    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateRightActivated ();    
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    m_MainPter->rotateLeftActivated ();
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+}
-
-///

trunk/tests/MainPterTest.h

@@ -40 +40 @@
-        CPPUNIT_TEST (pageZoomWidth);
-        CPPUNIT_TEST (pageZoomFit);
+        CPPUNIT_TEST (pageZoomAndRotate);
-        CPPUNIT_TEST (reloadNormal);
-        CPPUNIT_TEST (reloadEncrypted);
@@ -65 +66 @@
-            void pageZoomWidth (void);
-            void pageZoomFit (void);
+            void pageZoomAndRotate (void);
-            void reloadNormal (void);
-            void reloadEncrypted (void);