Changeset 42

Timestamp:

01/06/09 16:35:52 (3 years ago)

Author:

mirko

Message:

Removed --transition switch in favor of reading
transitions from the PDF file. Added a dialog to open files when
no file is given on the command line (this is so the first "GUI"
version of PDFCube).

Less 3D transition animation emphasis.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• src/pdfcube.cc (modified) (8 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-01-06  Mirko Maischberger  <mirko.maischberger@gmail.com>
+        * src/pdfcube.cc: Removed --transition switch in favor of reading
+        transitions from the PDF file. Added a dialog to open files when
+        no file is given on the command line (this is so the first "GUI"
+        version of PDFCube)
+        
 2008-11-23  Mirko Maischberger  <mirko.maischberger@gmail.com>
         * man/: moved pdfcube.1 manpage inside man folder.

trunk/src/pdfcube.cc

@@ -61 +61 @@
 #define DEFAULT_TITLE  "PDFCube"
 #define N_FRAMES 30
-#define TIMEOUT_INTERVAL 38
+#define TIMEOUT_INTERVAL 25
 
 //////////////////////////////////////////////////////////////////////////
@@ -99 +99 @@
 static GLfloat clear_color[4] = { 0.6, 0.0, 0.0, 0.0 };
 static GLfloat top_color[4] = { 0.7, 0.6, 0.6, 0.0 };
-static double animation_emphasis = 3.0;
+static double animation_emphasis = 2.4;
 
 static bool
@@ -1039 +1039 @@
     poppler_page_get_size(page, &w, &h);
     poppler_page_render_to_pixbuf(page, 0, 0, iWidth, iHeight,
-                                  1.0 * iWidth / w, 0, pm);
+                                  ((double)iWidth)/w, 0, pm);
   }
 
@@ -1541 +1541 @@
         g_print("Advance key\n");
 #endif
-        if (page_transition[pc->page()]and sleeping())
+        if (page_transition[(pc->page()+1)%pc->pages()] and sleeping())
           start_animation(widget, CUBE_NEXT);
         else if (sleeping())
@@ -1869 +1869 @@
     ("top-color,t", po::value<std::string>(),
      "Cube top color in 'r:g:b' format again with reals in [0,1].")
-    ("transitions,c", po::value<std::vector<int> >()->multitoken(), 
-     "Pages at wich to do a cube transition by default eg. 2 4 7\nMust be the last option on the command line.")
     ("input-file,i", po::value<std::string>(), "PDF file to show.")
     ("no-fullscreen,n", 
@@ -1893 +1891 @@
     cout << endl;
     cout << "Usage examples:" << endl;
+    cout << "  $ pdfcube" << endl;
     cout << "  $ pdfcube presentation.pdf" << endl;
-    cout << "  $ pdfcube presentation.pdf --bgcolor 0:0:0 --top-color 0.6:0.2:0.2 --transitions 1 5 7"
-         << endl 
-         << "  (floating point numbers are locale aware on some C libraries)"
-         << endl << endl << endl;
+    cout << 
+      "  $ pdfcube presentation.pdf --bgcolor 0:0:0 --top-color 0.6:0.2:0.2" <<
+      endl << endl <<
+      "  The \"Box\" transition present in PDF files is rendered as a 3D cube." 
+         <<
+      endl <<
+      "  (e.g in beamer you can use the \\transboxin command)" <<
+      endl << endl <<
+      "  If no file is given on the command line a file open dialog is shown." 
+         <<
+      endl << endl <<
+      "  NB: floating point numbers are locale aware on some C libraries." <<
+      endl << endl << endl;
     return 0;
   }
@@ -1967 +1975 @@
 
   if (document == NULL) {
-    perror("Invaild PDF file.");
+    cerr << "Invaild PDF file." << endl;
     exit(1);
   }
@@ -1973 +1981 @@
   pc = new pdfcube(document);
 
+  // Read transitions form PDF file
   page_transition = new bool[pc->pages()];
-  std::fill(&page_transition[0], &page_transition[pc->pages()], false);
-  if(vm.count("transitions")) {
-    vector<int> tr = vm["transitions"].as<std::vector<int> >();
-    for (std::vector<int>::iterator ii = tr.begin(); ii != tr.end(); ++ii) {
-      if(*ii > pc->pages() || *ii < 1) 
+  for(int ii(0); ii != pc->pages(); ++ii)
+    {
+      PopplerPage* page = 
+        poppler_document_get_page(document, ii);
+      PopplerPageTransition* transition = 
+        poppler_page_get_transition(page);
+      if(!transition) 
         {
-          cerr << "Transision after end of file." << endl;
+          page_transition[ii] = false;
         }
       else
         {
-          page_transition[*ii-1] = true;
-#ifndef NDEBUG
-          cerr << "Transision at: " << (*ii-1) << endl;
-#endif
+          switch(transition->type)
+            {
+            case POPPLER_PAGE_TRANSITION_REPLACE:
+              page_transition[ii] = false;
+              break;
+            case POPPLER_PAGE_TRANSITION_BOX:
+              page_transition[ii] = true;
+              break;
+            default:
+              cerr << "Unsuported transition type (" << transition->type 
+                   << ") at page " << (ii+1) << endl;
+              break;
+            }
         }
     }
-  }
-
+  
   /* Create and show the application window. */
   window = create_window(glconfig);