Changeset 50 for branches

Timestamp:

01/22/09 22:43:20 (3 years ago)

Author:

mirko

Message:

A decent index page with clutter, experimental branch

Location:

branches/clutter-experiments

Files:

• main.cc (modified) (4 diffs)
• page.hh (modified) (3 diffs)

branches/clutter-experiments/main.cc

@@ -29 +29 @@
   clutter_event_get_coords (event, &x, &y);
   g_print ("Stage clicked at (%d, %d)\n", x, y);
+  // clutter cluttered my first draw, so redraw on click to allow testing.
+  clutter_actor_queue_redraw(CLUTTER_ACTOR(stage));
   return TRUE; /* Stop further handling of this event. */
 }
@@ -103 +105 @@
 int main(int argc, char* argv[])
 {
+  // --------------
+  // Initialization
+  // --------------
+
   PopplerDocument* pdoc;
   GError        *error = NULL; 
@@ -133 +139 @@
   clutter_color_parse("DarkRed", &stage_color);
   clutter_stage_set_color(CLUTTER_STAGE(stage), &stage_color);
-
+  
   // poppler needs an URI (e.g. file:///....)
   pdoc = poppler_document_new_from_file(*pdfcube_filename, NULL, NULL);
@@ -144 +150 @@
   pdfcube::document doc(pdoc);
   
+  // ----------------------------------------------
+  // render low res version of all pages
+  // TODO: show fancy progress bar in the meantime.
+  // ----------------------------------------------
+  for(int ii(0); ii != doc.n_pages(); ++ii)
+    doc.page(ii).render(pdfcube::page::LOW_RES);
+
+
+  // --------------------------
+  // arrange pages in an index
+  // TODO: move in an animation
+  // --------------------------
   guint screen_w = 0;
   guint screen_h = 0;
   clutter_stage_fullscreen (CLUTTER_STAGE (stage));
   clutter_actor_get_size(CLUTTER_ACTOR(stage), &screen_w, &screen_h);
-  int padding = 6;
-
-  // render low res version of all pages
-  // TODO: show fancy progress bar in the meantime.
+
+  double frows = ::sqrt(doc.n_pages());
+  double fcols = std::ceil(((double)doc.n_pages())/std::floor(frows));
+
+  int cols = std::floor(fcols);
+  int rows = frows;
+
+  double box_w = ((double)screen_w)/cols;
+  double box_h = ((double)screen_h)/rows;
+  double min_padding = 6;
+
   for(int ii(0); ii != doc.n_pages(); ++ii)
     {
-      int rows = 1+(int)::sqrt(doc.n_pages());
-      int row = ii%rows;
-      int col = ii/rows;
-      cerr << "row: " << row << " col: " << col << endl;
-      doc.page(ii).render(pdfcube::page::LOW_RES);
+      int row = ii%cols;
+      int col = ii/cols;
+      double box_x = ((double)row*screen_w)/cols;
+      double box_y = ((double)col*screen_h)/rows;
+
+      double aspect = doc.page(ii).aspect_ratio();
+      
+      double w = 0.0, h = 0.0;
+      
+      // Check if our slot ratio is less or more than owr own
+      if(box_h > box_w/aspect)
+        {
+          w = box_w - min_padding*2;
+          h = w/aspect;
+        }
+      else 
+        {
+          h = box_h - min_padding*2;
+          w = h*aspect;
+        }
+      
+      double padding_x = (box_w - w)/2;
+      double padding_y = (box_h - h)/2;
+
+      cerr << w << ", " << h << ", " << aspect << endl;
+
       ClutterActor* page = 
         CLUTTER_ACTOR(doc.page(ii).actor(pdfcube::page::LOW_RES));
-      clutter_actor_set_x
-        (page, (int)((double)row*screen_w)/rows + padding/2);
-      clutter_actor_set_y
-        (page, (int)((double)col*screen_h)/rows + padding/2);
-      clutter_actor_set_size
-        (page, 
-         (int)((double)screen_w)/rows - padding,
-         (int)((double)screen_h)/rows - padding) ;
+      guint sx, sy;
+      clutter_actor_get_size(page, &sx, &sy);
+      cerr << sx << ", " << sy << endl;
+
+      clutter_actor_set_position(page, 
+                                 (int)(box_x + padding_x),
+                                 (int)(box_y + padding_y));
+      clutter_actor_set_size(page, (int)w, (int)h);
       clutter_group_add_many(CLUTTER_GROUP(stage), page, NULL);
     }
+
+  // -------------------------
 
   /* Connect a signal handler to handle mouse clicks and key presses

branches/clutter-experiments/page.hh

@@ -46 +46 @@
     { }
     
+    double
+    aspect_ratio()
+    {
+      double w, h;
+      poppler_page_get_size(poppler_page_m, &w, &h);
+      return w/h;
+    }
+
+    std::pair<double, double>
+    size()
+    {
+      double w, h;
+      poppler_page_get_size(poppler_page_m, &w, &h);
+      return std::make_pair(w,h);
+    }
+    
     enum rendering_mode { LOW_RES, HI_RES };
     
@@ -58 +74 @@
         case LOW_RES:
           {
-            double w, h;
+            int w,h;
+            // we assume 4/3 aspect monitor can do better
+            double box_w = 320;
+            double box_h = 240;
+            double aspect = aspect_ratio();
+            // Check if our slot ratio is less or more than owr own
+            if(box_h > box_w/aspect)
+              {
+                w = box_w;
+                h = w/aspect;
+              }
+            else 
+              {
+                h = box_h;
+                w = h*aspect;
+              }
+
             GdkPixbuf* buffer = NULL;
-            poppler_page_get_size(poppler_page_m, &w, &h);
-            g_print("Page %f by %f\n", w, h);
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 320, 240);
+            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
                                           0, 
-                                          320, 
-                                          240, 
-                                          240.0f/h, 
+                                          w, 
+                                          h, 
+                                          ((double)h)/size().second, 
                                           0, 
                                           buffer);
@@ -87 +117 @@
         case HI_RES:
           {
-            double w, h;
+            int w, h;
+            // we assume 4/3 aspect monitor can do better
+            double box_w = 1600;
+            double box_h = 1200;
+            double aspect = aspect_ratio();
+            // Check if our slot ratio is less or more than owr own
+            if(box_h > box_w/aspect)
+              {
+                w = box_w;
+                h = w/aspect;
+              }
+            else 
+              {
+                h = box_h;
+                w = h*aspect;
+              }
             GdkPixbuf* buffer = NULL;
-            poppler_page_get_size(poppler_page_m, &w, &h);
-            g_print("Page is %f by %f\n", w, h);
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 1600, 1200);
+            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
                                           0, 
-                                          1600, 
-                                          1200, 
-                                          1200.0f/h, 
+                                          w, 
+                                          h, 
+                                          ((double)h)/size().second, 
                                           0, 
                                           buffer);