Merge lp:~firgeis/pantheon-print/image-support into lp:~elementary-apps/pantheon-print/trunk

[Ezequiel Lewin]

Support for image printing. If the image is larger than set page, it will scale to fit

[kay van der Zander (kay20)]

Hey thanks for your time to fix the bug.
Please forgive me if the comments are hars. They are only ment for positive building critisism.

Please fix the comments then i will review it again. If it satificed it will be approved

review: Needs Fixing

[Danielle Foré (danrabbit)]

Rejecting since it seems to be abandoned

Unmerged revisions

11. By Ezequiel Lewin on 2015-01-24

Support for image printing

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-15 14:43:29 +0000
+++ CMakeLists.txt	2015-01-24 01:24:48 +0000
@@ -35,5 +35,8 @@
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/ -g --save-temps
 )
 add_executable (pantheon-print ${VALA_C})
+find_library (M_LIB m)
+target_link_libraries (pantheon-print ${M_LIB})
+
 install(TARGETS pantheon-print RUNTIME DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/print.contract DESTINATION share/contractor)

=== modified file 'src/pantheon-print.vala'
--- src/pantheon-print.vala	2014-08-06 07:58:36 +0000
+++ src/pantheon-print.vala	2015-01-24 01:24:48 +0000
@@ -17,6 +17,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
+using Gdk;
+using GLib.Math;
 
 public class CustomOperation : Gtk.PrintOperation {        
     const int FONT_SIZE = 12;
@@ -28,11 +30,33 @@
     int height;
     int width;
     int line_count;
-
-    public CustomOperation (string[] args, Gtk.Window main_window) {        
-        var file = File.new_for_commandline_arg (args[1]);  
-
-        if (file.query_exists ()) {
+    Pixbuf pixbuf;
+
+    public CustomOperation (string[] args, Gtk.Window main_window) {   
+        File file = null;   
+
+        try {  
+            file = File.new_for_commandline_arg (args[1]);  
+        } catch (Error e) {
+            error ("%s", e.message);
+        }
+
+
+        if (!file.query_exists ()) {
+            return;
+        }
+        
+        //We will check for an image first, if not we will assume text
+        try {
+            this.pixbuf = new Pixbuf.from_file (file.get_path ());
+        } catch (Error e) {
+
+        }
+        
+        bool is_image = (pixbuf == null) ? false : true;
+        
+        
+        if (!is_image) {
             try {
                 var dis = new DataInputStream (file.read ());
                 string line;
@@ -51,9 +75,17 @@
         setup.set_bottom_margin (15, Gtk.Unit.MM);
         setup.set_right_margin (20, Gtk.Unit.MM);
         setup.set_left_margin (20, Gtk.Unit.MM);
-        set_default_page_setup (setup);        
-    	begin_print.connect (beginprint);              
-    	draw_page.connect (drawpage);
+        set_default_page_setup (setup);
+        
+        if (is_image) {
+        	begin_print.connect (beginprint_image);              
+        	draw_page.connect (drawpage_image);
+        }
+        else {
+        	begin_print.connect (beginprint);              
+        	draw_page.connect (drawpage);
+        }
+
     }
 
     void beginprint (Gtk.PrintContext print_context) {
@@ -121,6 +153,42 @@
         }
     }
 
+    void beginprint_image (Gtk.PrintContext print_context) {
+ 
+        height = (int)print_context.get_height ();        
+        width = (int)print_context.get_width ();
+
+        set_n_pages (1);
+    }
+
+    void drawpage_image(Gtk.PrintContext print_context, int page_num) {
+        context = print_context.get_cairo_context ();
+        context.set_source_rgb (0, 0, 0);  
+        
+        //We will fit the image to the page
+        double scale = 1;
+
+        if (pixbuf.width > width) {
+            scale -= (1.0 - ((double)width / (double)pixbuf.width));    
+        }       
+
+        if (pixbuf.height * scale > height) {
+            scale -= (1.0 - ((double)height / (pixbuf.height * scale)));
+        }
+
+        if (scale < 1) {
+            int dest_width = int.parse (GLib.Math.round (pixbuf.width * scale).to_string ());
+            int dest_height = int.parse (GLib.Math.round (pixbuf.height * scale).to_string ());
+        
+            pixbuf = pixbuf.scale_simple(dest_width, dest_height, InterpType.BILINEAR);    
+        }
+
+        cairo_set_source_pixbuf (context, pixbuf, 0, 0);
+
+        context.rectangle(0, 0, pixbuf.get_width (), pixbuf.get_height ());
+        context.fill ();
+    }
+
 }
 
 public static void main (string[] args) {
@@ -129,4 +197,4 @@
   	var operation = new CustomOperation (args, main_window);
 
   	operation.run (Gtk.PrintOperationAction.PRINT_DIALOG, main_window);
-}
\ No newline at end of file
+}