Changeset 222

Timestamp:

06/11/06 14:46:38 (2 years ago)

Author:

jordi

Message:

Added a new class named JobPrint? whose duty is to render the current document to PostScript? and print the resultant file. It already renders the requested pages (Note: the setUpPageRange is horrible) to PostScript?.

Location:

trunk/src

Files:

• IDocument.cxx (modified) (3 diffs)
• IDocument.h (modified) (3 diffs)
• IPrintView.h (modified) (4 diffs)
• JobFind.cxx (modified) (2 diffs)
• JobLoad.cxx (modified) (1 diff)
• JobPrint.cxx (added)
• JobPrint.h (added)
• JobSave.h (modified) (1 diff)
• MainPter.cxx (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• PDFDocument.cxx (modified) (4 diffs)
• PDFDocument.h (modified) (3 diffs)
• PrintPter.cxx (modified) (3 diffs)
• PrintPter.h (modified) (3 diffs)
• epdfview.h (modified) (1 diff)
• gtk/PrintView.cxx (modified) (3 diffs)
• gtk/PrintView.h (modified) (2 diffs)

trunk/src/IDocument.cxx

@@ -231 +231 @@
         IDocumentObserver *observer = (IDocumentObserver *)item->data;
         observer->notifyFindChanged (matchRect);
-    } 
+    }
 }
 
@@ -903 +903 @@
 ///
 const gchar *
-IDocument::getPassword ()
+IDocument::getPassword () const
 {
     return m_Password;
@@ -939 +939 @@
 ///
 const gchar *
-IDocument::getFileName ()
+IDocument::getFileName () const
 {
     if ( NULL == m_FileName )

trunk/src/IDocument.h

@@ -134 +134 @@
 
             ///
+            /// @brief Makes a copy of the document.
+            ///
+            /// This function must make a deep copy of the current document
+            /// and return the result.
+            ///
+            /// @return A new document class with the same content than the
+            ///         caller document.
+            ///
+            virtual IDocument *copy (void) const = 0;
+
+            ///
             /// @brief Finds text on a single page.
             ///
@@ -190 +201 @@
             virtual void getPageSizeForPage (gint pageNum, gdouble *width,
                                              gdouble *height) = 0;
+
+            ///
+            /// @brief Starts the output to PostScript.
+            ///
+            /// This starts a new PostScript file with name @a fileName and
+            /// with @a numPages pages of @a width x @a height.
+            ///
+            /// @param fileName The file name to output the postscript code.
+            /// @param numOfPages The number of pages to output.
+            /// @param pageWidth The width of each page.
+            /// @param pageHeight The height of each page.
+            ///
+            virtual void outputPostscriptBegin (const gchar *fileName,
+                                                guint numOfPages,
+                                                gfloat pageWidth,
+                                                gfloat pageHeight) = 0;
+
+            ///
+            /// @brief Ends the output to PostScript.
+            ///
+            /// Ends any started output to PostScript by calling
+            /// outputPostscriptBegin ().
+            ///
+            virtual void outputPostscriptEnd (void) = 0;
+
+            ///
+            /// @brief Renders a single page to PostScript.
+            ///
+            /// Renders the page @a pageNum To the PostScript started
+            /// at outputPostscriptBegin ().
+            ///
+            /// @param pageNum The number of the page to render.
+            ///
+            virtual void outputPostscriptPage (guint pageNum) = 0;
 
             ///
@@ -248 +293 @@
             const gchar *getCreator (void);
             void setCreator (gchar *creator);
-            const gchar *getPassword (void);
+            const gchar *getPassword (void) const;
             void setPassword (const gchar *password);
             const gchar *getProducer (void);
             void setProducer (gchar *producer);
-            const gchar *getFileName (void);
+            const gchar *getFileName (void) const;
             void setFileName (const gchar *fileName);
             const gchar *getFormat (void);

trunk/src/IPrintView.h

@@ -68 +68 @@
             ///              which page size is.
             ///
-            virtual void addPageSize (const gchar *name, 
+            virtual void addPageSize (const gchar *name,
                                       const gchar *value) = 0;
 
@@ -100 +100 @@
 
             ///
+            /// @brief Gets the page layout.
+            ///
+            /// @return The selected page layout's value.
+            ///
+            virtual PrintPageLayout getPageLayout (void) = 0;
+
+            ///
+            /// @brief Gets the page orientation.
+            ///
+            /// @return The selected page orientation's value.
+            ///
+            virtual PrintPageOrientation getPageOrientation (void) = 0;
+
+            ///
+            /// @brief Gets the entred page range.
+            ///
+            /// @return The entered text in the page range entry.
+            ///
+            virtual const gchar *getPageRange (void) = 0;
+
+            ///
+            /// @brief Gets the currently selected page size.
+            ///
+            /// @return The name of the page size that is selected. This name
+            ///         is the @a value parameter of the addPageSize()
+            ///         function.
+            ///
+            virtual gchar *getPageSize (void) = 0;
+
+            ///
             /// @brief Gets the name of the currently selected printer.
             ///
@@ -109 +139 @@
 
             ///
-            /// @brief Check is the "All Pages" range option is selected.
+            /// @brief Checks if the "Collate" option is checked.
+            ///
+            /// @return TRUE if the "Collate" option is checked.
+            ///         FALSE otherwise.
+            ///
+            virtual gboolean isCheckedCollate (void) = 0;
+
+            ///
+            /// @brief Checks if the "All Pages" range option is selected.
             ///
             /// @return TRUE if the range's "All Pages" option is selected.
@@ -115 +153 @@
             ///
             virtual gboolean isSelectedAllPagesRangeOption (void) = 0;
+
+            ///
+            /// @brief Checks if the "Even Page" set option is selected.
+            ///
+            /// @return TRUE if the set's "Even Page" option is selected.
+            ///         FALSE otherwise.
+            ///
+            virtual gboolean isSelectedEvenPageSet (void) = 0;
+
+            ///
+            /// @brief Checks if the "Odd Page" set option is selected.
+            ///
+            /// @return TRUE if the set's "Odd Page" option is selected.
+            ///         FALSE otherwise.
+            ///
+            virtual gboolean isSelectedOddPageSet (void) = 0;
 
             ///

trunk/src/JobFind.cxx

@@ -227 +227 @@
         GList *result = getDocument ()->findTextInPage (currentPage,
                                                         getTextToFind ());
-        
+
         if ( FIND_DIRECTION_FORWARDS == getDirection () )
         {
@@ -236 +236 @@
             setCurrentPage (currentPage - 1);
         }
-        
+
         if ( NULL != result )
         {
             setResults (currentPage, result);
             JOB_NOTIFIER (job_find_results, this);
-        }        
-        else 
+        }
+        else
         {
             JOB_NOTIFIER (job_find_end, this);

trunk/src/JobLoad.cxx

@@ -286 +286 @@
     job->getDocument ().notifyReload ();
     JOB_NOTIFIER_END();
-    
-    return FALSE;
-}
+
+    return FALSE;
+}

trunk/src/JobSave.h

@@ -23 +23 @@
     // Forward declarations.
     class IDocument;
-   
+
     ///
     /// @class JobSave

trunk/src/MainPter.cxx

@@ -453 +453 @@
 MainPter::printActivated ()
 {
-    PrintPter *print = new PrintPter ();
+    PrintPter *print = new PrintPter (m_Document);
     IPrintView *view = getView ().getPrintView ();
     if ( NULL != view )

trunk/src/Makefile.am

@@ -76 +76 @@
 libepdfview_a_SOURCES +=    \
     IPrintView.h    \
+    JobPrint.cxx    \
+    JobPrint.h  \
     PrintPter.cxx   \
     PrintPter.h

trunk/src/PDFDocument.cxx

@@ -39 +39 @@
 {
     m_Document = NULL;
+    m_PostScript = NULL;
 }
 
@@ -47 +48 @@
 {
     clearCache ();
+    outputPostscriptEnd ();
     if ( NULL != m_Document )
     {
@@ -52 +54 @@
         m_Document = NULL;
     }
+}
+
+IDocument *
+PDFDocument::copy () const
+{
+    // Making a deep copy is just making a new document and loading the same
+    // file.
+    PDFDocument *newDocument = new PDFDocument ();
+    newDocument->loadFile (getFileName (), getPassword (), NULL);
+
+    return newDocument;
 }
 
@@ -474 +487 @@
 }
 
+void
+PDFDocument::outputPostscriptBegin (const gchar *fileName, guint numOfPages,
+                                    gfloat pageWidth, gfloat pageHeight)
+{
+    if ( NULL != m_Document )
+    {
+        if ( NULL != m_PostScript )
+        {
+            outputPostscriptEnd ();
+        }
+        m_PostScript =
+            poppler_ps_file_new (m_Document, fileName, 0, numOfPages);
+        if ( NULL != m_PostScript )
+        {
+            poppler_ps_file_set_paper_size (m_PostScript,
+                                            pageWidth, pageHeight);
+        }
+    }
+}
+
+void
+PDFDocument::outputPostscriptEnd ()
+{
+    if ( NULL != m_PostScript )
+    {
+        poppler_ps_file_free (m_PostScript);
+        m_PostScript = NULL;
+    }
+}
+
+void
+PDFDocument::outputPostscriptPage (guint pageNum)
+{
+    if ( NULL != m_Document && NULL != m_PostScript )
+    {
+        PopplerPage *page = poppler_document_get_page (m_Document, pageNum - 1);
+        if ( NULL != page )
+        {
+            poppler_page_render_to_ps (page, m_PostScript);
+        }
+    }
+}
+
+
 ///
 /// @brief Renders a document's page.

trunk/src/PDFDocument.h

@@ -25 +25 @@
 typedef struct _PopplerLinkMapping PopplerLinkMapping;
 typedef struct _PopplerPage PopplerPage;
+typedef struct _PopplerPSFile PopplerPSFile;
 
 namespace ePDFView 
@@ -40 +41 @@
             ~PDFDocument (void);
 
+            IDocument *copy (void) const;
             GList *findTextInPage (gint pageNum, const gchar *textToFind);
             gboolean isLoaded (void);
             gboolean loadFile (const gchar *filename, const gchar *password, 
                            GError **error);
-            void getPageSizeForPage (gint pageNum, gdouble *width, 
+            void getPageSizeForPage (gint pageNum, gdouble *width,
                                      gdouble *height);
+            void outputPostscriptBegin (const gchar *fileName, guint numOfPages,
+                                        gfloat pageWidth, gfloat pageHeight);
+            void outputPostscriptEnd (void);
+            void outputPostscriptPage (guint pageNum);
+
             DocumentPage *renderPage (gint pageNum);
             gboolean saveFile (const gchar *fileName, GError **error);
@@ -52 +59 @@
             /// The PDF document.
             PopplerDocument *m_Document;
+            /// The output to PostScript.
+            PopplerPSFile *m_PostScript;
 
             IDocumentLink *createDocumentLink (const PopplerLinkMapping *link,

trunk/src/PrintPter.cxx

@@ -32 +32 @@
 };
 
-PrintPter::PrintPter ()
+PrintPter::PrintPter (IDocument *document)
 {
     m_View = NULL;
+    m_Document = document;
 }
 
@@ -102 +103 @@
 PrintPter::printActivated ()
 {
+    IPrintView &view = getView ();
+    // Get the printer's name.
+    char *printerName = view.getSelectedPrinterName ();
+    if ( NULL != printerName )
+    {
+        float pageWidth;
+        float pageHeight;
+        char *pageSizeName = view.getPageSize ();
+        getPageSizeForPrinter (printerName, pageSizeName,
+                               &pageWidth, &pageHeight);
+        g_free (pageSizeName);
+        // Create the new print job.
+        JobPrint *job = new JobPrint ();
+        job->setDocument (m_Document);
+        job->setPrinterName (printerName);
+
+        if ( view.isSelectedAllPagesRangeOption () )
+        {
+            char *pageRange = g_strdup_printf ("1-%d",
+                                               m_Document->getNumPages ());
+            job->setPageRange (pageRange);
+            g_free (pageRange);
+        }
+        else
+        {
+            job->setPageRange (view.getPageRange());
+        }
+
+        if ( view.isSelectedOddPageSet () )
+        {
+            job->setPageSet (PRINT_ODD_PAGE_SET);
+        }
+        else if ( view.isSelectedEvenPageSet () )
+        {
+            job->setPageSet (PRINT_EVEN_PAGE_SET);
+        }
+        else
+        {
+            job->setPageSet (PRINT_ALL_PAGE_SET);
+        }
+        job->setNumberOfCopies (view.getNumberOfCopies ());
+        job->setCollate (view.isCheckedCollate ());
+        job->setPageSize (pageWidth, pageHeight);
+        job->setPageOrientation (view.getPageOrientation ());
+        job->setPageLayout (view.getPageLayout ());
+
+        IJob::enqueue (job);
+
+        g_free (printerName);
+    }
     // Once done, it's the same as canceled :-)
     cancelActivated ();
@@ -137 +188 @@
 }
 
+void
+PrintPter::getPageSizeForPrinter (const gchar *printerName,
+                                  const gchar *pageSizeName,
+                                  float *pageWidth, float *pageHeight)
+{
+    g_assert (NULL != pageWidth && "Tried to save the page width to NULL.");
+    g_assert (NULL != pageHeight && "Tried to save the page height to NULL.");
+
+    // Set the initial value to an A4 page size (size is in 1/72 inches).
+    *pageWidth = 0.1147f;
+    *pageHeight = 0.1624f;
+
+    if ( NULL != printerName )
+    {
+        const gchar *printerPPDName = cupsGetPPD (printerName);
+        if ( NULL != printerPPDName )
+        {
+            ppd_file_t *printerPPD = ppdOpenFile (printerPPDName);
+            if ( NULL != printerPPD )
+            {
+                for ( int currentSize = 0 ;
+                      currentSize < printerPPD->num_sizes ;
+                      ++currentSize )
+                {
+                    ppd_size_t *size = &printerPPD->sizes[currentSize];
+                    if ( 0 == g_ascii_strcasecmp (pageSizeName, size->name) )
+                    {
+                        *pageWidth = size->width;
+                        *pageHeight = size->length;
+                        break;
+                    }
+                }
+                ppdClose (printerPPD);
+            }
+        }
+    }
+}
+
 printerAttributes *
 PrintPter::getPrinterAttributes (const gchar *printerName)

trunk/src/PrintPter.h

@@ -25 +25 @@
 {
     ///
-    /// @enum PrintPageOrientation.
-    ///
-    enum PrintPageOrientation
-    {
-        PRINT_PAGE_ORIENTATION_PORTRAIT,
-        PRINT_PAGE_ORIENTATION_LANDSCAPE
-    };
-
-    ///
-    /// @enum PrintPageLayout
-    ///
-    enum PrintPageLayout
-    {
-        PRINT_PAGE_LAYOUT_PLAIN,
-        PRINT_PAGE_LAYOUT_2IN1,
-        PRINT_PAGE_LAYOUT_4IN1
-    };
-
-    ///
     /// @class PrintPter
     /// @brief Print Presenter.
@@ -50 +31 @@
     {
         public:
-            PrintPter (void);
+            PrintPter (IDocument *document);
             ~PrintPter (void);
 
@@ -63 +44 @@
 
         protected:
+            IDocument *m_Document;
             IPrintView *m_View;
 
+            void getPageSizeForPrinter (const gchar *printerName,
+                                        const gchar *sizeName,
+                                        float *pageWidth, float *pageHeight);
             printerAttributes *getPrinterAttributes (const gchar *printerName);
             void listPrinters (void);

trunk/src/epdfview.h

@@ -38 +38 @@
 #include <JobFind.h>
 #include <JobLoad.h>
+#include <JobPrint.h>
 #include <JobRender.h>
 #include <JobSave.h>

trunk/src/gtk/PrintView.cxx

@@ -172 +172 @@
 }
 
+PrintPageLayout
+PrintView::getPageLayout ()
+{
+    PrintPageLayout layout = PRINT_PAGE_LAYOUT_PLAIN;
+    GtkTreeIter layoutIter;
+    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_LayoutView),
+                                        &layoutIter) )
+    {
+        gtk_tree_model_get (GTK_TREE_MODEL (m_Layout), &layoutIter,
+                            printLayoutValueColumn, &layout,
+                            -1);
+    }
+
+    return layout;
+}
+
+PrintPageOrientation
+PrintView::getPageOrientation ()
+{
+    PrintPageOrientation orientation = PRINT_PAGE_ORIENTATION_PORTRAIT;
+    GtkTreeIter orientationIter;
+    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_OrientationView),
+                                        &orientationIter) )
+    {
+        gtk_tree_model_get (GTK_TREE_MODEL (m_Orientation), &orientationIter,
+                            printOrientationValueColumn, &orientation,
+                            -1);
+    }
+    return orientation;
+}
+
+const gchar *
+PrintView::getPageRange ()
+{
+    return gtk_entry_get_text (GTK_ENTRY (m_PageRange));
+}
+
+gchar *
+PrintView::getPageSize ()
+{
+    gchar *pageSize = NULL;
+    GtkTreeIter pageSizeIter;
+    if ( gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_PageSizeView),
+                                        &pageSizeIter) )
+    {
+        gtk_tree_model_get (GTK_TREE_MODEL (m_PageSize), &pageSizeIter,
+                            pageSizeValueColumn, &pageSize,
+                            -1);
+    }
+    return pageSize;
+}
+
 gchar *
 PrintView::getSelectedPrinterName ()
