Changeset 2730

Timestamp:

Oct 13, 2008, 7:35:21 PM (16 years ago)

Author:

ronosman

Message:

Feature added: improved user feedback at the end of image processing.
Bug fixed : rotate resized images only once when images are uploaded several times.

Location:

extras/pLoader/trunk/src/Uploader

Files:

• GUI/wxFrameAUI.pm (modified) (1 diff)
• ImageList.pm (modified) (8 diffs)
• PWG/WebServices.pm (modified) (1 diff)

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

@@ -837 +837 @@
 
 sub SetNewFilesDisplayEndInfo {
-    my ( $self ) = @_;  
+    my ( $self, $msg ) = @_;    
         
-    $self->progressdlg->DisplayEndInfo;
+    $self->progressdlg->DisplayEndInfo($msg);
 }
 

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

@@ -189 +189 @@
     my $count = 0;
     $self->count($count);
+    my $errors = 0;
     map {
         # read exif metadata
@@ -256 +257 @@
             # remove from list
             splice @{$self->images}, $i, 1;
+            $errors++;
         }
         
@@ -263 +265 @@
     }
     @{$files};
-    $self->SetNewFilesDisplayEndInfoCallback->();
+    $self->SetNewFilesDisplayEndInfoCallback->(
+        sprintf(
+            "%s images added to the selection\n\n%s errors",
+            $self->count,
+            $errors
+            
+        )
+    );
     
     $self->Store;
@@ -469 +478 @@
     warn "$status" if $status ;
 
+    # exif from original image
+    my $orientation = $self->current_image->exif_metadata->{Orientation};
+    
+    # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
+    if( $orientation =~ m/Rotate (\d+)/ ){
+        printf(
+            "Rotate %s\n",
+            $1
+        );
+    
+        $image->Rotate( degrees=>$1 );  
+    }
 
     $status = $image->Set(quality=>$self->quality);
@@ -632 +653 @@
     my $rejected = 0;
     my $time_begin = time;
+    my $last_error;
     map {
         # current image object          
@@ -692 +714 @@
                     $self->quality,
                 );
+                
+                $self->RotateImage(
+                    $self->current_image->site_resized_file,
+                );
             }
         };
-        $self->RotateImage(
-            $self->current_image->site_resized_file,
-        );
 
         $self->_set_exif_tag(
@@ -766 +789 @@
             );
             $rejected++;
+            $last_error = $status_msg;
         }       
         
@@ -786 +810 @@
     my $duration = $time_end - $time_begin;
     $msg = sprintf(
-        "%s images processed\n\n%s images uploaded\n\n%s images in errors and not uploaded\n\nDuration : %s seconds",
+        "%s images processed\n\n%s images uploaded\n\n%s images in errors and not uploaded - $last_error\n\nDuration : %s seconds",
         $self->count - 1,
         $uploaded,

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

@@ -219 +219 @@
     );
 
+
+
     return ( $result->is_success, $result->status_line );
 }