Changeset 63

Timestamp:

04/14/06 14:36:57 (2 years ago)

Author:

jordi

Message:

The presenter now can reload a document. To do so I had to add the setters for IDocument's zoom and rotation (they should've been from the start, but...)

Files:

• trunk/src/IDocument.cxx (modified) (8 diffs)
• trunk/src/IDocument.h (modified) (2 diffs)
• trunk/src/MainPter.cxx (modified) (7 diffs)
• trunk/src/MainPter.h (modified) (3 diffs)
• trunk/src/PDFDocument.cxx (modified) (1 diff)
• trunk/tests/DumbDocument.cxx (modified) (1 diff)
• trunk/tests/MainPterTest.cxx (modified) (4 diffs)
• trunk/tests/MainPterTest.h (modified) (2 diffs)

trunk/src/IDocument.cxx

@@ -654 +654 @@
-
-///
+/// @brief Sets the current rotation degress.
+///
+/// @param rotation The rotation in positive degrees. 
+///                 If the parameter is greater than 360 degrees, its set
+///                 between 0 and 360 as a result of @a rotation % 360.
+///
+void
+IDocument::setRotation (gint rotation)
+{
+    m_Rotation = (rotation % 360);
+}
+
+///
-/// @brief Rotates 90 to the left.
-///
@@ -661 +674 @@
-IDocument::rotateLeft ()
-{
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -676 +690 @@
-IDocument::rotateRight ()
-{
-m_Rotation = (m_Rotation + 90) % 360
+setRotation (getRotation () + 90)
-}
-
@@ -706 +720 @@
-/// @return The current zoom or scale level.
-///
-float
+double
-IDocument::getZoom (void)
-{
-    return m_Scale;
+}
+
+///
+/// @brief Sets the current zoom.
+///
+/// @param zoom The new zoom level.
+///
+void
+IDocument::setZoom (gdouble zoom)
+{
+    m_Scale = zoom;
-}
-
@@ -725 +750 @@
-    if (canZoomIn ())
-    {
-m_Scale *= ZOOM_IN_FACTOR
+setZoom (getZoom () * ZOOM_IN_FACTOR)
-    }
-}
@@ -742 +767 @@
-    if (canZoomOut ())
-    {
-m_Scale *= ZOOM_OUT_FACTOR
+setZoom (getZoom () * ZOOM_OUT_FACTOR)
-    }
-}
@@ -766 +791 @@
-    gdouble widthScale = (gdouble)width / pageWidth;
-    gdouble heightScale = (gdouble)height / pageHeight;
-m_Scale = MIN (widthScale, heightScale
+setZoom (MIN (widthScale, heightScale)
-}
-
@@ -784 +809 @@
-
-    getPageSize (&pageWidth, &pageHeight);
-m_Scale = (gdouble)width / pageWidth
-
+setZoom ((gdouble)width / pageWidth)
+

trunk/src/IDocument.h

@@ -208 +208 @@
-
-            gint getRotation (void);
+            void setRotation (gint rotation);
-            void rotateLeft (void);
-            void rotateRight (void);
@@ -213 +214 @@
-            gboolean canZoomIn (void);
-            gboolean canZoomOut (void);
-
+
+
-            void zoomIn (void);
-            void zoomOut (void);

trunk/src/MainPter.cxx

@@ -64 +64 @@
-/// set the window's title and tell the main view to show itself.
-///
-
-
+
+
+
+
+
+
+
+
-{
-    g_assert ( NULL != m_Document && "The document is NULL.");
@@ -90 +96 @@
-        view.sensitiveZoomWidth (TRUE);
-        view.setTotalPages (m_Document->getNumPages ());
-
+
+
+
+
+
-    }
-    else
@@ -139 +149 @@
-    // Now that the view is set, it's time to set the initial 
-    // state.
-
+TRUE
-}
-
@@ -235 +245 @@
-    IMainView &view = getView ();
-    gchar *fileName = view.openFileDialog ();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // I don't need to do anything in this case. I'm only interested when
-    // the user tried to open a file.
@@ -245 +377 @@
-            // Now that the document has been loaded, just reset the initial
-            // state.
-
+canShowPage
-        }
-        else
@@ -272 +404 @@
-                {
-                    // Phew, finally loaded. Set the initial state.
-
+canShowPage
-                }
-                else if ( NULL != password )
@@ -293 +425 @@
-            g_free (error);
-        }
-        g_free (fileName);
-    }
-}
-
-///
-/// @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 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 ();
-}
-
-///

trunk/src/MainPter.h

@@ -41 +41 @@
-            ~MainPter (void);
-
-void);           
+gboolean canShowPage);
-            IMainView &getView (void);
-            void setView (IMainView *view);
@@ -51 +51 @@
-            void goToPreviousPageActivated (void);
-            void openFileActivated (void);
+            void reloadActivated (void);
-            void rotateLeftActivated (void);
-            void rotateRightActivated (void);
@@ -59 +60 @@
-
-        protected:
+            void openDocument (const gchar *fileName, gboolean canShowPage);
-            void showPage (void);
-

trunk/src/PDFDocument.cxx

@@ -133 +133 @@
-    setOutline (m_Outline, outline->getItems ());
-    // Set the current rotation angle and zoom level.
-m_Rotation = 0
-m_Scale = 1.0f
+setRotation (0)
+setZoom (1.0f)
-    // Set the output device.
-    delete m_OutputDevice;

trunk/tests/DumbDocument.cxx

@@ -66 +66 @@
-                     "%s", IDocument::getErrorMessage (m_OpenError));
-    }
-m_Rotation = 0
-m_Scale = 1.0f
+setRotation (0)
+setZoom (1.0f)
-    return m_Loaded;
-}

trunk/tests/MainPterTest.cxx

@@ -288 +288 @@
-}
-
+
-///
-/// @brief Test page navigation.
@@ -490 +491 @@
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-f, m_Document->getZoom (), 0.0001f
+, m_Document->getZoom (), 0.0001
-
-    m_MainPter->zoomInActivated ();
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-f, m_Document->getZoom (), 0.0001f
+, m_Document->getZoom (), 0.0001
-
-    m_MainPter->zoomOutActivated ();
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-EQUAL (1.0f, m_Document->getZoom ()
+DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001
-   
-    CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
@@ -523 +524 @@
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-f, m_Document->getZoom (), 0.0001f
+, m_Document->getZoom (), 0.0001
-    // For the width it should be 75/100 = 0.75
-    m_MainPter->zoomWidthActivated ();
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-f, m_Document->getZoom (), 0.0001f
+, m_Document->getZoom (), 0.0001
-
-    // Now rotate and try again.
@@ -537 +538 @@
-    // Since rotation is now 90 the zoom level should be 75/250 = 0.3
-    m_MainPter->zoomFitActivated ();
-f, m_Document->getZoom (), 0.0001f
+, m_Document->getZoom (), 0.0001
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    // For the width it should be 75/250 = 0.3 also.
-    m_MainPter->zoomWidthActivated ();
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/tests/MainPterTest.h

@@ -37 +37 @@
-        CPPUNIT_TEST (pageRotate);
-        CPPUNIT_TEST (pageZoom);
+        CPPUNIT_TEST (reloadNormal);
-        CPPUNIT_TEST_SUITE_END();
-
@@ -54 +55 @@
-            void pageRotate (void);
-            void pageZoom (void);
+            void reloadNormal (void);
-
-        private: