Changeset 6538

Timestamp:

Jun 16, 2010, 11:43:09 AM (14 years ago)

Author:

ronosman

Message:

Ability to clear progress list. Only available when no batch is running. The cancel processing is available when a batch is running.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/App.pm (modified) (10 diffs)
• GUI/Frame.pm (modified) (2 diffs)
• GUI/ImageProgressDlg.pm (modified) (6 diffs)
• GUI/Layout/ImageProgress.pm (modified) (2 diffs)
• GUI/ListCtrlProgress.pm (modified) (4 diffs)
• Images.pm (modified) (1 diff)
• ResizeWorker.pm (modified) (2 diffs)
• ThreadManager.pm (modified) (2 diffs)
• TransferWorker.pm (modified) (1 diff)

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

@@ -62 +62 @@
 my $transfer_progress_event : shared = Wx::NewEventType;
 my $transfer_done_event : shared = Wx::NewEventType;
+my $transfer_batch_end_event : shared = Wx::NewEventType;
 my $resize_done_event : shared = Wx::NewEventType;
 my $resize_progress_event : shared = Wx::NewEventType;
+my $resize_batch_end_event : shared = Wx::NewEventType;
 
 my $image_progress_event = Wx::NewEventType;
@@ -136 +138 @@
 my @custom_events = qw/
     resize_start_event
+    batch_end_event
     image_progress_event
 /;
@@ -198 +201 @@
 
 
+sub reset_add_rank {
+    my ( $self ) = @_;
+
+    $self->images->reset_add_rank;
+}
+
+
 sub cancel_all {
     my ( $self ) = @_;
 
-    $self->resize_manager->cancel;
-    $self->transfer_manager->cancel;
+    $self->cancel_transfer if $self->cancel_resize;
 }
 
@@ -710 +719 @@
     $self->resize_manager(
         Uploader::ResizeManager->new({
-            thumb_dir      => $self->thumb_dir,
-            wx_thumb_dir   => $self->wx_thumb_dir,
-            resized_dir    => $self->resized_dir,
-            preferences    => sub { $self->preferences(@_) },
-            progress_event => $resize_progress_event,
-            done_event     => $resize_done_event,
-            event_handler  => $self,
+            thumb_dir       => $self->thumb_dir,
+            wx_thumb_dir    => $self->wx_thumb_dir,
+            resized_dir     => $self->resized_dir,
+            preferences     => sub { $self->preferences(@_) },
+            progress_event  => $resize_progress_event,
+            done_event      => $resize_done_event,
+            batch_end_event => $resize_batch_end_event,
+            event_handler   => $self,
         })
     );
 
+    $self->init_resize_batch_end_event_handler;
     $self->init_resize_done_event_handler;
     $self->init_resize_progress_event_handler;
+}
+
+
+sub init_resize_batch_end_event_handler {
+    my ( $self ) = @_;
+
+    Wx::Event::EVT_COMMAND(
+        $self,
+        -1,
+        $resize_batch_end_event,
+        sub {
+            my ( $handler, $event ) = @_;
+            my $msg : shared = shared_clone($event->GetData);
+            # add the batch end message to the queue
+            $self->transfer_manager->add_images([ $msg ]);
+        } 
+    );
+
 }
 
@@ -758 +787 @@
     );
 
+}
+
+
+sub on_batch_end {
+    my ( $self, $image ) = @_;
+
+    Wx::PostEvent(
+        $self->frame,
+        Wx::PlThreadEvent->new(
+            -1,
+            $self->batch_end_event,
+            $image
+        )
+    );
 }
 
@@ -1181 +1224 @@
     $self->transfer_manager(
         Uploader::TransferManager->new({
-            pwg            => $self->pwg,
-            progress_event => $transfer_progress_event,
-            done_event     => $transfer_done_event,
-            event_handler  => $self,
+            pwg             => $self->pwg,
+            progress_event  => $transfer_progress_event,
+            done_event      => $transfer_done_event,
+            event_handler   => $self,
+            batch_end_event => $transfer_batch_end_event,
         })
     );
 
     $self->image_progress_event(
-        $image_progress_event
-    );
-
+        Wx::NewEventType
+    );
+
+    $self->batch_end_event(
+        Wx::NewEventType
+    );
+
+    $self->init_transfer_batch_end_event_handler;
     $self->init_transfer_done_event_handler;
     $self->init_transfer_progress_event_handler;
@@ -1213 +1262 @@
 
 
+sub init_transfer_batch_end_event_handler {
+    my ( $self ) = @_;
+
+    Wx::Event::EVT_COMMAND(
+        $self,
+        -1,
+        $transfer_batch_end_event,
+        sub {
+            my ( $handler, $event ) = @_;
+            my $data = $event->GetData;
+            $handler->on_batch_end($data);
+        } 
+    );
+
+}
 
 
@@ -1259 +1323 @@
     );
 
+    push @$images, { event => "BATCH_END" };
+
     $self->resize_manager->add_images($images);
 
@@ -1277 +1343 @@
     my( $self ) = @_;
 
-    #
+    my $cancelled;
+
     if( $self->resize_manager->pending and wxYES == Wx::MessageBox( 
         sprintf(
-            "Cancel %s pending job(s) ?",
+            "Cancel %s resize pending job(s) ?",
             $self->resize_manager->pending,
         ),
@@ -1286 +1353 @@
         wxYES_NO|wxNO_DEFAULT| wxICON_QUESTION, ) 
     ){
+        $cancelled = 1;
         $self->resize_manager->cancel;
     }
+
+    $cancelled;
+}
+
+
+sub cancel_transfer {
+    my( $self ) = @_;
+
+    my $cancelled = 1;
+    if( $self->transfer_manager->pending ){
+        if( wxYES == Wx::MessageBox( 
+            sprintf(
+                "Cancel %s transfer pending job(s) ?",
+                $self->transfer_manager->pending,
+            ),
+            "pLoader job processing",
+            wxYES_NO|wxNO_DEFAULT| wxICON_QUESTION, ) 
+            )
+        {
+            $self->transfer_manager->cancel;
+        }
+        else{
+            $cancelled = 0;
+        }
+    }
+
+    $cancelled;
 }
 

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

@@ -703 +703 @@
         Uploader::GUI::ImageProgressDlg->new(
             { 
-                title    => gettext("Image upload progress information"),
+                title           => gettext("Image upload progress information"),
                 progress_column => 2,
-                cancel_cbk => sub { wxTheApp->cancel_queues },
+                cancel_cbk      => sub { wxTheApp->cancel_all },
+                clear_cbk       => sub { wxTheApp->reset_add_rank },
                 column_item_data => {
                     0 => sub { return undef },
@@ -1053 +1054 @@
     );
 
+    Wx::Event::EVT_COMMAND(
+        $self,
+        -1,
+        wxTheApp->batch_end_event,
+        sub {
+            my ( $handler, $event ) = @_;
+            my $data = $event->GetData;
+            $handler->upload_progressdlg->batch_end($data);
+        } 
+    );
+
 }
 

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

@@ -38 +38 @@
 __PACKAGE__->mk_accessors( qw/
     cancel_cbk
+    clear_cbk
     listctrl
     columns
     progress_column
+    btcancel
 /);
 use Carp;
@@ -76 +78 @@
     );
 
+    $self->clear_cbk(
+        $params->{clear_cbk}
+    );
+
     Uploader::GUI::Layout::ImageProgress::Init($self);
 
@@ -89 +95 @@
     );
 
-    Wx::Event::EVT_BUTTON( $self, $main::ID_UPLOAD_CANCEL, \&on_cancel );
+    Wx::Event::EVT_BUTTON( $self, $self->{_bt_cancel}->GetId, \&on_cancel );
+    Wx::Event::EVT_BUTTON( $self, $self->{_bt_clear}->GetId, \&on_clear );
     Wx::Event::EVT_CLOSE( $self, \&on_close );
 
@@ -112 +119 @@
     my ( $self, $images ) = @_;
 
-    $self->listctrl->add_progress_items($images);
+    # have to filter to remove fake images ( batch_end_events )
+    $self->listctrl->add_progress_items(
+        [
+            grep { $_->{image_id} } @$images
+        ]
+    );
+
+    $self->{_bt_cancel}->Enable(1);
+    $self->{_bt_clear}->Enable(0);
 }
 
