Changeset 30

Timestamp:

04/11/06 14:16:02 (2 years ago)

Author:

jordi

Message:

The main presenter now can rotate as well.

Files:

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

trunk/src/MainPter.cxx

@@ -139 +139 @@
-}
-
+///
+/// @brief The "Go To Last Page" action was activated.
+///
-void
-MainPter::goToLastPageActivated (void)
@@ -149 +152 @@
-}
-
+///
+/// @brief The "Go To Next Page" action was activated.
+///
-void
-MainPter::goToNextPageActivated (void)
@@ -159 +165 @@
-}
-
+///
+/// @brief The "Go To Page" action was activated.
+///
+/// This action is activated when the user presses the Enter key on
+/// the displayed current apge number. The user can change the value,
+/// and the page will change to that value.
+///
-void
-MainPter::goToPageActivated (void)
@@ -178 +191 @@
-}
-
+
+///
+/// @brief The "Go To Previous Page" action was activated.
+///
-void
-MainPter::goToPreviousPageActivated (void)
@@ -265 +282 @@
-
-///
+/// @brief The "Rotate Left" was activated.
+///
+void
+MainPter::rotateLeftActivated ()
+{
+    g_assert ( NULL != m_Document && "Tried to rotate a NULL document.");
+
+    m_Document->rotateLeft ();
+    showPage ();
+}
+
+///
+/// @brief The "Rotate Right" was activated.
+///
+void
+MainPter::rotateRightActivated ()
+{
+    g_assert ( NULL != m_Document && "Tried to rotate a NULL document.");
+
+    m_Document->rotateRight ();
+    showPage ();
+}
+
+///
-/// @brief Shows the current page.
-///

trunk/src/MainPter.h

@@ -38 +38 @@
-            void goToPreviousPageActivated (void);
-            void openFileActivated (void);
+            void rotateLeftActivated (void);
+            void rotateRightActivated (void);
-
-        protected:

trunk/tests/DumbDocument.cxx

@@ -66 +66 @@
-                     "%s", IDocument::getErrorMessage (m_OpenError));
-    }
+    m_Rotation = 0;
+    m_Scale = 1.0f;
-    return m_Loaded;
-}
@@ -72 +74 @@
-DumbDocument::getPageSize (gdouble *width, gdouble *height)
-{
-
-1
+0
+25
-}
-

trunk/tests/MainPterTest.cxx

@@ -412 +412 @@
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-}
+
+///
+/// @brief Test the rotation of the page.
+///
+/// This is a very simple test about page rotation.
+///
+void
+MainPterTest::pageRotate ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 0);
+
+    m_MainPter->rotateRightActivated (); 
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 90);
+
+    m_MainPter->rotateLeftActivated (); 
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (m_Document->getRotation (), 0);
+}

trunk/tests/MainPterTest.h

@@ -34 +34 @@
-        CPPUNIT_TEST (goodPassword);
-        CPPUNIT_TEST (pageNavigation);
+        CPPUNIT_TEST (pageRotate);
-        CPPUNIT_TEST_SUITE_END();
-
@@ -48 +49 @@
-            void goodPassword (void);
-            void pageNavigation (void);
+            void pageRotate (void);
-
-        private: