Changeset 4422

Timestamp:

Dec 4, 2009, 10:30:31 AM (14 years ago)

Author:

ronosman

Message:

Feature 1055 added : preparation of high definition images ( HD ).

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (2 diffs)
• src/Uploader/GUI/wxApp.pm (modified) (5 diffs)
• src/Uploader/GUI/wxFrameAUI.pm (modified) (10 diffs)
• src/Uploader/ImageList.pm (modified) (10 diffs)
• src/Uploader/PWG/WebServices.pm (modified) (1 diff)

extensions/pLoader/trunk/locale/fr_FR/pLoader.po

@@ -27 +27 @@
 
 msgid "Site thumbnail size :"
-msgstr "Taille des miniature :"
+msgstr "Taille des miniatures :"
 
 msgid "Site image width :"
@@ -508 +508 @@
 msgid "errors"
 msgstr "erreurs"
+
+msgid "Yes, use HD resized of the original photo"
+msgstr "Oui, utiliser une réduction HD de la photo originale"
+
+msgid "Yes, use a copy of the original photo"
+msgstr "Oui, utiliser une copie de la photo originale"
+
+msgid "HD image width :"
+msgstr "Largeur de l'image HD :"
+
+msgid "HD image height :"
+msgstr "Hauteur de l'image HD :"
+
+msgid "HD image jpeg quality :"
+msgstr "Qualité jpeg de l'image HD :"
+
+msgid "HD image filter :"
+msgstr "Filtre de réduction de l'image HD :"
+
+msgid "HD image blur :"
+msgstr "Accentuation/flou de l'image HD :"
+
+msgid "HD image interlace :"
+msgstr "Entrelacement de l'image HD :"

extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -109 +109 @@
           default_photo_names
           eng_default_photo_names
+                  upload_hd
+                  eng_upload_hd
       / 
 );
@@ -130 +132 @@
     # to check if we can use stored cache
     $self->imagelist_version(
-        '8'
+        '9'
     );
 
@@ -269 +271 @@
         }
     );
-
+        
+        $self->upload_hd(
+            [
+                    'No',
+                        'Yes, use HD resized of the original photo',
+                        'Yes, use a copy of the original photo',
+                ]
+        );
+
+    $self->eng_upload_hd(
+        {
+             map { gettext($_) => $_ } @{$self->upload_hd} 
+        }
+    );
+        
     $self->default_photo_names(
         [
@@ -460 +476 @@
     my $params = {
         new_files        => [],
+        hd_filter        => 'Lanczos',
+        hd_blur          => 0.9,
+        hd_quality       => 95,
+        hd_w             => 1600,
+        hd_h             => 1200,
+        hd_interlace     => 'Line',
         thumb_size       => 120,
         site_thumb_dir   => $self->thumb_dir,
@@ -474 +496 @@
         th_quality       => 90,
         auto_rotate      => 1,
+                upload_hd        => 'No',
         remove_uploaded_from_selection => 1,
         interlace        => 'Line',

extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

@@ -106 +106 @@
           resized_settings_panel
           thumbnail_settings_panel
+                  hd_settings_panel
           advanced_settings_panel
           watermark_settings_panel
@@ -113 +114 @@
           resized_settings
           thumbnail_settings
+                  hd_settings
           advanced_settings
           watermark_settings
@@ -391 +393 @@
             },
             {
-                label     => gettext("Upload high (original size) :"),
-                type      => 'Bool',
-                value   => sub { $self->imagelist->upload_high(@_) },
+                label     => gettext("Upload high definition  :"),
+                type      => 'Choice',
+                choice  => [
+                               map { gettext $_ } @{wxTheApp->upload_hd}
+                           ],
+                pre_process => sub { my ( $value ) = @_; wxTheApp->eng_upload_hd->{$value} },
+                value   => sub { $self->imagelist->upload_hd(@_) },
             },
             {
@@ -440 +446 @@
     );
 
+    $self->hd_settings(
+        [
+            {
+                label     => gettext("HD image width :"),
+                type      => 'Number',
+                value   => sub { $self->imagelist->hd_w(@_) },
+            },
+            {
+                label     => gettext("HD image height :"),
+                type      => 'Number',
+                value   => sub { $self->imagelist->hd_h(@_) },
+            },
+            {
+                label     => gettext("HD image jpeg quality :"),
+                type      => 'Number',
+                value   => sub { $self->imagelist->hd_quality(@_) },
+            },
+            {
+                label     => gettext("HD image filter :"),
+                type      => 'Choice',
+                value   => sub { $self->imagelist->hd_filter(@_) },
+                choice    => [ qw/Point Box Triangle Hermite Hanning Hamming Blackman Gaussian Quadratic Cubic Catrom Mitchell Lanczos Bessel Sinc/ ],
+            },
+            {
+                label     => gettext("HD image blur :"),
+                type      => 'Float',
+                value   => sub { $self->imagelist->hd_blur(@_) },
+            },
+            {
+                label     => gettext("HD image interlace :"),
+                type      => 'Choice',
+                value   => sub { $self->imagelist->hd_interlace(@_) },
+                choice    => [ qw/None Line Plane Partition JPEG GIF PNG/ ],
+            },
+        ]    
+    );
+        
     $self->thumbnail_settings(
         [
@@ -465 +508 @@
     );
     
-#    $self->preview_settings(
-#        [
-#            {
-#                label     => gettext("Use exif preview when available :"),
-#                type      => 'Bool',
-#                value  => sub { $self->imagelist->use_exif_preview(@_) },
-#            },
-#            {
-#                label     => gettext("Custom preview ratio :"),
-#                type      => 'Number',
-#                value  => sub { $self->imagelist->preview_ratio(@_) },
-#            },
-#        ]    
-#    );
 
     $self->advanced_settings(
@@ -584 +613 @@
         $self->resized_settings_panel,
         $self->thumbnail_settings_panel,
+        $self->hd_settings_panel,
         $self->advanced_settings_panel,
         $self->watermark_settings_panel,
@@ -655 +685 @@
     );    
 
-    #$self->preview_settings_panel->properties(
-    #    $self->preview_settings,
-    #);    
+    $self->hd_settings_panel->properties(
+        $self->hd_settings,
+    );    
 
     $self->advanced_settings_panel->properties(
@@ -715 +745 @@
                 parentwnd       => $self,
                 properties      => $self->thumbnail_settings,
-
             }
         )    
     );    
-    #$self->preview_settings_panel(
-    #    Uploader::GUI::wxPropertyGridPanel->new( 
-    #        { 
-    #            parentwnd       => $self,
-    #            properties      => $self->preview_settings,
-
-    #        }
-    #    )    
-    #);    
+    $self->hd_settings_panel(
+        Uploader::GUI::wxPropertyGridPanel->new( 
+            { 
+                parentwnd       => $self,
+                properties      => $self->hd_settings,
+            }
+        )    
+    );    
 
     $self->watermark_settings_panel(
@@ -743 +771 @@
                 parentwnd       => $self,
                 properties      => $self->advanced_settings,
-
             }
         )    
