Changeset 4801 for extensions/pLoader

Timestamp:

Jan 30, 2010, 1:31:37 PM (14 years ago)

Author:

ronosman

Message:

Feature 1417 added : ability to define tags for a photo selection.

Location:

extensions/pLoader/trunk/src/Uploader

Files:

• GUI/Frame.pm (modified) (4 diffs)
• ImageList.pm (modified) (6 diffs)

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

@@ -632 +632 @@
     );   
 
+    #$self->image_tags(
+    #    sub { eval { $self->imagelist->current_image->site_tags(@_) } }
+    #);
     $self->image_tags(
-        sub { eval { $self->imagelist->current_image->site_tags(@_) } }
+        sub { scalar @{$self->imagelist->image_selection} > 1 ? $self->imagelist->SetImageSelectionTags(@_) : $self->imagelist->current_image->site_tags(@_)||[]  }
     );
 
@@ -1193 +1196 @@
     Wx::Event::EVT_LIST_ITEM_ACTIVATED( $self, $self->imageviewer, \&OnImageViewerItemActivated );
     Wx::Event::EVT_LIST_ITEM_SELECTED($self, $self->imageviewer, \&OnImageViewerItemSelected) ;
+    Wx::Event::EVT_LIST_ITEM_DESELECTED($self, $self->imageviewer, \&OnImageViewerItemDeSelected) ;
     Wx::Event::EVT_LIST_ITEM_RIGHT_CLICK($self, $self->imageviewer, \&OnImageViewerItemRightClick) ;
 
@@ -1507 +1511 @@
 }
 
+sub OnImageViewerItemDeSelected {
+    my( $self, $event ) = @_;
+
+    my $bc = Wx::BusyCursor->new;
+    $self->_on_imageviewer_item_selection_changed;
+
+    $event->Skip;
+
+}
+
 sub _on_imageviewer_item_selected {
     my ( $self, $index ) = @_;    
@@ -1512 +1526 @@
     $self->imagelist->SetCurrentImage($index);
     
+    $self->_on_imageviewer_item_selection_changed;
+}
+
+sub _on_imageviewer_item_selection_changed {
+    my ( $self ) = @_;    
+
     $self->imagelist->image_selection(
         $self->imageviewer->GetSelectedItems
     );
+
+    # for batch mode : reset the batch buffer if single selection
+    $self->imagelist->SetImageSelectionTags([]) if(scalar @{$self->imagelist->image_selection} > 1);
 
     # process image_preview in idle time

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

@@ -27 +27 @@
 use Uploader::Image;
 use Data::Dumper;
+use List::MoreUtils qw/uniq/;
 use Storable;
 use Digest::MD5::File qw/file_md5_hex md5_hex/;
@@ -127 +128 @@
                 display_mode
                 stop_processing
+                image_selection_tags
      /
 );
@@ -134 +136 @@
     my ( $self ) = @_;
     
+    $self->image_selection([]) if !defined $self->image_selection;
     $self->uploaded_images([]);
     $self->gravity(
@@ -156 +159 @@
     );
     
+    $self->image_selection_tags(
+        []
+    ) unless defined $self->image_selection_tags;
 }
 
@@ -730 +736 @@
                 reupload_action_properties_m
                 display_mode
+                image_selection_tags
             /
         ] 
@@ -1388 +1395 @@
 }
 
+sub SetImageSelectionTags {
+    my ( $self, $tags ) = @_;
+
+    $self->image_selection_tags($tags) if 'ARRAY' eq ref $tags;
+
+    #print Dumper $self->image_selection_tags;
+    # append to each image
+    # if multiple selection
+    if(scalar @{$self->image_selection} > 1){
+        map {
+            # need to dedup
+            my $tags = [
+                @{$self->GetImage($_)->site_tags},
+                @{$self->image_selection_tags},
+            ];
+            @$tags = uniq @$tags;
+            $self->GetImage($_)->site_tags(
+                $tags
+            );
+        }@{$self->image_selection};
+    }
+
+    $self->image_selection_tags;
+}
 
 1;