@@ -192 +244 @@
 
 gboolean
+PrintView::isCheckedCollate ()
+{
+    return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_Collate));
+}
+
+gboolean
 PrintView::isSelectedAllPagesRangeOption ()
 {
     return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_AllPagesRangeOption));
+}
+
+gboolean
+PrintView::isSelectedEvenPageSet ()
+{
+    return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_EvenPageSet));
+}
+
+gboolean
+PrintView::isSelectedOddPageSet ()
+{
+    return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_OddPageSet));
 }
 
@@ -299 +369 @@
         gtk_radio_button_new_with_mnemonic (NULL, _("A_ll pages"));
     gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), allPageSetRadio);
-    GtkWidget *oddPageSetRadio =
+    m_OddPageSet =
         gtk_radio_button_new_with_mnemonic_from_widget (
                 GTK_RADIO_BUTTON (allPageSetRadio), _("O_dd pages"));
-    gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), oddPageSetRadio);
-    GtkWidget *evenPageSetRadio =
+    gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), m_OddPageSet);
+    m_EvenPageSet =
         gtk_radio_button_new_with_mnemonic_from_widget (
                 GTK_RADIO_BUTTON (allPageSetRadio), _("_Even pages"));
-    gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), evenPageSetRadio);
+    gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), m_EvenPageSet);
 
     // Copies frame