@@ -118 +133 @@
 sub update_image_item {
     my ( $self, $image ) = @_;
-
+    
     my $item = $image->{add_rank};
     $self->listctrl->replace_item_data($item, $image);
@@ -128 +143 @@
 
 
+sub batch_end {
+    my ( $self, $image ) = @_;
+
+    $self->{_bt_cancel}->Enable(0);
+    $self->{_bt_clear}->Enable(1);
+}
+
+
+sub on_clear {
+    my( $self, $event ) = @_;
+
+    $self->listctrl->clear_progress_items;
+    $self->clear_cbk->();
+    $event->Skip;
+}
+
+
 sub on_cancel {
     my( $self, $event ) = @_;
 
-    $self->cancel_cbk->();
+    if($self->cancel_cbk->()){
+        $self->{_bt_cancel}->Enable(0);
+        $self->{_bt_clear}->Enable(1);
+    }
     $event->Skip;
 }

extensions/pLoader/trunk/src/Uploader/GUI/Layout/ImageProgress.pm

@@ -16 +16 @@
 use vars qw($ID_LINE); $ID_LINE = 10002;
 use vars qw($ID_LISTCTRL); $ID_LISTCTRL = 10003;
-use vars qw($ID_UPLOAD_CANCEL); $ID_UPLOAD_CANCEL = 10004;
 
 sub Init {
@@ -42 +41 @@
 
     my( $item7 ) = Wx::BoxSizer->new( wxHORIZONTAL );
+    my( $bt_clear ) = Wx::Button->new(
+        $panel,
+        -1,
+        gettext("Clear list"),
+        wxDefaultPosition, wxDefaultSize, 0 
+    );
+    $parent_wnd->{_bt_clear} = $bt_clear;
+
+    $item7->AddWindow( $bt_clear, 0, wxALIGN_CENTER|wxALL, 5 );
+
     my( $bt_cancel ) = Wx::Button->new(
         $panel,
-        $main::ID_UPLOAD_CANCEL,
+        -1,
         gettext("Cancel upload"),
         wxDefaultPosition, wxDefaultSize, 0 
     );
+    $parent_wnd->{_bt_cancel} = $bt_cancel;
     #$item7->AddButton( Wx::Button->new( $panel, wxID_OK, "" ) );
     $item7->AddWindow( $bt_cancel, 0, wxALIGN_CENTER|wxALL, 5 );

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

@@ -31 +31 @@
 
     $self->thumb_size(48);
-
+    $self->reset_all;
+
+
+
+    Wx::Event::EVT_PAINT(
+        $self,
+        sub {
+            my ( $self, $event ) = @_;
+
+            eval { $self->paint_progress_bars; };
+            $event->Skip;
+        }
+    );
+
+
+    $self;
+}
+
+
+sub reset_all {
+    my ( $self ) = @_;
+    
+    delete $self->{_y_top};
     $self->progress_bars([]);
     $self->item_data([]);
@@ -39 +61 @@
         )
     );
-
-
+    $self->wx_images([]);
     $self->SetImageList( $self->wx_imagelist, wxIMAGE_LIST_SMALL ) ;
-
-
-    $self->wx_images([]);
-
-    Wx::Event::EVT_PAINT(
-        $self,
-        sub {
-            my ( $self, $event ) = @_;
-
-            eval { $self->paint_progress_bars; };
-            $event->Skip;
-        }
-    );
-
-
-    $self;
 }
 
@@ -112 +117 @@
 }
 
+
 sub add_progress_items {
     my ( $self, $added_items ) = @_;
 
     push @{$self->item_data}, @{$added_items};
-
-    $self->SetItemCount(scalar @{$self->item_data});
-}
-
+    
+    my $item_count = scalar @{$self->item_data};
+    $self->SetItemCount($item_count);
+}
+
+
+sub clear_progress_items {
+    my ( $self ) = @_;
+
+    $self->{_y_top} = 100000;
+    $self->paint_progress_bars;
+
+    $self->reset_all;
+    $self->DeleteAllItems;
+}
 
 sub OnGetItemText {
@@ -188 +205 @@
 
 
+
+
 sub paint_progress_bars {
     my ( $self ) = @_;

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

@@ -516 +516 @@
 }
 
+
+sub reset_add_rank {
+    my ( $self ) = @_;
+
+    $add_rank = 0;
+}
 1;

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

@@ -45 +45 @@
 sub process_image {
     my ( $self, $handler, $progress_event, $resize_done_event, $image ) = @_;
-printf("process_image %s\n", join(', ', @_));
+
     $self->event_handler(
         $handler
@@ -101 +101 @@
     );
 }
+
+
 
 

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

@@ -15 +15 @@
     done_event
     event_handler
+    batch_end_event
 /);
 
@@ -61 +62 @@
                 }
             }
+            elsif('BATCH_END' eq $data->{event}){
+                $worker->post_image_event(
+                    $self->batch_end_event,
+                    $data,
+                );
+            }
             else{
-                $worker->process_image(
+                $worker->process_image( 
                     $handler,
                     $self->progress_event,

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

@@ -163 +163 @@
 sub update_image {
     my ( $self, $image ) = @_;
-print Dumper $image;
+
     $self->log_image_progress($image, "updating", 0);