Changeset 2728 for extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

Timestamp:

Oct 12, 2008, 9:16:39 PM (16 years ago)

Author:

ronosman

Message:

Feature added : auto rotate image using exif metadata
Feature added : upload in high resolution
Improved user feedback in upload progress dialog

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm (modified) (3 diffs)

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

@@ -151 +151 @@
 
 
-    # callback for GUI refresh : progress dialog display current uploaded image 
-    $self->imagelist->UploadImagesProgressCallback(
-        sub { $self->UploadImagesProgress(@_) }
-    );
-    
-    $self->imagelist->UploadDisplayEndInfoCallback(
+    # callback for GUI refresh : progress dialog display current uploaded image
+    $self->imagelist->progress_thumbnail_refresh(
+        sub { $self->UploadProgressThumbnailRefresh(@_) }
+    );
+
+    $self->imagelist->progress_msg_refresh(
+        sub { $self->UploadProgressMessageRefresh(@_) }
+    );
+
+
+    $self->imagelist->progressbar_refresh(
+        sub { $self->UploadProgressBarRefresh(@_) }
+    );
+    
+    $self->imagelist->progress_endinfo_refresh(
         sub { $self->UploadDisplayEndInfo(@_) }
     );
@@ -786 +795 @@
 }
 
-# display uploaded image in progress dlg
-sub UploadImagesProgress {
+sub UploadProgressMessageRefresh {
+    my ( $self, $msg ) = @_;    
+
+    $self->upload_progressdlg->processing(
+        $msg   
+    );  
+
+    Wx::Yield();
+}
+
+sub UploadProgressThumbnailRefresh {
     my ( $self ) = @_;  
-    
+
     my $imagelist = $self->imagelist ;
 
-    my ( $vol, $dir, $file ) = File::Spec->splitpath($imagelist->current_image->file);
-
-    $self->upload_progressdlg->processing(
-        sprintf(
-            $imagelist->progress_msg, 
-            $imagelist->current_image->site_name,
-            $file,
+ 
+    $self->upload_progressdlg->image->SetBitmap(wxNullBitmap);
+    $self->upload_progressdlg->image->SetBitmap(
+        Wx::Bitmap->new( 
+            $self->imagelist->current_image->wx_thumb_file, 
+            $self->GetWxBitmapType($self->imagelist->type), 
         )
     );
+
+    Wx::Yield();
+}
+
+sub UploadProgressBarRefresh {
+    my ( $self, $ratio ) = @_;  
+
     eval {
-        $self->upload_progressdlg->image->SetBitmap(wxNullBitmap);
-        $self->upload_progressdlg->image->SetBitmap(
-            Wx::Bitmap->new( 
-                $self->imagelist->current_image->wx_thumb_file, 
-                $self->GetWxBitmapType($self->imagelist->type), 
-            )
-        );
         $self->upload_progressdlg->progress(
-            $imagelist->count * ( 100/scalar @{$imagelist->image_selection} )
+            $ratio*$self->imagelist->count * ( 100/scalar @{$self->imagelist->image_selection} )
         );
         $self->upload_progressdlg->LogProgress();
     };
-    if($@){
-        croak "Upload cancelled.\n";
-    }
-    
+    croak "Upload cancelled" if $@;
+
     Wx::Yield();
-
-}
-
+}
 
 sub SetNewFilesDisplayEndInfo {
@@ -830 +843 @@
 
 sub UploadDisplayEndInfo {
-    my ( $self ) = @_;  
+    my ( $self, $msg ) = @_;    
     
     my $imagelist = $self->imagelist ;
     
-    $self->upload_progressdlg->DisplayEndInfo;
+    $self->upload_progressdlg->DisplayEndInfo($msg);
 }