Changeset 2661 for extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm

Timestamp:

Oct 5, 2008, 12:31:42 AM (16 years ago)

Author:

ronosman

Message:

• remove Save and Cancel buttons from properties panels. Use callbacks instead.
• limit Global settings panel instances to one.
• fix resize crash with huge images. use Wx::Image methods when IM fails.
• add categories is implemented in tree control. right click popup menu with Add an Refresh commands.

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxApp.pm (modified) (8 diffs)

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

@@ -27 +27 @@
              wxBITMAP_TYPE_PNG 
              wxBITMAP_TYPE_JPEG
+             wxIMAGE_QUALITY_NORMAL
+             wxIMAGE_QUALITY_HIGH
              wxSPLASH_CENTRE_ON_SCREEN 
              wxSPLASH_TIMEOUT
@@ -168 +170 @@
         eval {
             $stored_imagelist = retrieve $self->storable_file;
-            $stored_imagelist->{images_h} = {};
         };
         if($@){
+            Wx::LogMessage(
+                "An error has occured. Can not read %s\n%s",
+                $self->storable_file,
+                $@
+            );
             $stored_imagelist = $self->_default_imagelist_params ;
         }
@@ -183 +189 @@
         )
     );
+
+    $self->imagelist->ResizeCallback(
+        sub { $self->ResizeImage(@_) }
+    );
 }
 
@@ -191 +201 @@
     my $params = {
         thumb_size       => 120,
-        site_thumb_dir        => $self->thumb_dir,
+        site_thumb_dir   => $self->thumb_dir,
         wx_thumb_size    => 120,
         wx_thumb_dir     => $self->wx_thumb_dir,
@@ -198 +208 @@
         resize_w         => 800,
         resize_h         => 600,
-        site_resized_dir      => $self->resized_dir,
+        site_resized_dir => $self->resized_dir,
         type             => 'jpg',
         filter           => 'Lanczos',
-        blur             => 1,
-        quality          => 90,
+        blur             => 0.9,
+        quality          => 100,
         prefix           => 'TN',
         count            => 0,
         storable_file    => $self->storable_file,
         images           => [],
-        images_h         => {},
         userdata_dir     => $self->userdata_dir,
         default_name_prefix => 'Photo',
         upload_rejects  =>  [],
+        ResizeCallback  => sub { $self->ResizeImage(@_) },
     };
 
@@ -254 +264 @@
         )
     );
-    printf(
-        "conf file %s\n",
-        $self->conf_file
-    );
+
     
 
@@ -326 +333 @@
 }
 
+
+sub ResizeImage {
+    my ( $self, $image_file, $image_file_out, $type, $ratio, $width, $height, $quality ) = @_;
+   
+
+    my $image = Wx::Image->new(
+            $image_file, 
+            $self->GetWxBitmapType($type),
+            0
+    );
+    
+    my $w;
+    my $h;
+
+    my $img_w = $image->GetWidth;
+    my $img_h = $image->GetHeight;
+    
+    # use a ratio ( 25% default ) if defined
+    # default ratio is used for preview.
+    if($ratio){
+        $w = $ratio*$img_w/100 ;
+        $h = $ratio*$img_h/100 ;
+    }
+    # use specified width and height
+    else{
+        # portrait
+        if( $img_w < $img_h ){
+            $w = $height;
+        }
+        else{
+            $w = $width;
+        }
+        # to respect aspect ratio
+        $h = sprintf(
+            "%.0f",
+            ($w*$img_h)/$img_w
+        );
+    }
+
+    $image->Rescale(
+        $w,
+        $h,
+        wxIMAGE_QUALITY_HIGH
+    );
+    
+    $quality ||= 90;
+    
+    $image->SetOption( 
+        "quality", 
+        $quality 
+    );
+    
+    if(!$image->SaveFile(
+        $image_file_out,
+        $self->GetWxBitmapType($type),
+    )){
+        Wx::LogMessage(
+            "An error has occured. Can not save file %s",
+            $image_file_out,
+        )
+    };
+}
 
 sub _init_frame {
@@ -363 +432 @@
             width     => $w,
             height    => $h,
-            title     => "pLoader - Piwigo uploader - [$url]" ,
+            title     => "pLoader - Piwigo uploader 1.0 RC2 - [$url]" ,
             pwg       => $self->pwg,
             imagelist => $self->imagelist,