@@ -1050 +1077 @@
             gettext("Thumbnail"),
         ],
-#        [
-#            $self->preview_settings_panel, 
-#            gettext("Preview"),
-#        ],
+        [
+            $self->hd_settings_panel, 
+            gettext("HD"),
+        ],
         [
             $self->watermark_settings_panel,

extensions/pLoader/trunk/src/Uploader/ImageList.pm

@@ -43 +43 @@
                 blur
                 quality
+                resize_w
+                resize_h
+                hd_filter
+                hd_blur
+                hd_quality
+                hd_w
+                hd_h
+                                hd_interlace
                 prefix
                 author
                 count
-                resize_w
-                resize_h
                 new_files
                 storable_file
@@ -80 +86 @@
                 pwg
                 upload_high
+                                upload_hd
                 remove_uploaded_from_selection
                 wx_quality
@@ -721 +728 @@
                 resize_w
                 resize_h
+                hd_filter
+                hd_blur
+                hd_quality
+                hd_w
+                hd_h
+                                hd_interlace
                 new_files
                 storable_file
@@ -734 +747 @@
                 default_name_prefix
                 upload_high
+                                upload_hd
                 remove_uploaded_from_selection
                 auto_rotate
@@ -829 +843 @@
     }
 
+        my $decode = {
+        'No' => 0,
+            'Yes, use HD resized of the original photo' => 'HD',
+            'Yes, use a copy of the original photo' => 'ORIGINAL',
+    };  
+
+        $self->upload_high(
+            $decode->{$self->upload_hd}
+        );
+        
     # if upload high, rotate a copy of original file
     if($self->upload_high){
@@ -1051 +1075 @@
     my ( $self ) = @_;
 
+printf("CreateHigh %s\n", $self->upload_high);
     my $bModifyOriginal;
     my $bRotate;
     my $bAddWatermark;
+        my $bResize;
     my $orientation = $self->current_image->exif_metadata->{Orientation};
+        my $degrees;
     
     # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
@@ -1060 +1087 @@
         $bModifyOriginal = 1;
         $bRotate = 1;
+                $degrees = $1;
     }
 
@@ -1066 +1094 @@
         $bAddWatermark = 1;
     }
+        
+        # HD resize
+        if('HD' eq $self->upload_high){
+        $bModifyOriginal = 1;
+        $bResize = 1;
+        }
 
     if($bModifyOriginal){
@@ -1077 +1111 @@
         warn "$status ", $self->current_image->file, "\n" if $status ;
         return 0 if $status;
-
+        if($bResize){
+            $status = $image->Resize(
+                geometry => sprintf("%sx%s>", $self->hd_w, $self->hd_h), 
+                filter => sprintf("%s", $self->hd_filter), 
+                blur => $self->hd_blur
+            );
+            warn "$status" if $status ;
+            return 0 if $status;
+        }
+        
+        printf("resize with quality value %s\n", $self->quality);
+        $status = $image->Set(quality=>$self->quality);
+        warn "$status" if $status ;
+
+        $status = $image->Set(interlace=>$self->interlace);
+        warn "$status" if $status ;
+                
         if($bRotate){
-            $image->Rotate( degrees=>$1 );      
+            $image->Rotate( degrees=>$degrees );        
         }        
         $image->Write(
@@ -1134 +1184 @@
         my ( $filename, $ext ) = split /\./, $file ;
     
-        # high_file is a copy of original
+        # high_file is a resized of original
         $self->current_image->site_high_file( 
             File::Spec->catfile(

extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -307 +307 @@
                 $status_line = $high_params->{message};
                 last if !$high_params->{ok};
+                                # high is a HD resized copy of original
+                                $form->{high_sum} = $self->sum_high_file;
             }
             $doubleCheck = 1;